fix fabric8io#4460 running spotless

shawkins · Sep 30, 2022 · cf01c37 · cf01c37
1 parent f18aa2e
commit cf01c37
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 41 deletions.
diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/BaseClient.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/BaseClient.java
@@ -26,9 +26,9 @@
 import io.fabric8.kubernetes.api.model.RootPaths;
 import io.fabric8.kubernetes.client.Client;
 import io.fabric8.kubernetes.client.Config;
+import io.fabric8.kubernetes.client.KubernetesClientBuilder.ExecutorSupplier;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.VersionInfo;
-import io.fabric8.kubernetes.client.KubernetesClientBuilder.ExecutorSupplier;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.fabric8.kubernetes.client.dsl.base.ResourceDefinitionContext;

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/URLFromEnvVarsImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/URLFromEnvVarsImpl.java
@@ -30,15 +30,16 @@ public class URLFromEnvVarsImpl implements ServiceToURLProvider {
 
   @Override
   public String getURL(Service service, String portName, String namespace, KubernetesClient client) {
-    String serviceHost     = URLFromServiceUtil.resolveHostFromEnvVarOrSystemProperty(service.getMetadata().getName());
-    String servicePort     = URLFromServiceUtil.resolvePortFromEnvVarOrSystemProperty(service.getMetadata().getName(), "");
-    String serviceProtocol = URLFromServiceUtil.resolveProtocolFromEnvVarOrSystemProperty(service.getSpec().getPorts().iterator().next().getProtocol(), "");
+    String serviceHost = URLFromServiceUtil.resolveHostFromEnvVarOrSystemProperty(service.getMetadata().getName());
+    String servicePort = URLFromServiceUtil.resolvePortFromEnvVarOrSystemProperty(service.getMetadata().getName(), "");
+    String serviceProtocol = URLFromServiceUtil
+        .resolveProtocolFromEnvVarOrSystemProperty(service.getSpec().getPorts().iterator().next().getProtocol(), "");
 
-    if(!serviceHost.isEmpty() && !servicePort.isEmpty() && !serviceProtocol.isEmpty()) {
+    if (!serviceHost.isEmpty() && !servicePort.isEmpty() && !serviceProtocol.isEmpty()) {
       return serviceProtocol + "://" + serviceHost + ":" + servicePort;
     } else {
       String answer = URLFromServiceUtil.getOrCreateAnnotations(service).get(ANNOTATION_EXPOSE_URL);
-      if(answer != null && !answer.isEmpty()) {
+      if (answer != null && !answer.isEmpty()) {
         return answer;
       }
     }

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/URLFromIngressImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/URLFromIngressImpl.java
@@ -29,12 +29,12 @@ public class URLFromIngressImpl implements ServiceToURLProvider {
   public String getURL(Service service, String portName, String namespace, KubernetesClient client) {
     ServicePort port = URLFromServiceUtil.getServicePortByName(service, portName);
     String serviceName = service.getMetadata().getName();
-    if(port == null) {
+    if (port == null) {
       throw new RuntimeException("Couldn't find port: " + portName + " for service " + service.getMetadata().getName());
     }
 
     IngressList ingresses = client.extensions().ingresses().inNamespace(namespace).list();
-    if(ingresses != null && !ingresses.getItems().isEmpty()) {
+    if (ingresses != null && !ingresses.getItems().isEmpty()) {
       return URLFromServiceUtil.getURLFromIngressList(ingresses.getItems(), namespace, serviceName, port);
     }
     return null;

diff --git a/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/URLFromNodePortImpl.java b/kubernetes-client/src/main/java/io/fabric8/kubernetes/client/impl/URLFromNodePortImpl.java
@@ -35,13 +35,13 @@ public String getURL(Service service, String portName, String namespace, Kuberne
     String serviceProto = port.getProtocol();
     NodePortUrlComponents urlComponents = null;
     Integer nodePort = port.getNodePort();
-    if(nodePort != null) {
+    if (nodePort != null) {
       try {
         NodeList nodeList = client.nodes().list();
-        if(nodeList != null && nodeList.getItems() != null) {
-          for(Node item : nodeList.getItems()) {
+        if (nodeList != null && nodeList.getItems() != null) {
+          for (Node item : nodeList.getItems()) {
             urlComponents = getUrlComponentsFromNodeList(item.getStatus(), nodePort);
-            if(urlComponents != null) {
+            if (urlComponents != null) {
               break;
             }
           }
@@ -51,11 +51,13 @@ public String getURL(Service service, String portName, String namespace, Kuberne
       }
     }
 
-    return urlComponents != null ? (serviceProto + "://" + urlComponents.getClusterIP() + ":" + urlComponents.getPortNumber()).toLowerCase(Locale.ROOT) : null;
+    return urlComponents != null
+        ? (serviceProto + "://" + urlComponents.getClusterIP() + ":" + urlComponents.getPortNumber()).toLowerCase(Locale.ROOT)
+        : null;
   }
 
   private NodePortUrlComponents getUrlComponentsFromNodeList(NodeStatus nodeStatus, Integer nodePort) {
-    if(nodeStatus != null) {
+    if (nodeStatus != null) {
       List<NodeAddress> addresses = nodeStatus.getAddresses();
       for (NodeAddress address : addresses) {
         String ip = address.getAddress();

diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/impl/BaseClientTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/impl/BaseClientTest.java
@@ -24,7 +24,6 @@
 import io.fabric8.kubernetes.client.RequestConfig;
 import io.fabric8.kubernetes.client.dsl.internal.OperationSupport;
 import io.fabric8.kubernetes.client.http.HttpClient;
-import io.fabric8.kubernetes.client.impl.BaseClient;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;

diff --git a/...s-client/src/test/java/io/fabric8/kubernetes/client/impl/DefaultKubernetesClientTest.java b/...s-client/src/test/java/io/fabric8/kubernetes/client/impl/DefaultKubernetesClientTest.java
@@ -23,7 +23,6 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.http.BasicBuilder;
 import io.fabric8.kubernetes.client.http.HttpHeaders;
-import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
 import io.fabric8.kubernetes.client.utils.HttpClientUtils;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.kubernetes.client.utils.Utils;

diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/impl/DryRunTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/impl/DryRunTest.java
@@ -26,7 +26,6 @@
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.http.HttpRequest;
 import io.fabric8.kubernetes.client.http.HttpRequest.Builder;
-import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
 import io.fabric8.kubernetes.client.http.TestHttpResponse;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/impl/PatchTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/impl/PatchTest.java
@@ -26,7 +26,6 @@
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.http.HttpRequest;
 import io.fabric8.kubernetes.client.http.HttpRequest.Builder;
-import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
 import io.fabric8.kubernetes.client.http.TestHttpRequest;
 import io.fabric8.kubernetes.client.http.TestHttpResponse;
 import org.junit.jupiter.api.BeforeEach;

diff --git a/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftClientImpl.java b/openshift-client/src/main/java/io/fabric8/openshift/client/impl/OpenShiftClientImpl.java
@@ -42,8 +42,8 @@
 import io.fabric8.kubernetes.client.dsl.internal.HasMetadataOperation;
 import io.fabric8.kubernetes.client.http.HttpClient;
 import io.fabric8.kubernetes.client.impl.BaseClient;
-import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
 import io.fabric8.kubernetes.client.impl.ExtensionsAPIGroupClient;
+import io.fabric8.kubernetes.client.impl.KubernetesClientImpl;
 import io.fabric8.kubernetes.client.utils.HttpClientUtils;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.kubernetes.client.utils.TokenRefreshInterceptor;

diff --git a/...hift-client/src/main/java/io/fabric8/openshift/client/impl/URLFromOpenshiftRouteImpl.java b/...hift-client/src/main/java/io/fabric8/openshift/client/impl/URLFromOpenshiftRouteImpl.java
@@ -37,7 +37,7 @@ public class URLFromOpenshiftRouteImpl implements ServiceToURLProvider {
   public String getURL(Service service, String portName, String namespace, KubernetesClient client) {
     String serviceName = service.getMetadata().getName();
     ServicePort port = URLFromServiceUtil.getServicePortByName(service, portName);
-    if(port != null && port.getName() != null && client.isAdaptable(OpenShiftClient.class)) {
+    if (port != null && port.getName() != null && client.isAdaptable(OpenShiftClient.class)) {
       try {
         String serviceProtocol = port.getProtocol();
         OpenShiftClient openShiftClient = client.adapt(OpenShiftClient.class);
@@ -46,8 +46,8 @@ public String getURL(Service service, String portName, String namespace, Kuberne
           return (serviceProtocol + "://" + route.getSpec().getHost()).toLowerCase(Locale.ROOT);
         }
       } catch (KubernetesClientException e) {
-        if(e.getCode() == HttpURLConnection.HTTP_FORBIDDEN) {
-          logger.warn("Could not lookup route:{} in namespace:{}, due to:{} ",serviceName,namespace,e.getMessage());
+        if (e.getCode() == HttpURLConnection.HTTP_FORBIDDEN) {
+          logger.warn("Could not lookup route:{} in namespace:{}, due to:{} ", serviceName, namespace, e.getMessage());
         }
       }
     }

diff --git a/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/AdaptTest.java b/openshift-client/src/test/java/io/fabric8/openshift/client/dsl/AdaptTest.java
@@ -38,7 +38,7 @@ void testAdaptDisabledCheck() {
   void testAdaptDSLs() {
     // Given
     OpenShiftClient client = new OpenShiftClientImpl(
-      new OpenShiftConfigBuilder().withDisableApiGroupCheck(true).build());
+        new OpenShiftConfigBuilder().withDisableApiGroupCheck(true).build());
 
     assertNotNull(client.v1());
     assertNotNull(client.apps());

diff --git a/openshift-client/src/test/java/io/fabric8/openshift/client/impl/OpenShiftConfigTest.java b/openshift-client/src/test/java/io/fabric8/openshift/client/impl/OpenShiftConfigTest.java
@@ -19,7 +19,6 @@
 import io.fabric8.kubernetes.client.ConfigBuilder;
 import io.fabric8.kubernetes.client.utils.Serialization;
 import io.fabric8.openshift.client.OpenShiftConfig;
-import io.fabric8.openshift.client.impl.OpenShiftClientImpl;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,8 +34,8 @@ class OpenShiftConfigTest {
   @BeforeEach
   void setup() {
     this.kubernetesConfig = new ConfigBuilder()
-      .withMasterUrl("https://2.2.2.2")
-      .build();
+        .withMasterUrl("https://2.2.2.2")
+        .build();
 
     this.version = "v1";
     System.setProperty(OpenShiftConfig.KUBERNETES_OAPI_VERSION_SYSTEM_PROPERTY, this.version);
@@ -48,7 +47,6 @@ void tearDown() {
     System.clearProperty(OpenShiftConfig.KUBERNETES_OAPI_VERSION_SYSTEM_PROPERTY);
   }
 
-
   @Test
   void testOpenshiftURLAsRoot() {
     System.setProperty(OpenShiftConfig.OPENSHIFT_URL_SYSTEM_PROPERTY, "https://1.1.1.1");

diff --git a/...-client/src/test/java/io/fabric8/openshift/client/impl/OpenShiftExtensionAdapterTest.java b/...-client/src/test/java/io/fabric8/openshift/client/impl/OpenShiftExtensionAdapterTest.java
@@ -18,7 +18,6 @@
 
 import io.fabric8.openshift.client.OpenShiftConfig;
 import io.fabric8.openshift.client.OpenShiftConfigBuilder;
-import io.fabric8.openshift.client.impl.OpenShiftClientImpl;
 import org.junit.Assert;
 import org.junit.jupiter.api.Test;
 

diff --git a/openshift-client/src/test/java/io/fabric8/openshift/client/impl/ViewCurrentUser.java b/openshift-client/src/test/java/io/fabric8/openshift/client/impl/ViewCurrentUser.java
@@ -18,26 +18,25 @@
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.openshift.api.model.User;
 import io.fabric8.openshift.client.OpenShiftClient;
-import io.fabric8.openshift.client.impl.OpenShiftClientImpl;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  */
 class ViewCurrentUser {
-    @Test
-    void testShowCurrentUser() throws Exception {
-        OpenShiftClient client = new OpenShiftClientImpl();
-        User user = client.currentUser();
+  @Test
+  void testShowCurrentUser() throws Exception {
+    OpenShiftClient client = new OpenShiftClientImpl();
+    User user = client.currentUser();
 
-        System.out.println("Current user is: " + user);
-        assertNotNull(user);
-        ObjectMeta metadata = user.getMetadata();
-        assertNotNull(metadata);
-        String name = metadata.getName();
-        System.out.println("User name is: " + name);
-        assertNotNull(name);
-    }
+    System.out.println("Current user is: " + user);
+    assertNotNull(user);
+    ObjectMeta metadata = user.getMetadata();
+    assertNotNull(metadata);
+    String name = metadata.getName();
+    System.out.println("User name is: " + name);
+    assertNotNull(name);
+  }
 
 }