diff options
8 files changed, 17 insertions, 29 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java index 1b72213d5ff..75187d8ca19 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/TensorFunctionNode.java @@ -99,7 +99,7 @@ public class TensorFunctionNode extends CompositeNode { List<ExpressionNode> nodes, Map<TensorAddress, ScalarFunction<Reference>> receivingMap) { TensorType denseSubtype = new TensorType(type.valueType(), - type.dimensions().stream().filter(d -> d.isIndexed()).collect(Collectors.toList())); + type.dimensions().stream().filter(TensorType.Dimension::isIndexed).collect(Collectors.toList())); List<String> denseDimensionOrder = new ArrayList<>(dimensionOrder); denseDimensionOrder.retainAll(denseSubtype.dimensionNames()); IndexedTensor.Indexes indexes = IndexedTensor.Indexes.of(denseSubtype, denseDimensionOrder); @@ -175,8 +175,7 @@ public class TensorFunctionNode extends CompositeNode { while (outermost.parent() != null) outermost = outermost.parent(); - if (outermost instanceof ExpressionToStringContext) { - ExpressionToStringContext context = (ExpressionToStringContext)outermost; + if (outermost instanceof ExpressionToStringContext context) { ExpressionNode root = expression; if (root instanceof CompositeNode && ! (root instanceof EmbracedNode) && ! isIdentifierReference(root)) root = new EmbracedNode(root); // Output embraced if composite @@ -223,9 +222,9 @@ public class TensorFunctionNode extends CompositeNode { @Override public TensorFunction<Reference> withArguments(List<TensorFunction<Reference>> arguments) { if (arguments.size() == 0) return this; - List<ExpressionNode> unwrappedChildren = arguments.stream() - .map(arg -> ((ExpressionTensorFunction)arg).expression) - .collect(Collectors.toList()); + var unwrappedChildren = arguments.stream() + .map(arg -> ((ExpressionTensorFunction)arg).expression) + .collect(Collectors.toList()); return new ExpressionTensorFunction(((CompositeNode)expression).setChildren(unwrappedChildren)); } @@ -261,15 +260,11 @@ public class TensorFunctionNode extends CompositeNode { while (outermost.parent() != null) outermost = outermost.parent(); - if (outermost instanceof ExpressionToStringContext) { - ExpressionToStringContext context = (ExpressionToStringContext)outermost; - return expression.toString(new StringBuilder(), - new ExpressionToStringContext(context.wrappedSerializationContext, c, - context.path, - context.parent), - context.path, - context.parent) - .toString(); + if (outermost instanceof ExpressionToStringContext context) { + return expression.toString( + new StringBuilder(), + new ExpressionToStringContext(context.wrappedSerializationContext, c, context.path, context.parent), + context.path, context.parent).toString(); } else { return expression.toString(); diff --git a/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java b/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java index 073b7f43902..199b26d51a4 100644 --- a/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java +++ b/security-utils/src/main/java/com/yahoo/security/Pkcs10Csr.java @@ -16,7 +16,6 @@ import java.util.Objects; import java.util.Optional; import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.toList; /** * @author bjorncs @@ -57,7 +56,7 @@ public class Pkcs10Csr { return getExtensions() .map(extensions -> Arrays.stream(extensions.getExtensionOIDs()) .map(ASN1ObjectIdentifier::getId) - .collect(toList())) + .toList()) .orElse(emptyList()); } diff --git a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java index e184d982790..c93dd59ea98 100644 --- a/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java +++ b/security-utils/src/main/java/com/yahoo/security/SubjectAlternativeName.java @@ -14,7 +14,6 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import static java.util.stream.Collectors.toList; /** * @author bjorncs @@ -51,7 +50,7 @@ public class SubjectAlternativeName { } static List<SubjectAlternativeName> fromGeneralNames(GeneralNames generalNames) { - return Arrays.stream(generalNames.getNames()).map(SubjectAlternativeName::new).collect(toList()); + return Arrays.stream(generalNames.getNames()).map(SubjectAlternativeName::new).toList(); } private String getValue(GeneralName bcGeneralName) { diff --git a/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java b/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java index feb3b4df3e0..67b91dfc61a 100644 --- a/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java +++ b/security-utils/src/main/java/com/yahoo/security/X509CertificateUtils.java @@ -39,7 +39,6 @@ import java.util.Optional; import java.util.Random; import static com.yahoo.security.Extension.SUBJECT_ALTERNATIVE_NAMES; -import static java.util.stream.Collectors.toList; /** * @author bjorncs @@ -138,7 +137,7 @@ public class X509CertificateUtils { return new LdapName(distinguishedName.getName()).getRdns().stream() .filter(rdn -> rdn.getType().equalsIgnoreCase(rdnName)) .map(rdn -> rdn.getValue().toString()) - .collect(toList()); + .toList(); } catch (NamingException e) { throw new IllegalArgumentException("Invalid DN: " + distinguishedName.getName(), e); } diff --git a/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java b/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java index 951b5c57c9e..746fce0e290 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/PeerAuthorizer.java @@ -13,7 +13,6 @@ import java.util.logging.Logger; import static com.yahoo.security.SubjectAlternativeName.Type.DNS; import static com.yahoo.security.SubjectAlternativeName.Type.IP; import static com.yahoo.security.SubjectAlternativeName.Type.URI; -import static java.util.stream.Collectors.toList; /** * Uses rules from {@link AuthorizedPeers} to evaluate X509 certificates @@ -75,6 +74,6 @@ public class PeerAuthorizer { return X509CertificateUtils.getSubjectAlternativeNames(peerCertificate).stream() .filter(san -> san.getType() == DNS || san.getType() == IP || san.getType() == URI) .map(SubjectAlternativeName::getValue) - .collect(toList()); + .toList(); } } diff --git a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java index 0349d4085db..34626e23e7a 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/TransportSecurityOptionsJsonSerializer.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; /** @@ -111,7 +110,7 @@ class TransportSecurityOptionsJsonSerializer { private static List<RequiredPeerCredential> toRequestPeerCredentials(List<RequiredCredential> requiredCredentials) { return requiredCredentials.stream() .map(TransportSecurityOptionsJsonSerializer::toRequiredPeerCredential) - .collect(toList()); + .toList(); } private static RequiredPeerCredential toRequiredPeerCredential(RequiredCredential requiredCredential) { diff --git a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java index d0e8663731a..21890bab569 100644 --- a/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java +++ b/vespa-osgi-testrunner/src/main/java/com/yahoo/vespa/testrunner/JunitRunner.java @@ -32,7 +32,6 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -import static java.util.stream.Collectors.toList; /** * @author mortent @@ -126,7 +125,7 @@ public class JunitRunner extends AbstractComponent implements TestRunner { LauncherDiscoveryRequest discoveryRequest = LauncherDiscoveryRequestBuilder.request() .selectors(testClasses.stream() .map(DiscoverySelectors::selectClass) - .collect(toList())) + .toList()) .build(); testExecutor.accept(discoveryRequest, new TestExecutionListener[] { testReportListener }); diff --git a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java index 52a96521dc1..5d96901ad9d 100644 --- a/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java +++ b/vespa-osgi-testrunner/src/test/java/com/yahoo/vespa/testrunner/AggregateTestRunnerTest.java @@ -23,7 +23,6 @@ import static com.yahoo.vespa.testrunner.TestRunner.Status.NOT_STARTED; import static com.yahoo.vespa.testrunner.TestRunner.Status.NO_TESTS; import static com.yahoo.vespa.testrunner.TestRunner.Status.RUNNING; import static com.yahoo.vespa.testrunner.TestRunner.Status.SUCCESS; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -182,7 +181,7 @@ class AggregateTestRunnerTest { @Override public Collection<LogRecord> getLog(long after) { - return log.stream().filter(record -> record.getSequenceNumber() > after).collect(toList()); + return log.stream().filter(record -> record.getSequenceNumber() > after).toList(); } @Override |