From e4b47438f7d4c10440012548e8ab1cffc847b680 Mon Sep 17 00:00:00 2001
From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com>
Date: Fri, 16 Jun 2023 09:16:21 -0400
Subject: [PATCH] Fix missing imports

---
 .../discovery/Fabric8ConfigServerBootstrapper.java |  9 +++++----
 .../Fabric8ConfigServerBootstrapperTests.java      | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapper.java b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapper.java
index 17231f86..46e5d639 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapper.java
+++ b/spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapper.java
@@ -78,7 +78,8 @@ class Fabric8ConfigServerBootstrapper extends KubernetesConfigServerBootstrapper
 			KubernetesDiscoveryProperties discoveryProperties = createKubernetesDiscoveryProperties(binder,
 					bindHandler);
 			KubernetesClientProperties clientProperties = createKubernetesClientProperties(binder, bindHandler);
-			return getInstanceProvider(discoveryProperties, clientProperties, context, binder, bindHandler).getInstances(serviceId);
+			return getInstanceProvider(discoveryProperties, clientProperties, context, binder, bindHandler)
+					.getInstances(serviceId);
 		}
 
 		private KubernetesConfigServerInstanceProvider getInstanceProvider(
@@ -93,9 +94,9 @@ class Fabric8ConfigServerBootstrapper extends KubernetesConfigServerBootstrapper
 				Config config = fabric8AutoConfiguration.kubernetesClientConfig(clientProperties);
 				KubernetesClient kubernetesClient = fabric8AutoConfiguration.kubernetesClient(config);
 				KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(kubernetesClient,
-						discoveryProperties,
-						KubernetesClientServicesFunctionProvider.servicesFunction(discoveryProperties, binder, bindHandler), null,
-						new ServicePortSecureResolver(discoveryProperties));
+						discoveryProperties, KubernetesClientServicesFunctionProvider
+								.servicesFunction(discoveryProperties, binder, bindHandler),
+						null, new ServicePortSecureResolver(discoveryProperties));
 				return discoveryClient::getInstances;
 			}
 		}
diff --git a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapperTests.java b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapperTests.java
index c72bfe0f..7d03d9f6 100644
--- a/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapperTests.java
+++ b/spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapperTests.java
@@ -16,6 +16,18 @@
 
 package org.springframework.cloud.kubernetes.fabric8.discovery;
 
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+import io.fabric8.kubernetes.api.model.Endpoints;
+import io.fabric8.kubernetes.api.model.EndpointsBuilder;
+import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.api.model.ServiceBuilder;
 import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
 import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;
@@ -23,6 +35,8 @@ import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import wiremock.com.fasterxml.jackson.core.JsonProcessingException;
+import wiremock.com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;