Merge pull request #172 from oracle/sonar

Delete outdated code to fix sonar scan

Author: rjeberhard

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

@@ -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/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));
-    }
-  }
-
 }