Merge branch '3.1.x'

Author: ryanjbaxter

spring-cloud-kubernetes-client-config/src/test/java/org/springframework/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:");
 
-
 	}
 
 }

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/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);

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/java/org/springframework/cloud/kubernetes/fabric8/catalog/watch/EndpointNameAndNamespaceService.java

@@ -28,7 +28,7 @@
  * @author wind57
  */
 @Service
-public class EndpointNameAndNamespaceService {
+class EndpointNameAndNamespaceService {
 
 	private List<EndpointNameAndNamespace> result;
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/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;
 	}
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-catalog-watcher/src/main/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();
 	}