Skip to content

Commit 9a93329

Browse files
ryanjbaxterryanjbaxter
committed
Removing KubernetesDiscoveryProperties constructors. From #1642 
1 parent 59ae9cf commit 9a93329

File tree

28 files changed

+199
-212
lines changed

28 files changed

+199
-212
lines changed

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterMetadataTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void testAllExtraMetadataDisabled() {
7878
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false,
7979
null, false, null);
8080
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
81-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
81+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
8282

8383
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
8484
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -97,7 +97,7 @@ void testLabelsEnabled() {
9797
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, null, false,
9898
null, false, null);
9999
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
100-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
100+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
101101

102102
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
103103
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -117,7 +117,7 @@ void testLabelsEnabledWithPrefix() {
117117
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, "l_", false,
118118
null, false, null);
119119
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
120-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
120+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
121121

122122
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
123123
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -137,7 +137,7 @@ void testAnnotationsEnabled() {
137137
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, true,
138138
null, false, null);
139139
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
140-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
140+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
141141

142142
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
143143
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -157,7 +157,7 @@ void testAnnotationsEnabledWithPrefix() {
157157
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, true,
158158
"a_", false, null);
159159
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
160-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
160+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
161161

162162
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
163163
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -177,7 +177,7 @@ void testPortsEnabled() {
177177
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false,
178178
null, true, null);
179179
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
180-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
180+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
181181

182182
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
183183
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -197,7 +197,7 @@ void testPortsEnabledWithPrefix() {
197197
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false,
198198
null, true, "p_");
199199
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
200-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
200+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
201201

202202
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
203203
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -217,7 +217,7 @@ void testLabelsAndAnnotationsAndPortsEnabledWithPrefix() {
217217
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(true, "l_", true,
218218
"a_", true, "p_");
219219
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
220-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
220+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
221221

222222
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
223223
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientFilterTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void testEmptyExpression(CapturedOutput output) {
4343

4444
String spelFilter = null;
4545
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L,
46-
false, spelFilter, Set.of(), Map.of(), null, null, 0, false);
46+
false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null);
4747

4848
Predicate<V1Service> predicate = KubernetesDiscoveryClientUtils.filter(properties);
4949
Assertions.assertThat(predicate).isNotNull();
@@ -55,7 +55,7 @@ void testExpressionPresent(CapturedOutput output) {
5555

5656
String spelFilter = "some";
5757
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L,
58-
false, spelFilter, Set.of(), Map.of(), null, null, 0, false);
58+
false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null);
5959

6060
Predicate<V1Service> predicate = KubernetesDiscoveryClientUtils.filter(properties);
6161
Assertions.assertThat(predicate).isNotNull();
@@ -68,7 +68,7 @@ void testTwoServicesBothMatch() {
6868
#root.metadata.namespace matches "^.+A$"
6969
""";
7070
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L,
71-
false, spelFilter, Set.of(), Map.of(), null, null, 0, false);
71+
false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null);
7272

7373
V1Service a = new V1ServiceBuilder().withNewMetadata().withNamespace("namespace-A").withName("a").and().build();
7474

@@ -90,7 +90,7 @@ void testTwoServicesNoneMatch() {
9090
#root.metadata.namespace matches "^.+A$"
9191
""";
9292
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L,
93-
false, spelFilter, Set.of(), Map.of(), null, null, 0, false);
93+
false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null);
9494

9595
V1Service a = new V1ServiceBuilder().withNewMetadata().withNamespace("namespace-B").withName("a").and().build();
9696

