Skip to content

Commit 84524c3

Browse files
wind57wind57
committed
merge integration tests
Signed-off-by: wind57 <[email protected]>
2 parents 2150632 + ffea5b2 commit 84524c3

File tree

21 files changed

+159
-151
lines changed

21 files changed

+159
-151
lines changed

‎spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void initialize(BootstrapRegistry registry) {
7676
kubernetesClient, discoveryProperties, new ServicePortSecureResolver(discoveryProperties),
7777
new KubernetesNamespaceProvider(propertyResolver
7878
.get(KubernetesNamespaceProvider.NAMESPACE_PROPERTY, String.class, null)),
79-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(discoveryProperties));
79+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(discoveryProperties));
8080
return discoveryClient::getInstances;
8181
}
8282
});

‎spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientPredicateAutoConfiguration.java‎ renamed to ‎spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryClientSpelAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
@ConditionalOnBlockingOrReactiveDiscoveryEnabled
4444
@ConditionalOnCloudPlatform(CloudPlatform.KUBERNETES)
4545
@AutoConfigureAfter(KubernetesDiscoveryPropertiesAutoConfiguration.class)
46-
class Fabric8DiscoveryClientPredicateAutoConfiguration {
46+
class Fabric8DiscoveryClientSpelAutoConfiguration {
4747

4848
@Bean
4949
@ConditionalOnMissingBean

‎spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
@ConditionalOnSpringCloudKubernetesBlockingDiscovery
5353
@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class })
5454
@AutoConfigureAfter({ Fabric8AutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class,
55-
Fabric8DiscoveryClientPredicateAutoConfiguration.class })
55+
Fabric8DiscoveryClientSpelAutoConfiguration.class })
5656
class Fabric8KubernetesDiscoveryClientAutoConfiguration {
5757

5858
private static final LogAccessor LOG = new LogAccessor(

‎spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientConfigClientBootstrapConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
@Configuration(proxyBeanMethods = false)
3333
@ConditionalOnProperty("spring.cloud.config.discovery.enabled")
3434
@Import({ Fabric8AutoConfiguration.class, Fabric8KubernetesDiscoveryClientAutoConfiguration.class,
35-
Fabric8DiscoveryClientPredicateAutoConfiguration.class })
35+
Fabric8DiscoveryClientSpelAutoConfiguration.class })
3636
@EnableConfigurationProperties({ KubernetesDiscoveryProperties.class, KubernetesClientProperties.class })
3737
class Fabric8KubernetesDiscoveryClientConfigClientBootstrapConfiguration {
3838

‎spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesReactiveDiscoveryClient.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616

1717
package org.springframework.cloud.kubernetes.fabric8.discovery;
1818

19+
import java.util.Objects;
20+
1921
import reactor.core.publisher.Flux;
2022
import reactor.core.scheduler.Schedulers;
2123

2224
import org.springframework.cloud.client.ServiceInstance;
2325
import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
24-
import org.springframework.util.Assert;
2526

2627
/**
2728
* Kubernetes implementation of {@link ReactiveDiscoveryClient}. Currently relies on the
@@ -44,7 +45,7 @@ public String description() {
4445

4546
@Override
4647
public Flux<ServiceInstance> getInstances(String serviceId) {
47-
Assert.notNull(serviceId, "[Assertion failed] - the object argument must not be null");
48+
Objects.requireNonNull(serviceId, "serviceId must not be null");
4849
return Flux.defer(() -> Flux.fromIterable(fabric8KubernetesDiscoveryClient.getInstances(serviceId)))
4950
.subscribeOn(Schedulers.boundedElastic());
5051
}

‎spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesReactiveDiscoveryClientAutoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
ReactiveCommonsClientAutoConfiguration.class })
5858
@AutoConfigureAfter({ ReactiveCompositeDiscoveryClientAutoConfiguration.class,
5959
Fabric8KubernetesDiscoveryClientAutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class,
60-
Fabric8DiscoveryClientPredicateAutoConfiguration.class })
60+
Fabric8DiscoveryClientSpelAutoConfiguration.class })
6161
class Fabric8KubernetesReactiveDiscoveryClientAutoConfiguration {
6262

6363
private static final LogAccessor LOG = new LogAccessor(

‎spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8DiscoveryFilterTests.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void testAllNamespacesWithoutLabelsWithoutFilter() {
8888
service("namespaceB", "serviceB", Map.of("color", "blue"));
8989

9090
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
91-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
91+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
9292

9393
Assertions.assertEquals(result.size(), 2);
9494
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
@@ -120,7 +120,7 @@ void testAllNamespacesWithLabelsWithoutFilter() {
120120
service("namespaceB", "serviceB", Map.of("color", "blue"));
121121

122122
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
123-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
123+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
124124
Assertions.assertEquals(result.size(), 1);
125125
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
126126
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
@@ -154,7 +154,7 @@ void testAllNamespacesWithoutLabelsWithNamespaceFilter() {
154154
service("namespaceB", "serviceB", Map.of("color", "blue"));
155155

156156
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
157-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
157+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
158158
Assertions.assertEquals(result.size(), 1);
159159
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
160160
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
@@ -190,7 +190,7 @@ void testAllNamespacesWithoutLabelsWithNamespacesFilter() {
190190
service("namespaceC", "serviceC", Map.of("color", "purple"));
191191

192192
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
193-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
193+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
194194
Assertions.assertEquals(result.size(), 2);
195195
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
196196
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
@@ -225,7 +225,7 @@ void testSpecificNamespaceWithoutLabelsWithoutFilter() {
225225
service("namespaceB", "serviceB", Map.of("color", "blue"));
226226

227227
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
228-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
228+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
229229
Assertions.assertEquals(result.size(), 1);
230230
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
231231
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
@@ -262,7 +262,7 @@ void testSpecificNamespaceWithLabelsWithoutFilter() {
262262
service("namespaceC", "serviceC", Map.of("color", "purple"));
263263

264264
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
265-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
265+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
266266
Assertions.assertEquals(result.size(), 1);
267267
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceB");
268268
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
@@ -304,7 +304,7 @@ void testSpecificNamespaceWithoutLabelsWithFilter() {
304304
service("namespaceC", "serviceC", Map.of("color", "purple", "number", "1"));
305305

306306
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
307-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
307+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
308308
Assertions.assertEquals(result.size(), 1);
309309
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
310310
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
@@ -339,7 +339,7 @@ void testSomeNamespacesWithoutLabelsWithoutFilter() {
339339
service("namespaceC", "serviceC", Map.of());
340340

341341
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
342-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
342+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
343343
Assertions.assertEquals(result.size(), 2);
344344
result = result.stream().sorted(Comparator.comparing(x -> x.getMetadata().getName())).toList();
345345
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
@@ -377,7 +377,7 @@ void testSomeNamespacesWithLabelsWithoutFilter() {
377377
service("namespaceC", "serviceC", Map.of("color", "purple"));
378378

379379
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
380-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
380+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
381381
Assertions.assertEquals(result.size(), 1);
382382
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
383383
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");
@@ -414,7 +414,7 @@ void testSomeNamespacesWithLabelsWithFilter() {
414414
service("namespaceC", "serviceC", Map.of("color", "purple", "number", "1"));
415415

416416
List<Service> result = services(properties, client, NAMESPACE_PROVIDER,
417-
new Fabric8DiscoveryClientPredicateAutoConfiguration().predicate(properties), null, "dummy-target");
417+
new Fabric8DiscoveryClientSpelAutoConfiguration().predicate(properties), null, "dummy-target");
418418
Assertions.assertEquals(result.size(), 1);
419419
Assertions.assertEquals(result.get(0).getMetadata().getName(), "serviceA");
420420
Assertions.assertEquals(result.get(0).getMetadata().getNamespace(), "namespaceA");

‎spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesCatalogServicesWatchConfigurationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ private void setup(String... env) {
8484
KubernetesClientTestConfiguration.class, Fabric8KubernetesCatalogWatchAutoConfiguration.class,
8585
Fabric8KubernetesDiscoveryClientAutoConfiguration.class,
8686
KubernetesDiscoveryPropertiesAutoConfiguration.class,
87-
Fabric8DiscoveryClientPredicateAutoConfiguration.class)
87+
Fabric8DiscoveryClientSpelAutoConfiguration.class)
8888
.web(WebApplicationType.NONE)
8989
.properties(envList.toArray(new String[0]))
9090
.run();

‎spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesCatalogWatchAutoConfigurationApplicationContextTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private void setup(String... properties) {
132132
.withConfiguration(AutoConfigurations.of(Fabric8KubernetesCatalogWatchAutoConfiguration.class,
133133
Fabric8AutoConfiguration.class, KubernetesCommonsAutoConfiguration.class,
134134
KubernetesDiscoveryPropertiesAutoConfiguration.class,
135-
Fabric8DiscoveryClientPredicateAutoConfiguration.class))
135+
Fabric8DiscoveryClientSpelAutoConfiguration.class))
136136
.withPropertyValues(properties);
137137
}
138138

‎spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientAutoConfigurationApplicationContextTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private void setup(String... properties) {
155155
.withConfiguration(AutoConfigurations.of(Fabric8KubernetesDiscoveryClientAutoConfiguration.class,
156156
Fabric8AutoConfiguration.class, KubernetesCommonsAutoConfiguration.class,
157157
KubernetesDiscoveryPropertiesAutoConfiguration.class,
158-
Fabric8DiscoveryClientPredicateAutoConfiguration.class))
158+
Fabric8DiscoveryClientSpelAutoConfiguration.class))
159159
.withPropertyValues(properties);
160160
}
161161

@@ -164,7 +164,7 @@ private void setupWithFilteredClassLoader(Class<?> cls, String... properties) {
164164
.withConfiguration(AutoConfigurations.of(Fabric8KubernetesDiscoveryClientAutoConfiguration.class,
165165
Fabric8AutoConfiguration.class, KubernetesCommonsAutoConfiguration.class,
166166
KubernetesDiscoveryPropertiesAutoConfiguration.class,
167-
Fabric8DiscoveryClientPredicateAutoConfiguration.class))
167+
Fabric8DiscoveryClientSpelAutoConfiguration.class))
168168
.withClassLoader(new FilteredClassLoader(cls))
169169
.withPropertyValues(properties);
170170
}

0 commit comments

Comments
 (0)