From 2d6bbe0b8bff09d105b77161c1d26a00ce43bf0c Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 11 Apr 2024 15:09:55 +0200 Subject: Unify on List.of --- .../src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java | 4 ++-- .../src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'vespaclient-java') diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java index 0628f4e0f29..ddaf057a0b9 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java @@ -214,7 +214,7 @@ public class DocumentRetrieverTest { .setCluster(cluster) .build(); - ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef(cluster))); + ClusterList clusterList = new ClusterList(List.of(new ClusterDef(cluster))); DocumentRetriever documentRetriever = createDocumentRetriever(params, clusterList); documentRetriever.retrieveDocuments(); @@ -230,7 +230,7 @@ public class DocumentRetrieverTest { .setCluster("invalidclustername") .build(); - ClusterList clusterList = new ClusterList(Collections.singletonList(new ClusterDef("storage"))); + ClusterList clusterList = new ClusterList(List.of(new ClusterDef("storage"))); DocumentRetriever documentRetriever = createDocumentRetriever(params, clusterList); documentRetriever.retrieveDocuments(); diff --git a/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java b/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java index 143d5518eff..c4164d04aa2 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespastat/BucketStatsPrinterTest.java @@ -10,7 +10,6 @@ import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -28,7 +27,7 @@ public class BucketStatsPrinterTest { public void mockBucketStatsRetriever() throws BucketStatsException { retriever = mock(BucketStatsRetriever.class); when(retriever.getBucketIdForType(any(), any())).thenReturn(new BucketId(0x42)); - when(retriever.retrieveBucketList(any(), any())).thenReturn(Collections.emptyList()); + when(retriever.retrieveBucketList(any(), any())).thenReturn(List.of()); when(retriever.retrieveBucketStats(any(), any(), any(), any())).thenReturn(""); } @@ -79,7 +78,7 @@ public class BucketStatsPrinterTest { void testShouldPrintBucketStats() throws BucketStatsException { String dummyBucketStats = "dummystats"; GetBucketListReply.BucketInfo bucketInfo = new GetBucketListReply.BucketInfo(new BucketId(0), "dummy"); - when(retriever.retrieveBucketList(any(), any())).thenReturn(Collections.singletonList(bucketInfo)); + when(retriever.retrieveBucketList(any(), any())).thenReturn(List.of(bucketInfo)); when(retriever.retrieveBucketStats(any(), any(), any(), any())).thenReturn(dummyBucketStats); String output = retreiveAndPrintBucketStats(ClientParameters.SelectionType.USER, "1234", true); -- cgit v1.2.3