Merge branch '3.1.x'

spring-cloud · Nov 29, 2024 · 50198fa · 50198fa
2 parents 6029df3 + 0076ee4
commit 50198fa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/...k/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java b/...k/cloud/kubernetes/client/config/KubernetesClientConfigMapPropertySourceLocatorTests.java
@@ -213,7 +213,6 @@ public void locateShouldNotThrowExceptionOnFailureWhenFailFastIsDisabled(Capture
 		assertThat(composite.getPropertySources()).hasSize(0);
 		assertThat(output.getOut()).contains("Failed to load source:");
 
-
 	}
 
 }
diff --git a/...src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Application.java b/...src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/Application.java
@@ -25,7 +25,7 @@
  */
 @SpringBootApplication
 @EnableScheduling
-public class Application {
+class Application {
 
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);

diff --git a/...ringframework/cloud/kubernetes/fabric8/catalog/watch/EndpointNameAndNamespaceService.java b/...ringframework/cloud/kubernetes/fabric8/catalog/watch/EndpointNameAndNamespaceService.java
@@ -28,7 +28,7 @@
  * @author wind57
  */
 @Service
-public class EndpointNameAndNamespaceService {
+class EndpointNameAndNamespaceService {
 
 	private List<EndpointNameAndNamespace> result;
 

diff --git a/...in/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartBeatListener.java b/...in/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartBeatListener.java
@@ -31,11 +31,11 @@
  * @author wind57
  */
 @Component
-public class HeartBeatListener implements ApplicationListener<ApplicationEvent> {
+class HeartBeatListener implements ApplicationListener<ApplicationEvent> {
 
 	private final EndpointNameAndNamespaceService service;
 
-	public HeartBeatListener(EndpointNameAndNamespaceService service) {
+	HeartBeatListener(EndpointNameAndNamespaceService service) {
 		this.service = service;
 	}
 

diff --git a/.../java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartbeatController.java b/.../java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/HeartbeatController.java
@@ -23,16 +23,16 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-public class HeartbeatController {
+class HeartbeatController {
 
 	private final EndpointNameAndNamespaceService service;
 
-	public HeartbeatController(EndpointNameAndNamespaceService service) {
+	HeartbeatController(EndpointNameAndNamespaceService service) {
 		this.service = service;
 	}
 
 	@GetMapping("/result")
-	public List<EndpointNameAndNamespace> result() {
+	List<EndpointNameAndNamespace> result() {
 		return service.result();
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     		assertThat(composite.getPropertySources()).hasSize(0);
     		assertThat(output.getOut()).contains("Failed to load source:");
     	}
     }