Merge branch 'master' into feature/dynamic-cluster and additional cleanup

Author: alai8

operator/src/main/java/oracle/kubernetes/operator/authentication/Authenticator.java

@@ -32,8 +32,8 @@ public class Authenticator {
 
   private final String _SERVICE_HOST = "KUBERNETES_SERVICE_HOST";
   private final String _SERVICE_PORT = "KUBERNETES_SERVICE_PORT";
-  private final String _TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
-  private final String _CACERT_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt";
+  //private final String _TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token";
+  //private final String _CACERT_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/ca.crt";
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
   /**
@@ -46,7 +46,6 @@ public class Authenticator {
   public Authenticator() throws IOException {
     this.apiClient = Config.defaultClient();
     this.helper = new Helpers(this);
-    SecretHelper.addCustomGsonToClient(this.apiClient);
   }
 
   /**
@@ -167,7 +166,6 @@ private ApiClient authenticateByServiceAccount(V1ServiceAccount serviceAccount)
     newClient.setBasePath(serviceUrl);
     newClient.setApiKey("Bearer " + token);
     newClient.setSslCaCert(new ByteArrayInputStream(caCert));
-    SecretHelper.addCustomGsonToClient(newClient);
 
     LOGGER.exiting(newClient);
     return newClient;

operator/src/main/java/oracle/kubernetes/operator/authentication/Helpers.java

@@ -24,6 +24,7 @@
  */
 public class Helpers {
 
+  @SuppressWarnings("unused")
   private final Authenticator authenticator;
   private final ApiClient apiClient;
   private final CoreV1Api coreApi;

operator/src/main/java/oracle/kubernetes/operator/builders/UncheckedApiException.java

@@ -9,6 +9,7 @@
  * An exception used to bypass functional programming incompatability with checked exceptions. This is thrown
  * by a function object and the underlying ApiException is then rethrown by the caller of the function object.
  */
+@SuppressWarnings("serial")
 class UncheckedApiException extends RuntimeException {
     UncheckedApiException(ApiException e) {
         super(e);

operator/src/main/java/oracle/kubernetes/operator/builders/WatchBuilder.java

@@ -27,7 +27,6 @@
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
 
-@SuppressWarnings("WeakerAccess")
 public class WatchBuilder {
     /** Always true for watches. */
     private static final boolean WATCH = true;
@@ -244,10 +243,6 @@ public WatchBuilder withLabelSelectors(String... labelSelectors) {
         return this;
     }
 
-    private String asList(String... selectors) {
-        return String.join(",", selectors);
-    }
-
     public WatchBuilder withLimit(Integer limit) {
         callParams.setLimit(limit);
         return this;

operator/src/main/java/oracle/kubernetes/operator/helpers/ClientPool.java

@@ -46,11 +46,7 @@ private ApiClient getApiClient() {
     }
     LOGGER.info(MessageKeys.K8S_MASTER_URL, client != null ? client.getBasePath() : null);
 
-    // Temporarily set a custom Gson for secret support
-    // TODO:
-    SecretHelper.addCustomGsonToClient(client);
-
-    // TEST
+    // Ensure that client doesn't time out before call or watch
     client.getHttpClient().setReadTimeout(5, TimeUnit.MINUTES);
 
     LOGGER.exiting(client);

operator/src/main/java/oracle/kubernetes/operator/helpers/SecretHelper.java

@@ -3,18 +3,7 @@
 
 package oracle.kubernetes.operator.helpers;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.ApiException;
-import io.kubernetes.client.JSON;
 import io.kubernetes.client.models.V1Secret;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
@@ -24,11 +13,6 @@
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 
-import org.joda.time.DateTime;
-
-import java.lang.reflect.Type;
-import java.util.Base64;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -174,43 +158,4 @@ private static Map<String, byte[]> harvestAdminSecretData(V1Secret secret) {
     return secretData;
   }
 
-  // Due to issue with kubernetes-client/java (com.google.gson.JsonSyntaxException when deserialize V1Secret)
-  // Issue #131
-  // Add a custom Gson to the client so secrets can be decoded.
-
-  /**
-   * Add custom Gson to client
-   * @param apiClient API client
-   */
-  public static void addCustomGsonToClient(ApiClient apiClient) {
-
-    LOGGER.entering();
-
-    JSON.DateTypeAdapter dateTypeAdapter = new JSON.DateTypeAdapter();
-    JSON.SqlDateTypeAdapter sqlDateTypeAdapter = new JSON.SqlDateTypeAdapter();
-    JSON.DateTimeTypeAdapter dateTimeTypeAdapter = new JSON.DateTimeTypeAdapter();
-
-    Gson customGson =
-        (new GsonBuilder()).registerTypeAdapter(
-            Date.class, dateTypeAdapter).registerTypeAdapter(
-            java.sql.Date.class, sqlDateTypeAdapter).registerTypeAdapter(
-            DateTime.class, dateTimeTypeAdapter).registerTypeAdapter(
-            byte[].class, new ByteArrayBase64StringTypeAdapter()).create();
-
-    apiClient.getJSON().setGson(customGson);
-
-    LOGGER.exiting();
-  }
-
-  private static class ByteArrayBase64StringTypeAdapter implements JsonSerializer<byte[]>, JsonDeserializer<byte[]> {
-
-    public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-      return Base64.getUrlDecoder().decode(json.getAsString());
-    }
-
-    public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContext context) {
-      return new JsonPrimitive(Base64.getUrlEncoder().encodeToString(src));
-    }
-  }
-
 }

operator/src/main/java/oracle/kubernetes/operator/rest/BaseDebugLoggingFilter.java

@@ -15,7 +15,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.logging.Level;
 
 /**
  * BaseDebugLoggingFilter provides utilities shared by RequestDebugLoggingFilter and
@@ -48,7 +47,7 @@ protected String getLoggableHeaders(ContainerRequestContext req) {
 
     // Make a copy of all of the request headers
     MultivaluedHashMap<String,String> loggableHeaders =
-      new MultivaluedHashMap(req.getHeaders());
+      new MultivaluedHashMap<String, String>(req.getHeaders());
 
     // Authorization headers contain credentials.  These credentials should not be
     // debug logged since they contain sensitive data.
@@ -58,7 +57,7 @@ protected String getLoggableHeaders(ContainerRequestContext req) {
     for (String key : loggableHeaders.keySet()) {
       if (atz.equals(key.toLowerCase())) {
         // make a copy of all the atz header values
-        List<String> vals = new ArrayList(loggableHeaders.get(key));
+        List<String> vals = new ArrayList<>(loggableHeaders.get(key));
         // hide the sensitive data in the atz header values
         for (int i = 0; i < vals.size(); i++) {
           // By definition, the value of an Authorization header should be in the form

operator/src/main/java/oracle/kubernetes/operator/rest/RestServer.java

@@ -60,7 +60,7 @@ public class RestServer {
 
   private RestConfig config;
 
-  private String baseHttpUri;
+  //private String baseHttpUri;
   private String baseExternalHttpsUri;
   private String baseInternalHttpsUri;
 
@@ -155,12 +155,12 @@ public void start(Container container) throws Exception {
   public void stop() {
     LOGGER.entering();
     if (externalHttpsServer != null) {
-      externalHttpsServer.stop();
+      externalHttpsServer.shutdownNow();
       externalHttpsServer = null;
       LOGGER.info("Stopped the external ssl REST server"); // TBD .fine ?
     }
     if (internalHttpsServer != null) {
-      internalHttpsServer.stop();
+      internalHttpsServer.shutdownNow();
       internalHttpsServer = null;
       LOGGER.info("Stopped the internal ssl REST server"); // TBD .fine ?
     }
@@ -281,7 +281,7 @@ private ResourceConfig createResourceConfig() {
             .register(ResponseDebugLoggingFilter.class)
             .register(ExceptionMapper.class)
             .packages("oracle.kubernetes.operator.rest.resource");
-    Map<String, Object> extraProps = new HashMap();
+    Map<String, Object> extraProps = new HashMap<>();
 
     // attach the rest backend impl to the resource config
     // so that the resource impls can find it

operator/src/main/java/oracle/kubernetes/operator/rest/resource/SwaggerResource.java

@@ -6,7 +6,6 @@
 import java.io.InputStream;
 
 import javax.ws.rs.GET;
-import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 

operator/src/main/java/oracle/kubernetes/operator/wlsconfig/WlsClusterConfig.java

@@ -55,10 +55,11 @@ public WlsClusterConfig(String clusterName, WlsDynamicServersConfig dynamicServe
    *
    * @return A new WlsClusterConfig object created based on the JSON result
    */
+  @SuppressWarnings("unchecked")
   static WlsClusterConfig create(Map<String, Object> clusterConfigMap, Map<String, WlsServerConfig> serverTemplates, String domainName) {
     String clusterName = (String) clusterConfigMap.get("name");
     WlsDynamicServersConfig dynamicServersConfig =
-            WlsDynamicServersConfig.create((Map) clusterConfigMap.get("dynamicServers"), serverTemplates, clusterName, domainName);
+            WlsDynamicServersConfig.create((Map<String, Object>) clusterConfigMap.get("dynamicServers"), serverTemplates, clusterName, domainName);
     // set dynamicServersConfig only if the cluster contains dynamic servers, i.e., its dynamic servers configuration
     // contains non-null server template name
     if (dynamicServersConfig.getServerTemplate() == null) {