Merge pull request #1193 from sarveshkaushal/k-clean

Clean up various files

Author: k8s-ci-robot

util/src/main/java/io/kubernetes/client/informer/cache/DeltaFIFO.java

@@ -443,11 +443,7 @@ private Deque<MutablePair<DeltaType, KubernetesObject>> combineDeltas(
    */
   private MutablePair<DeltaType, KubernetesObject> isDuplicate(
       MutablePair<DeltaType, KubernetesObject> d1, MutablePair<DeltaType, KubernetesObject> d2) {
-    MutablePair<DeltaType, KubernetesObject> deletionDelta = isDeletionDup(d1, d2);
-    if (deletionDelta != null) {
-      return deletionDelta;
-    }
-    return null;
+    return isDeletionDup(d1, d2);
   }
 
   /**

util/src/main/java/io/kubernetes/client/util/ModelMapper.java

@@ -62,8 +62,7 @@ public class ModelMapper {
   public static void addModelMap(String apiGroupVersion, String kind, Class<?> clazz) {
     String[] parts = apiGroupVersion.split("/");
     if (parts.length == 1) {
-      String version = apiGroupVersion;
-      addModelMap("", version, kind, clazz);
+      addModelMap("", apiGroupVersion, kind, clazz);
     }
     addModelMap(parts[0], parts[1], kind, clazz);
   }

util/src/main/java/io/kubernetes/client/util/Watch.java

@@ -162,10 +162,7 @@ protected boolean isStatus(String line) throws IOException {
         break;
       }
     }
-    if ("Status".equals(kind) && "v1".equals(apiVersion)) {
-      return true;
-    }
-    return false;
+    return "Status".equals(kind) && "v1".equals(apiVersion);
   }
 
   protected Response<T> parseLine(String line) throws IOException {

util/src/main/java/io/kubernetes/client/util/WebSocketStreamHandler.java

@@ -53,7 +53,7 @@ private static enum State {
     UNINITIALIZED,
     OPEN,
     CLOSED
-  };
+  }
 
   public synchronized void waitForInitialized() throws InterruptedException {
     if (state != State.UNINITIALIZED) {

util/src/main/java/io/kubernetes/client/util/Yaml.java

@@ -12,6 +12,7 @@
 */
 package io.kubernetes.client.util;
 
+import io.kubernetes.client.common.KubernetesType;
 import io.kubernetes.client.custom.IntOrString;
 import io.kubernetes.client.custom.Quantity;
 import java.io.File;
@@ -201,7 +202,7 @@ public static void dump(Object object, Writer writer) {
    * @param data The list of YAML API objects
    * @return A String representing the list of YAML API objects.
    */
-  public static String dumpAll(Iterator<? extends Object> data) {
+  public static String dumpAll(Iterator<? extends KubernetesType> data) {
     return getSnakeYaml().dumpAll(data);
   }
 
@@ -211,7 +212,7 @@ public static String dumpAll(Iterator<? extends Object> data) {
    * @param data The list of YAML API objects.
    * @param output The writer to output the YAML String to.
    */
-  public static void dumpAll(Iterator<? extends Object> data, Writer output) {
+  public static void dumpAll(Iterator<? extends KubernetesType> data, Writer output) {
     getSnakeYaml().dumpAll(data, output);
   }
 

util/src/main/java/io/kubernetes/client/util/authenticators/OpenIDConnectAuthenticator.java

@@ -282,9 +282,8 @@ private String loadTokenURL(String issuer, SSLContext sslContext) {
       String json = scanner.useDelimiter("\\A").next();
 
       JSONObject wellKnownJson = (JSONObject) new JSONParser().parse(json);
-      String tokenUrl = (String) wellKnownJson.get("token_endpoint");
 
-      return tokenUrl;
+      return (String) wellKnownJson.get("token_endpoint");
 
     } catch (IOException | ParseException e) {
       throw new RuntimeException("Could not refresh", e);

util/src/main/java/io/kubernetes/client/util/generic/GenericKubernetesApi.java

@@ -295,13 +295,9 @@ public KubernetesApiResponse<ApiType> get(String name, final GetOptions getOptio
     return executeCall(
         customObjectsApi.getApiClient(),
         apiTypeClass,
-        () -> {
-          Call call =
-              customObjectsApi.getClusterCustomObjectCall(
-                  this.apiGroup, this.apiVersion, this.resourcePlural, name, null);
-
-          return call;
-        });
+        () ->
+            customObjectsApi.getClusterCustomObjectCall(
+                this.apiGroup, this.apiVersion, this.resourcePlural, name, null));
   }
 
   /**

util/src/main/java/io/kubernetes/client/util/taints/Taints.java

@@ -34,7 +34,7 @@ public String toString() {
         return "NoExcute";
       }
     }
-  };
+  }
 
   public static V1Taint findTaint(V1Node node, String key, Effect effect) {
     for (V1Taint taint : node.getSpec().getTaints()) {

util/src/test/java/io/kubernetes/client/util/TestUtils.java

@@ -27,7 +27,7 @@ public enum DateOptions {
     Now,
     Future,
     Past
-  };
+  }
 
   public static ApiKeyAuth getApiKeyAuthFromClient(ApiClient client) {
     return (ApiKeyAuth) client.getAuthentications().get("BearerToken");

util/src/test/java/io/kubernetes/client/util/YamlTest.java

@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertTrue;
 
 import com.google.common.io.Resources;
+import io.kubernetes.client.common.KubernetesType;
 import io.kubernetes.client.openapi.models.V1Deployment;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.openapi.models.V1Pod;
@@ -33,6 +34,7 @@
 import java.io.StringWriter;
 import java.lang.reflect.Method;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
 
@@ -125,29 +127,33 @@ public void testLoadAll() throws IOException {
   @Test
   public void testLoadAllFile() throws Exception {
     List<Object> list = Yaml.loadAll(new File(TEST_YAML_FILE_PATH));
+    List<KubernetesType> k8ObjectList = new ArrayList<>();
     for (Object object : list) {
       String type = object.getClass().getSimpleName();
       if (type.equals("V1Service")) {
         V1Service svc = (V1Service) object;
         assertEquals("v1", svc.getApiVersion());
         assertEquals("Service", svc.getKind());
         assertEquals("mock", svc.getMetadata().getName());
+        k8ObjectList.add(svc);
       } else if (type.equals("V1Deployment")) {
         V1Deployment deploy = (V1Deployment) object;
         assertEquals("apps/v1", deploy.getApiVersion());
         assertEquals("Deployment", deploy.getKind());
         assertEquals("helloworld", deploy.getMetadata().getName());
+        k8ObjectList.add(deploy);
       } else if (type.equals("V1Secret")) {
         V1Secret secret = (V1Secret) object;
         assertEquals("Secret", secret.getKind());
         assertEquals("secret", secret.getMetadata().getName());
         assertEquals("Opaque", secret.getType());
         assertEquals("hello", new String(secret.getData().get("secret-data"), UTF_8));
+        k8ObjectList.add(secret);
       } else {
         throw new Exception("some thing wrong happened");
       }
     }
-    String result = Yaml.dumpAll(list.iterator());
+    String result = Yaml.dumpAll(k8ObjectList.iterator());
     String expected = Resources.toString(EXPECTED_YAML_FILE, UTF_8);
     assertThat(result, equalTo(expected));
   }