Skip to content

Commit f1a2e15

Browse files
KarstenSchnitterKarstenSchnitter
committed
Use correct Java 11 build for OTel Extension
Switch to <release> tag with compiler plugin. This forces Java 11 compliant code requiring a test change. Signed-off-by: Karsten Schnitter <k.schnitter@sap.com>
1 parent 4fbdaae commit f1a2e15

File tree

3 files changed

+66
-59
lines changed

3 files changed

+66
-59
lines changed

‎cf-java-logging-support-opentelemetry-agent-extension/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
</parent>
1717

1818
<properties>
19-
<maven.compiler.source>11</maven.compiler.source>
20-
<maven.compiler.target>11</maven.compiler.target>
2119
<opentelemetry.sdk.version>1.55.0</opentelemetry.sdk.version>
2220
</properties>
2321

@@ -86,6 +84,14 @@
8684

8785
<build>
8886
<plugins>
87+
<plugin>
88+
<groupId>org.apache.maven.plugins</groupId>
89+
<artifactId>maven-compiler-plugin</artifactId>
90+
<version>${compiler.plugin.version}</version>
91+
<configuration>
92+
<release>11</release>
93+
</configuration>
94+
</plugin>
8995
<plugin>
9096
<groupId>org.apache.maven.plugins</groupId>
9197
<artifactId>maven-shade-plugin</artifactId>

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

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,71 +4,70 @@
44
import org.assertj.core.api.ObjectAssert;
55
import org.junit.jupiter.api.Test;
66

7-
import java.util.Collections;
87
import java.util.List;
98

109
import static java.util.Arrays.asList;
1110
import static java.util.Collections.emptyList;
11+
import static java.util.Collections.singletonList;
1212
import static java.util.stream.Collectors.toList;
1313
import static org.assertj.core.api.Assertions.assertThat;
1414

