Merge pull request #171 from oracle/cleanup

Cleanup warnings

Author: rjeberhard

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");
 
   /**

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/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/WlsDomainConfig.java

@@ -97,14 +97,15 @@ public synchronized WlsDomainConfig load(String jsonResult) {
     return this;
   }
 
-  private String getClusterNameForServer(Map serverMap) {
+  private String getClusterNameForServer(Map<String, Object> serverMap) {
     // serverMap contains a "cluster" entry from the REST call which is in the form: "cluster": ["clusters", "DockerCluster"]
-    List clusterList = (List) serverMap.get("cluster");
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    List<String> clusterList = (List) serverMap.get("cluster");
     if (clusterList != null) {
-      for (Object value : clusterList) {
+      for (String value : clusterList) {
         // the first entry that is not "clusters" is assumed to be the cluster name
         if (!"clusters".equals(value)) {
-          return (String) value;
+          return value;
         }
       }
     }

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

@@ -38,14 +38,16 @@ public List<NetworkAccessPoint> getNetworkAccessPoints() {
     return new ArrayList<>(networkAccessPoints.values());
   }
 
+  @SuppressWarnings("unchecked")
   WlsServerConfig(Map<String, Object> serverConfigMap) {
     this((String) serverConfigMap.get("name"),
             (Integer) serverConfigMap.get("listenPort"),
             (String) serverConfigMap.get("listenAddress"),
-            (Map) serverConfigMap.get("networkAccessPoints"));
+            (Map<String, Object>) serverConfigMap.get("networkAccessPoints"));
   }
 
-  public WlsServerConfig(String name, Integer listenPort, String listenAddress, Map networkAccessPointsMap) {
+  @SuppressWarnings("unchecked")
+  public WlsServerConfig(String name, Integer listenPort, String listenAddress, Map<String, Object> networkAccessPointsMap) {
     this.name = name;
     this.listenPort = listenPort;
     this.listenAddress = listenAddress;

operator/src/test/java/oracle/kubernetes/operator/SecretHelperTest.java

@@ -31,7 +31,6 @@ public class SecretHelperTest {
   private final static String UNIT_NAMESPACE = "unit-test";
   private final static String USERNAME = "weblogic";
   private final static String PASSWORD = "welcome1";
-  private final static String PRETTY = "true";
   private SecretHelper defaultSecretHelper;
   private SecretHelper unitSecretHelper;
   private boolean isVersion18 = false;