@@ -111,7 +111,7 @@ void testTwoServicesOneMatch() {
111111
#root.metadata.namespace matches "^.+A$"
112112
""";
113113
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(false, false, Set.of(), true, 60L,
114-
false, spelFilter, Set.of(), Map.of(), null, null, 0, false);
114+
false, spelFilter, Set.of(), Map.of(), null, null, 0, false, false, null);
115115

116116
V1Service a = new V1ServiceBuilder().withNewMetadata().withNamespace("namespace-B").withName("a").and().build();
117117

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientServiceWithoutPortNameTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void testDiscoveryWithoutAServicePortName() {
8989

9090
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(NAMESPACE),
9191
true, 60, false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0,
92-
true);
92+
true, false, null);
9393
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
9494
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
9595

‎spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesDiscoveryClientTests.java‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void getInstancesShouldBeAbleToHandleEndpointsSingleAddress() {
9090
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false,
9191
null, false, null);
9292
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
93-
false, null, Set.of(), Map.of(), null, metadata, 0, true);
93+
false, null, Set.of(), Map.of(), null, metadata, 0, true, false, null);
9494

9595
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
9696
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -120,7 +120,8 @@ void getInstancesShouldBeAbleToHandleEndpointsSingleAddressAndMultiplePorts() {
120120
setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols);
121121

122122
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60,
123-
false, null, Set.of(), labels, "http_tcp", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true);
123+
false, null, Set.of(), labels, "http_tcp", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true,
124+
false, null);
124125

125126
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
126127
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -154,7 +155,7 @@ void getInstancesShouldBeAbleToHandleEndpointsMultipleAddresses() {
154155
KubernetesDiscoveryProperties.Metadata metadata = new KubernetesDiscoveryProperties.Metadata(false, null, false,
155156
null, true, "port.");
156157
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60,
157-
false, null, Set.of(443, 8443), labels, null, metadata, 0, true);
158+
false, null, Set.of(443, 8443), labels, null, metadata, 0, true, false, null);
158159

159160
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
160161
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -190,7 +191,8 @@ void getInstancesShouldBeAbleToHandleEndpointsFromMultipleNamespaces() {
190191
setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols);
191192

192193
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60,
193-
false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true);
194+
false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false,
195+
null);
194196

195197
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
196198
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -230,7 +232,8 @@ void instanceWithoutSubsetsShouldBeSkipped() {
230232
servicesCache.add(service);
231233

232234
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60,
233-
false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true);
235+
false, null, Set.of(), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true, false,
236+
null);
234237
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
235238
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
236239

@@ -255,8 +258,8 @@ void getInstancesShouldBeAbleToHandleEndpointsSingleAddressAndMultiplePortsUsing
255258
setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols);
256259

257260
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60,
258-
false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0,
259-
true);
261+
false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true,
262+
false, null);
260263
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
261264
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
262265

@@ -287,8 +290,8 @@ void instanceWithMultiplePortsAndMisconfiguredPrimaryPortNameInLabelWithoutFallb
287290
setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols);
288291

289292
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
290-
false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0,
291-
true);
293+
false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true,
294+
false, null);
292295
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
293296
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
294297

@@ -319,7 +322,7 @@ void instanceWithMultiplePortsAndMisconfiguredGenericPrimaryPortNameWithoutFallb
319322

320323
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
321324
false, null, Set.of(443, 8443), Map.of(), "oops", KubernetesDiscoveryProperties.Metadata.DEFAULT, 0,
322-
true);
325+
true, false, null);
323326
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
324327
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
325328

@@ -349,8 +352,8 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldFallBackTo
349352
setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols);
350353

351354
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, false, Set.of(), true, 60,
352-
false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0,
353-
true);
355+
false, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true,
356+
false, null);
354357

355358
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
356359
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);
@@ -412,7 +415,8 @@ void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldLogWarning
412415
setup(serviceId, serviceType, namespace, labels, ips, uuids, names, protocols, ports, appProtocols);
413416

414417
KubernetesDiscoveryProperties properties = new KubernetesDiscoveryProperties(true, true, Set.of(), true, 60,
415-
true, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true);
418+
true, null, Set.of(443, 8443), Map.of(), null, KubernetesDiscoveryProperties.Metadata.DEFAULT, 0, true,
419+
false, null);
416420

417421
KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient(STUB, servicesLister,
418422
endpointsLister, SERVICE_SHARED_INFORMER_STUB, ENDPOINTS_SHARED_INFORMER_STUB, properties);

0 commit comments

Comments
 (0)