1515
public class CloudFoundryServicesAdapterTest {
16-
private static final String DEFAULT_VCAP_SERVICES = """
17-
{
18-
"managed-find-me-service": [
19-
{
20-
"label": "managed-find-me-service",
21-
"tags": ["Find Me!"],
22-
"name": "managed-find-me1"
23-
},
24-
{
25-
"label": "managed-find-me-service",
26-
"tags": ["Find Me!"],
27-
"name": "managed-find-me2"
28-
},
29-
{
30-
"label": "managed-find-me-service",
31-
"tags": ["You can't see me!"],
32-
"name": "managed-other"
33-
}
34-
],
35-
"managed-notice-me-not-service": [
36-
{
37-
"label": "managed-notice-me-not-service",
38-
"tags": ["Find Me!"],
39-
"name": "managed-other1"
40-
},
41-
{
42-
"label": "managed-notice-me-not-service",
43-
"tags": ["You can't see me!"],
44-
"name": "managed-other2"
45-
}
46-
],
47-
"user-provided": [
48-
{
49-
"label": "user-provided",
50-
"tags": ["Find Me!"],
51-
"name": "ups-find-me1"
52-
},
53-
{
54-
"label": "user-provided",
55-
"tags": ["Find Me!"],
56-
"name": "ups-find-me2"
57-
},
58-
{
59-
"label": "user-provided",
60-
"tags": ["You can't see me!"],
61-
"name": "ups-other"
62-
}
63-
]
64-
}""";
16+
private static final String DEFAULT_VCAP_SERVICES = "{\n" + //
17+
" \"managed-find-me-service\": [\n" + //
18+
" {\n" + //
19+
" \"label\": \"managed-find-me-service\",\n" + //
20+
" \"tags\": [\"Find Me!\"],\n" + //
21+
" \"name\": \"managed-find-me1\"\n" + //
22+
" },\n" + //
23+
" {\n" + //
24+
" \"label\": \"managed-find-me-service\",\n" + //
25+
" \"tags\": [\"Find Me!\"],\n" + //
26+
" \"name\": \"managed-find-me2\"\n" + //
27+
" },\n" + //
28+
" {\n" + //
29+
" \"label\": \"managed-find-me-service\",\n" + //
30+
" \"tags\": [\"You can't see me!\"],\n" + //
31+
" \"name\": \"managed-other\"\n" + //
32+
" }\n" + //
33+
" ],\n" + //
34+
" \"managed-notice-me-not-service\": [\n" + //
35+
" {\n" + //
36+
" \"label\": \"managed-notice-me-not-service\",\n" + //
37+
" \"tags\": [\"Find Me!\"],\n" + //
38+
" \"name\": \"managed-other1\"\n" + //
39+
" },\n" + //
40+
" {\n" + //
41+
" \"label\": \"managed-notice-me-not-service\",\n" + //
42+
" \"tags\": [\"You can't see me!\"],\n" + //
43+
" \"name\": \"managed-other2\"\n" + //
44+
" }\n" + //
45+
" ],\n" + //
46+
" \"user-provided\": [\n" + //
47+
" {\n" + //
48+
" \"label\": \"user-provided\",\n" + //
49+
" \"tags\": [\"Find Me!\"],\n" + //
50+
" \"name\": \"ups-find-me1\"\n" + //
51+
" },\n" + //
52+
" {\n" + //
53+
" \"label\": \"user-provided\",\n" + //
54+
" \"tags\": [\"Find Me!\"],\n" + //
55+
" \"name\": \"ups-find-me2\"\n" + //
56+
" },\n" + //
57+
" {\n" + //
58+
" \"label\": \"user-provided\",\n" + //
59+
" \"tags\": [\"You can't see me!\"],\n" + //
60+
" \"name\": \"ups-other\"\n" + //
61+
" }\n" + //
62+
" ]\n" + //
63+
"}";
6564

6665
private static final CloudFoundryServicesAdapter DEFAULT_ADAPTER =
6766
new CloudFoundryServicesAdapter(DEFAULT_VCAP_SERVICES);
6867

6968
@Test
7069
void getsAllServicesWithNullParameters() {
71-
List<CloudFoundryServiceInstance> services = DEFAULT_ADAPTER.stream(null, null).toList();
70+
List<CloudFoundryServiceInstance> services = DEFAULT_ADAPTER.stream(null, null).collect(toList());
7271
assertServiceNames(services).containsExactly("managed-find-me1", "managed-find-me2", "managed-other",
7372
"managed-other1", "managed-other2", "ups-find-me1", "ups-find-me2",
7473
"ups-other");
@@ -83,31 +82,32 @@ private static AbstractListAssert<?, List<? extends String>, String, ObjectAsser
8382
@Test
8483
void filtersBySingleLabel() {
8584
List<CloudFoundryServiceInstance> services =
86-
DEFAULT_ADAPTER.stream(Collections.singletonList("managed-find-me-service"), emptyList()).toList();
85+
DEFAULT_ADAPTER.stream(singletonList("managed-find-me-service"), emptyList()).collect(toList());
8786
assertServiceNames(services).containsExactlyInAnyOrder("managed-find-me1", "managed-find-me2", "managed-other");
8887
}
8988

9089
@Test
9190
void priotizesByServiceLabel() {
9291
List<CloudFoundryServiceInstance> services =
93-
DEFAULT_ADAPTER.stream(asList("user-provided", "managed-find-me-service"), emptyList()).toList();
92+
DEFAULT_ADAPTER.stream(asList("user-provided", "managed-find-me-service"), emptyList())
93+
.collect(toList());
9494
assertServiceNames(services).containsExactly("ups-find-me1", "ups-find-me2", "ups-other", "managed-find-me1",
9595
"managed-find-me2", "managed-other");
9696
}
9797

9898
@Test
9999
void filtersBySingleTag() {
100100
List<CloudFoundryServiceInstance> services =
101-
DEFAULT_ADAPTER.stream(emptyList(), Collections.singletonList("Find Me!")).toList();
101+
DEFAULT_ADAPTER.stream(emptyList(), singletonList("Find Me!")).collect(toList());
102102
assertServiceNames(services).containsExactlyInAnyOrder("managed-find-me1", "managed-find-me2", "managed-other1",
103103
"ups-find-me1", "ups-find-me2");
104104
}
105105

106106
@Test
107107
void standardUseCase() {
108108
List<CloudFoundryServiceInstance> services =
109-
DEFAULT_ADAPTER.stream(asList("user-provided", "managed-find-me-service"),
110-
Collections.singletonList("Find Me!")).collect(toList());
109+
DEFAULT_ADAPTER.stream(asList("user-provided", "managed-find-me-service"), singletonList("Find Me!"))
110+
.collect(toList());
111111
assertServiceNames(services).containsExactly("ups-find-me1", "ups-find-me2", "managed-find-me1",
112112
"managed-find-me2");
113113
}

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
<logback.version>1.5.20</logback.version>
112112
<log4j2.version>2.25.2</log4j2.version>
113113
<buildnumber.plugin.version>3.2.1</buildnumber.plugin.version>
114+
<compiler.plugin.version>3.14.1</compiler.plugin.version>
114115
<source.plugin.version>3.3.1</source.plugin.version>
115116
<jar.plugin.version>3.4.2</jar.plugin.version>
116117
<hamcrest.version>1.3</hamcrest.version>
@@ -218,7 +219,7 @@
218219
<plugin>
219220
<groupId>org.apache.maven.plugins</groupId>
220221
<artifactId>maven-compiler-plugin</artifactId>
221-
<version>3.14.1</version>
222+
<version>${compiler.plugin.version}</version>
222223
<configuration>
223224
<release>17</release>
224225
</configuration>

0 commit comments

Comments
 (0)