Unify on Streams.toList()

5 files changed, 7 insertions, 11 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
index e55c42f6b57..3f93cdda61c 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/http/application/NodeMetricsClient.java
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
 
 import static ai.vespa.metricsproxy.metric.model.processing.MetricsProcessor.applyProcessors;
 import static java.util.logging.Level.FINE;
-import static java.util.stream.Collectors.toList;
 
 /**
  * Retrieves metrics from a single Vespa node over http. To avoid unnecessary load on metrics
@@ -101,7 +100,7 @@ public class NodeMetricsClient {
         return builders.stream()
                     .map(builder -> applyProcessors(builder, processors))
                     .map(MetricsPacket.Builder::build)
-                    .collect(toList());
+                    .toList();
     }
 
     long snapshotsRetrieved() {
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java
index a3555f96be8..a71a5526fc2 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonUtil.java
@@ -65,7 +65,7 @@ public class GenericJsonUtil {
             var genericMetricsList = packets.stream()
                     .filter(packet -> ! (packet.metrics().isEmpty() && packet.dimensions().isEmpty()))
                     .map(packet -> new GenericMetrics(packet.metrics(), packet.dimensions()))
-                    .collect(toList());
+                    .toList();
             var genericService = packets.stream().findFirst()
                     .map(firstPacket -> new GenericService(serviceId.id,
                                                            firstPacket.timestamp,
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
index 2e7f7c7a936..d6b084acbb3 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsHandlerTest.java
@@ -37,7 +37,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static com.yahoo.collections.CollectionUtil.first;
-import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -220,7 +219,7 @@ public class ApplicationMetricsHandlerTest {
     private MetricsNodesConfig nodesConfig(String... paths) {
         var nodes = Arrays.stream(paths)
                 .map(this::nodeConfig)
-                .collect(toList());
+                .toList();
         return new MetricsNodesConfig.Builder()
                 .node(nodes)
                 .build();
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
index de614e14349..cb028713d13 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/http/application/ApplicationMetricsRetrieverTest.java
@@ -17,7 +17,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
-import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -160,7 +159,7 @@ public class ApplicationMetricsRetrieverTest {
     private MetricsNodesConfig nodesConfig(String... paths) {
         var nodes = Arrays.stream(paths)
                 .map(this::nodeConfig)
-                .collect(toList());
+                .toList();
         return new MetricsNodesConfig.Builder()
                 .node(nodes)
                 .build();
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java
index 5ddd10fd03c..1e21bae25c5 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/metric/model/json/GenericJsonModelTest.java
@@ -15,7 +15,6 @@ import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
 import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId;
 import static ai.vespa.metricsproxy.metric.model.ServiceId.toServiceId;
 import static ai.vespa.metricsproxy.metric.model.json.JacksonUtil.createObjectMapper;
-import static java.util.stream.Collectors.toList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -51,7 +50,7 @@ public class GenericJsonModelTest {
         GenericJsonModel modelFromFile = genericJsonModelFromTestFile(TEST_FILE);
         List<MetricsPacket> metricsPackets = GenericJsonUtil.toMetricsPackets(modelFromFile).stream()
                 .map(MetricsPacket.Builder::build)
-                .collect(toList());
+                .toList();
 
         assertEquals(4, metricsPackets.size());
 
@@ -70,7 +69,7 @@ public class GenericJsonModelTest {
         GenericJsonModel modelFromFile = genericJsonModelFromTestFile(TEST_FILE_WITHOUT_NODE);
         List<MetricsPacket> metricsPackets = GenericJsonUtil.toMetricsPackets(modelFromFile).stream()
                 .map(MetricsPacket.Builder::build)
-                .collect(toList());
+                .toList();
 
         assertEquals(2, metricsPackets.size());
 
@@ -122,7 +121,7 @@ public class GenericJsonModelTest {
         String genericJson = getFileContents(TEST_FILE);
         List<MetricsPacket> metricsPackets = GenericJsonUtil.toMetricsPackets(genericJson).stream()
                 .map(MetricsPacket.Builder::build)
-                .collect(toList());
+                .toList();
 
         assertEquals(4, metricsPackets.size());
         GenericJsonModel modelFromPackets = GenericJsonUtil.toGenericJsonModel(metricsPackets);