Skip to content

Commit 5119152

Browse files
KarstenSchnitterKarstenSchnitter
committed
Simplify List creation (mostly in Test)
Replaces `Arrays.asList` and `Collections.singletonList` with `List.of`. Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
1 parent 6dd2374 commit 5119152

File tree

8 files changed

+28
-39
lines changed

8 files changed

+28
-39
lines changed

‎cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CloudLoggingServicesProvider.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import java.util.function.Supplier;
77
import java.util.stream.Stream;
88

9-
import static java.util.Arrays.asList;
10-
import static java.util.Collections.singletonList;
119
import static java.util.stream.Collectors.toList;
1210

1311
public class CloudLoggingServicesProvider implements Supplier<Stream<CloudFoundryServiceInstance>> {
@@ -23,8 +21,8 @@ public CloudLoggingServicesProvider(ConfigProperties config) {
2321
}
2422

2523
CloudLoggingServicesProvider(ConfigProperties config, CloudFoundryServicesAdapter adapter) {
26-
List<String> serviceLabels = asList(getUserProvidedLabel(config), getCloudLoggingLabel(config));
27-
List<String> serviceTags = singletonList(getCloudLoggingTag(config));
24+
List<String> serviceLabels = List.of(getUserProvidedLabel(config), getCloudLoggingLabel(config));
25+
List<String> serviceTags = List.of(getCloudLoggingTag(config));
2826
this.services = adapter.stream(serviceLabels, serviceTags).collect(toList());
2927
}
3028

‎cf-java-logging-support-opentelemetry-agent-extension/src/main/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/DynatraceServiceProvider.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
import java.util.List;
66
import java.util.function.Supplier;
77

8-
import static java.util.Arrays.asList;
9-
import static java.util.Collections.singletonList;
10-
118
public class DynatraceServiceProvider implements Supplier<CloudFoundryServiceInstance> {
129

1310
private static final String DEFAULT_USER_PROVIDED_LABEL = "user-provided";
@@ -21,8 +18,8 @@ public DynatraceServiceProvider(ConfigProperties config) {
2118
}
2219

2320
DynatraceServiceProvider(ConfigProperties config, CloudFoundryServicesAdapter adapter) {
24-
List<String> serviceLabels = asList(getUserProvidedLabel(config), getDynatraceLabel(config));
25-
List<String> serviceTags = singletonList(getDynatraceTag(config));
21+
List<String> serviceLabels = List.of(getUserProvidedLabel(config), getDynatraceLabel(config));
22+
List<String> serviceTags = List.of(getDynatraceTag(config));
2623
this.service = adapter.stream(serviceLabels, serviceTags).findFirst().orElse(null);
2724
}
2825

‎cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CloudFoundryServicesAdapterTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
import java.util.List;
88

9-
import static java.util.Arrays.asList;
109
import static java.util.Collections.emptyList;
11-
import static java.util.Collections.singletonList;
1210
import static java.util.stream.Collectors.toList;
1311
import static org.assertj.core.api.Assertions.assertThat;
1412

@@ -82,14 +80,14 @@ private static AbstractListAssert<?, List<? extends String>, String, ObjectAsser
8280
@Test
8381
void filtersBySingleLabel() {
8482
List<CloudFoundryServiceInstance> services =
85-
DEFAULT_ADAPTER.stream(singletonList("managed-find-me-service"), emptyList()).collect(toList());
83+
DEFAULT_ADAPTER.stream(List.of("managed-find-me-service"), emptyList()).collect(toList());
8684
assertServiceNames(services).containsExactlyInAnyOrder("managed-find-me1", "managed-find-me2", "managed-other");
8785
}
8886

8987
@Test
9088
void priotizesByServiceLabel() {
9189
List<CloudFoundryServiceInstance> services =
92-
DEFAULT_ADAPTER.stream(asList("user-provided", "managed-find-me-service"), emptyList())
90+
DEFAULT_ADAPTER.stream(List.of("user-provided", "managed-find-me-service"), emptyList())
9391
.collect(toList());
9492
assertServiceNames(services).containsExactly("ups-find-me1", "ups-find-me2", "ups-other", "managed-find-me1",
9593
"managed-find-me2", "managed-other");
@@ -98,15 +96,15 @@ void priotizesByServiceLabel() {
9896
@Test
9997
void filtersBySingleTag() {
10098
List<CloudFoundryServiceInstance> services =
101-
DEFAULT_ADAPTER.stream(emptyList(), singletonList("Find Me!")).collect(toList());
99+
DEFAULT_ADAPTER.stream(emptyList(), List.of("Find Me!")).collect(toList());
102100
assertServiceNames(services).containsExactlyInAnyOrder("managed-find-me1", "managed-find-me2", "managed-other1",
103101
"ups-find-me1", "ups-find-me2");
104102
}
105103

106104
@Test
107105
void standardUseCase() {
108106
List<CloudFoundryServiceInstance> services =
109-
DEFAULT_ADAPTER.stream(asList("user-provided", "managed-find-me-service"), singletonList("Find Me!"))
107+
DEFAULT_ADAPTER.stream(List.of("user-provided", "managed-find-me-service"), List.of("Find Me!"))
110108
.collect(toList());
111109
assertServiceNames(services).containsExactly("ups-find-me1", "ups-find-me2", "managed-find-me1",
112110
"managed-find-me2");

‎cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CloudLoggingBindingPropertiesSupplierTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import java.io.IOException;
1212
import java.nio.file.Files;
1313
import java.nio.file.Paths;
14-
import java.util.Collections;
1514
import java.util.List;
1615
import java.util.Map;
1716
import java.util.stream.Stream;
@@ -29,7 +28,7 @@ public class CloudLoggingBindingPropertiesSupplierTest {
2928

3029
private static final Map<String, Object> BINDING =
3130
Map.ofEntries(entry("label", "user-provided"), entry("name", "test-name"),
32-
entry("tags", Collections.singletonList("Cloud Logging")), entry("credentials", CREDENTIALS));
31+
entry("tags", List.of("Cloud Logging")), entry("credentials", CREDENTIALS));
3332

3433
@Mock
3534
private CloudLoggingServicesProvider servicesProvider;

‎cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/CloudLoggingServicesProviderTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import org.mockito.junit.jupiter.MockitoExtension;
99

1010
import java.util.Collections;
11+
import java.util.List;
1112
import java.util.Map;
1213
import java.util.stream.Stream;
1314

14-
import static java.util.Arrays.asList;
1515
import static java.util.Map.entry;
1616
import static org.assertj.core.api.Assertions.assertThat;
1717
import static org.mockito.ArgumentMatchers.anyList;
@@ -38,7 +38,7 @@ void defaultLabelsAndTags() {
3838
CloudLoggingServicesProvider provider = new CloudLoggingServicesProvider(emptyProperties, adapter);
3939

4040
assertThat(provider.get()).containsExactly(mockService);
41-
verify(adapter).stream(asList("user-provided", "cloud-logging"), Collections.singletonList("Cloud Logging"));
41+
verify(adapter).stream(List.of("user-provided", "cloud-logging"), List.of("Cloud Logging"));
4242
}
4343

4444
@Test
@@ -50,8 +50,7 @@ void customLabel() {
5050
CloudLoggingServicesProvider provider = new CloudLoggingServicesProvider(config, adapter);
5151

5252
assertThat(provider.get()).containsExactly(mockService);
53-
verify(adapter).stream(asList("unknown-label", "not-cloud-logging"),
54-
Collections.singletonList("Cloud Logging"));
53+
verify(adapter).stream(List.of("unknown-label", "not-cloud-logging"), List.of("Cloud Logging"));
5554
}
5655

5756
@Test
@@ -62,8 +61,7 @@ void customTag() {
6261
CloudLoggingServicesProvider provider = new CloudLoggingServicesProvider(emptyProperties, adapter);
6362

6463
assertThat(provider.get()).containsExactly(mockService);
65-
verify(adapter).stream(asList("user-provided", "cloud-logging"),
66-
Collections.singletonList("NOT Cloud Logging"));
64+
verify(adapter).stream(List.of("user-provided", "cloud-logging"), List.of("NOT Cloud Logging"));
6765
}
6866

6967
}

‎cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/binding/DynatraceServicesProviderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
import org.mockito.junit.jupiter.MockitoExtension;
99

1010
import java.util.Collections;
11+
import java.util.List;
1112
import java.util.Map;
1213
import java.util.stream.Stream;
1314

14-
import static java.util.Arrays.asList;
1515
import static java.util.Map.entry;
1616
import static org.assertj.core.api.Assertions.assertThat;
1717
import static org.mockito.ArgumentMatchers.anyList;
@@ -38,7 +38,7 @@ void defaultLabelsAndTags() {
3838
DynatraceServiceProvider provider = new DynatraceServiceProvider(emptyProperties, adapter);
3939

4040
assertThat(provider.get()).isEqualTo(mockService);
41-
verify(adapter).stream(asList("user-provided", "dynatrace"), Collections.singletonList("dynatrace"));
41+
verify(adapter).stream(List.of("user-provided", "dynatrace"), List.of("dynatrace"));
4242
}
4343

4444
@Test
@@ -50,7 +50,7 @@ void customLabel() {
5050
DynatraceServiceProvider provider = new DynatraceServiceProvider(config, adapter);
5151

5252
assertThat(provider.get()).isEqualTo(mockService);
53-
verify(adapter).stream(asList("unknown-label", "not-dynatrace"), Collections.singletonList("dynatrace"));
53+
verify(adapter).stream(List.of("unknown-label", "not-dynatrace"), List.of("dynatrace"));
5454
}
5555

5656
@Test
@@ -61,7 +61,7 @@ void customTag() {
6161
DynatraceServiceProvider provider = new DynatraceServiceProvider(emptyProperties, adapter);
6262

6363
assertThat(provider.get()).isEqualTo(mockService);
64-
verify(adapter).stream(asList("user-provided", "dynatrace"), Collections.singletonList("NOT dynatrace"));
64+
verify(adapter).stream(List.of("user-provided", "dynatrace"), List.of("NOT dynatrace"));
6565
}
6666

6767
}

‎cf-java-logging-support-opentelemetry-agent-extension/src/test/java/com/sap/hcf/cf/logging/opentelemetry/agent/ext/exporter/MultiMetricExporterTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010

1111
import java.util.Collection;
1212
import java.util.Collections;
13+
import java.util.List;
1314

14-
import static java.util.Arrays.asList;
1515
import static java.util.Collections.emptyList;
16-
import static java.util.Collections.singletonList;
1716
import static org.assertj.core.api.Assertions.assertThat;
1817
import static org.mockito.Mockito.*;
1918

@@ -32,7 +31,7 @@ public void createsNoopExporterOnEmptyExporterList() {
3231
@Test
3332
public void returnsSingleExporterOnOneEntryExporterList() {
3433
MetricExporter exporter = mock(MetricExporter.class);
35-
assertThat(MultiMetricExporter.composite(singletonList(exporter), null, null)).isSameAs(exporter);
34+
assertThat(MultiMetricExporter.composite(List.of(exporter), null, null)).isSameAs(exporter);
3635
}
3736

3837
@Test
@@ -43,7 +42,7 @@ public void delegatesExport() {
4342
MetricExporter exporter2 = mock(MetricExporter.class);
4443
when(exporter2.export(metrics)).thenReturn(CompletableResultCode.ofSuccess());
4544

46-
MetricExporter metricExporter = MultiMetricExporter.composite(asList(exporter1, exporter2), null, null);
45+
MetricExporter metricExporter = MultiMetricExporter.composite(List.of(exporter1, exporter2), null, null);
4746
metricExporter.export(metrics);
4847

4948
verify(exporter1).export(metrics);
@@ -57,7 +56,7 @@ public void delegatesFlush() {
5756
MetricExporter exporter2 = mock(MetricExporter.class);
5857
when(exporter2.flush()).thenReturn(CompletableResultCode.ofSuccess());
5958

60-
MetricExporter metricExporter = MultiMetricExporter.composite(asList(exporter1, exporter2), null, null);
59+
MetricExporter metricExporter = MultiMetricExporter.composite(List.of(exporter1, exporter2), null, null);
6160
metricExporter.flush();
6261

6362
verify(exporter1).flush();
@@ -71,7 +70,7 @@ public void delegatesShutdwon() {
7170
MetricExporter exporter2 = mock(MetricExporter.class);
7271
when(exporter2.shutdown()).thenReturn(CompletableResultCode.ofSuccess());
7372

74-
MetricExporter metricExporter = MultiMetricExporter.composite(asList(exporter1, exporter2), null, null);
73+
MetricExporter metricExporter = MultiMetricExporter.composite(List.of(exporter1, exporter2), null, null);
7574
metricExporter.shutdown();
7675

7776
verify(exporter1).shutdown();
@@ -86,7 +85,7 @@ public void delegatesAggregationTemporality() {
8685
AggregationTemporalitySelector aggregationTemporalitySelector = mock(AggregationTemporalitySelector.class);
8786

8887
MetricExporter metricExporter =
89-
MultiMetricExporter.composite(asList(exporter1, exporter2), aggregationTemporalitySelector, null);
88+
MultiMetricExporter.composite(List.of(exporter1, exporter2), aggregationTemporalitySelector, null);
9089
metricExporter.getAggregationTemporality(InstrumentType.OBSERVABLE_GAUGE);
9190

9291
verify(aggregationTemporalitySelector).getAggregationTemporality(InstrumentType.OBSERVABLE_GAUGE);
@@ -100,7 +99,7 @@ public void delegatesDefaultAggregation() {
10099
DefaultAggregationSelector defaultAggregationSelector = mock(DefaultAggregationSelector.class);
101100

102101
MetricExporter metricExporter =
103-
MultiMetricExporter.composite(asList(exporter1, exporter2), null, defaultAggregationSelector);
102+
MultiMetricExporter.composite(List.of(exporter1, exporter2), null, defaultAggregationSelector);
104103
metricExporter.getDefaultAggregation(InstrumentType.OBSERVABLE_GAUGE);
105104

106105
verify(defaultAggregationSelector).getDefaultAggregation(InstrumentType.OBSERVABLE_GAUGE);
@@ -111,7 +110,7 @@ public void delegatesAggregationTemporalityToFirstExporterIfNoExplicitAggregatio
111110
MetricExporter exporter1 = mock(MetricExporter.class);
112111
MetricExporter exporter2 = mock(MetricExporter.class);
113112

114-
MetricExporter metricExporter = MultiMetricExporter.composite(asList(exporter1, exporter2), null, null);
113+
MetricExporter metricExporter = MultiMetricExporter.composite(List.of(exporter1, exporter2), null, null);
115114

116115
metricExporter.getAggregationTemporality(InstrumentType.OBSERVABLE_GAUGE);
117116

@@ -123,7 +122,7 @@ public void delegatesDefaultAggregationToFirstExporterIfNoExplicitAggregation()
123122
MetricExporter exporter1 = mock(MetricExporter.class);
124123
MetricExporter exporter2 = mock(MetricExporter.class);
125124

126-
MetricExporter metricExporter = MultiMetricExporter.composite(asList(exporter1, exporter2), null, null);
125+
MetricExporter metricExporter = MultiMetricExporter.composite(List.of(exporter1, exporter2), null, null);
127126

128127
metricExporter.getDefaultAggregation(InstrumentType.OBSERVABLE_GAUGE);
129128

‎cf-java-logging-support-servlet/src/test/java/com/sap/hcp/cf/logging/servlet/filter/GenerateRequestLogFilterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import org.slf4j.MDC;
2323

2424
import java.util.Enumeration;
25+
import java.util.List;
2526

2627
import static java.util.Collections.enumeration;
27-
import static java.util.Collections.singletonList;
2828
import static org.assertj.core.api.Assertions.assertThat;
2929
import static org.mockito.Mockito.*;
3030

@@ -140,7 +140,7 @@ public String getInitParameter(String s) {
140140

141141
@Override
142142
public Enumeration<String> getInitParameterNames() {
143-
return enumeration(singletonList("wrapRequest"));
143+
return enumeration(List.of("wrapRequest"));
144144
}
145145
}
146146
}

0 commit comments

Comments
 (0)