Skip to content

Commit

Permalink
Bumping versions
Browse files Browse the repository at this point in the history
  • Loading branch information
spring-builds committed Jan 17, 2024
1 parent 4582dbf commit a4e2115
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void disableBlockingAndReactive() {
@Test
void disableBlockingEnableReactive() {
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true");
"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true");
applicationContextRunner.run(context -> {
assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
});
Expand All @@ -110,14 +110,15 @@ void disableBlockingEnableReactive() {
@Test
void enableBlockingDisableReactive() {
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false");
"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false");
applicationContextRunner.run(context -> {
assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
});
}

/**
* spring.cloud.kubernetes.discovery.enabled is false, catalog watcher is disabled also.
* spring.cloud.kubernetes.discovery.enabled is false, catalog watcher is disabled
* also.
*/
@Test
void disableKubernetesDiscovery() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ void disableBlockingAndReactive() {
@Test
void disableBlockingEnableReactive() {
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true",
"spring.cloud.kubernetes.discovery.discovery-server-url=example.com",
"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true",
"spring.cloud.kubernetes.discovery.discovery-server-url=example.com",
"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
applicationContextRunner.run(context -> {
assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
});
Expand All @@ -111,9 +111,9 @@ void disableBlockingEnableReactive() {
@Test
void enableBlockingDisableReactive() {
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false",
"spring.cloud.kubernetes.discovery.discovery-server-url=example.com",
"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false",
"spring.cloud.kubernetes.discovery.discovery-server-url=example.com",
"spring.cloud.kubernetes.http.discovery.catalog.watcher.enabled=true");
applicationContextRunner.run(context -> {
assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void disableBlockingAndReactive() {
@Test
void disableBlockingEnableReactive() {
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true");
"spring.cloud.discovery.blocking.enabled=false", "spring.cloud.discovery.reactive.enabled=true");
applicationContextRunner.run(context -> {
assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
assertThat(context).doesNotHaveBean(KubernetesClientServicesFunction.class);
Expand All @@ -105,7 +105,7 @@ void disableBlockingEnableReactive() {
@Test
void enableBlockingDisableReactive() {
setup("spring.main.cloud-platform=KUBERNETES", "spring.cloud.config.enabled=false",
"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false");
"spring.cloud.discovery.blocking.enabled=true", "spring.cloud.discovery.reactive.enabled=false");
applicationContextRunner.run(context -> {
assertThat(context).hasSingleBean(KubernetesCatalogWatch.class);
assertThat(context).doesNotHaveBean(KubernetesClientServicesFunction.class);
Expand All @@ -115,7 +115,8 @@ void enableBlockingDisableReactive() {
}

/**
* spring.cloud.kubernetes.discovery.enabled is false, catalog watcher is disabled also.
* spring.cloud.kubernetes.discovery.enabled is false, catalog watcher is disabled
* also.
*/
@Test
void disableKubernetesDiscovery() {
Expand Down

0 comments on commit a4e2115

Please sign in to comment.