Merge pull request #853 from oracle/sonar-blocker-and-major

rjeberhard · web-flow · commit b0cdc0cb88a4 · 2019-02-04T18:04:06.000-05:00
Resolve some sonar bugs
diff --git a/operator/src/main/java/oracle/kubernetes/operator/Main.java b/operator/src/main/java/oracle/kubernetes/operator/Main.java
@@ -1,4 +1,4 @@
-// Copyright 2017, 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -478,7 +478,7 @@ public void run() {
     try {
       shutdownSignal.acquire();
     } catch (InterruptedException ignore) {
-      // ignoring
+      Thread.currentThread().interrupt();
     }
 
     isNamespaceStopping.forEach(
diff --git a/operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.java b/operator/src/main/java/oracle/kubernetes/operator/ServerStatusReader.java
@@ -1,4 +1,4 @@
-// Copyright 2018,2019 Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019 Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -162,7 +162,9 @@ public NextAction apply(Packet packet) {
                   state = CharStreams.toString(reader);
                 }
               }
-            } catch (IOException | ApiException | InterruptedException e) {
+            } catch (InterruptedException ignore) {
+              Thread.currentThread().interrupt();
+            } catch (IOException | ApiException e) {
               LOGGER.warning(MessageKeys.EXCEPTION, e);
             } finally {
               helper.recycle(client);
diff --git a/operator/src/main/java/oracle/kubernetes/operator/Watcher.java b/operator/src/main/java/oracle/kubernetes/operator/Watcher.java
@@ -78,7 +78,8 @@ void waitForExit() {
       if (thread != null) {
         thread.join();
       }
-    } catch (InterruptedException ignored) {
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
     }
   }
 
@@ -128,6 +129,7 @@ private void watchForEvents() {
         Thread.sleep(delay);
       } catch (InterruptedException ex) {
         LOGGER.warning(MessageKeys.EXCEPTION, ex);
+        Thread.currentThread().interrupt();
       }
       lastInitialize = System.currentTimeMillis();
     } else {
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/ConfigMapHelper.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/ConfigMapHelper.java
@@ -270,9 +270,11 @@ public NextAction apply(Packet packet) {
       if (topologyYaml != null) {
         LOGGER.fine("topology.yaml: " + topologyYaml);
         DomainTopology domainTopology = parseDomainTopologyYaml(topologyYaml);
-        if (!domainTopology.getDomainValid()) {
+        if (domainTopology == null || !domainTopology.getDomainValid()) {
           // If introspector determines Domain is invalid then log erros and terminate the fiber
-          logValidationErrors(domainTopology.getValidationErrors());
+          if (domainTopology != null) {
+            logValidationErrors(domainTopology.getValidationErrors());
+          }
           return doNext(null, packet);
         }
         WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();
@@ -509,10 +511,14 @@ public NextAction onSuccess(Packet packet, CallResponse<V1ConfigMap> callRespons
         if (topologyYaml != null) {
           ConfigMapHelper.DomainTopology domainTopology =
               ConfigMapHelper.parseDomainTopologyYaml(topologyYaml);
-          WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();
-          ScanCache.INSTANCE.registerScan(
-              info.getNamespace(), info.getDomainUID(), new Scan(wlsDomainConfig, new DateTime()));
-          packet.put(ProcessingConstants.DOMAIN_TOPOLOGY, wlsDomainConfig);
+          if (domainTopology != null) {
+            WlsDomainConfig wlsDomainConfig = domainTopology.getDomain();
+            ScanCache.INSTANCE.registerScan(
+                info.getNamespace(),
+                info.getDomainUID(),
+                new Scan(wlsDomainConfig, new DateTime()));
+            packet.put(ProcessingConstants.DOMAIN_TOPOLOGY, wlsDomainConfig);
+          }
         }
       }
 
diff --git a/operator/src/main/java/oracle/kubernetes/operator/helpers/RollingHelper.java b/operator/src/main/java/oracle/kubernetes/operator/helpers/RollingHelper.java
@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -222,8 +222,15 @@ public NextAction apply(Packet packet) {
           while (countReady-- > dom.getMinAvailable(clusterName)) {
             current = it.next();
             serverConfig = (WlsServerConfig) current.packet.get(ProcessingConstants.SERVER_SCAN);
-            servers.add(
-                serverConfig != null ? serverConfig.getName() : config.getAdminServerName());
+            String serverName = null;
+            if (serverConfig != null) {
+              serverName = serverConfig.getName();
+            } else if (config != null) {
+              serverName = config.getAdminServerName();
+            }
+            if (serverName != null) {
+              servers.add(serverName);
+            }
             serversThatCanRestartNow.add(current);
             if (!it.hasNext()) {
               break;
diff --git a/operator/src/main/java/oracle/kubernetes/operator/rest/RequestDebugLoggingFilter.java b/operator/src/main/java/oracle/kubernetes/operator/rest/RequestDebugLoggingFilter.java
@@ -1,4 +1,4 @@
-// Copyright 2017, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -17,20 +17,19 @@
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import org.glassfish.jersey.message.MessageUtils;
 
-/** RequestDebugLoggingFilter debug logs all the REST Requests */
+/** RequestDebugLoggingFilter debug logs all the REST Requests. */
 @Provider
 @Priority(FilterPriorities.REQUEST_DEBUG_LOGGING_FILTER_PRIORITY)
 public class RequestDebugLoggingFilter extends BaseDebugLoggingFilter
     implements ContainerRequestFilter {
 
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
 
-  /** Construct a RequestDebugLoggingFilter */
+  /** Construct a RequestDebugLoggingFilter. */
   public RequestDebugLoggingFilter() {
     // nothing to do
   }
 
-  /** {@inheritDoc} */
   @Override
   public void filter(ContainerRequestContext req) throws IOException {
     LOGGER.entering();
@@ -73,24 +72,25 @@ private String readEntityAsString(ContainerRequestContext req) throws Exception
     LOGGER.entering();
     // Read the entire input stream into a String
     // This should be OK since JSON input shouldn't be monstrously big
-    BufferedReader ir = new BufferedReader(new InputStreamReader(req.getEntityStream()));
-    StringBuilder sb = new StringBuilder();
-    String line = null;
-    Charset cs = MessageUtils.getCharset(req.getMediaType());
-    // TBD - is all the Charset handling correct?
-    do {
-      line = ir.readLine();
-      if (line != null) {
-        sb.append(line);
-      }
-    } while (line != null);
-    ir.close();
-    String entity = sb.toString();
+    try (BufferedReader ir = new BufferedReader(new InputStreamReader(req.getEntityStream()))) {
+      StringBuilder sb = new StringBuilder();
+      String line = null;
+      Charset cs = MessageUtils.getCharset(req.getMediaType());
+      // TBD - is all the Charset handling correct?
+      do {
+        line = ir.readLine();
+        if (line != null) {
+          sb.append(line);
+        }
+      } while (line != null);
+      ir.close();
+      String entity = sb.toString();
 
-    // Set the request input stream to a clone of the original input stream
-    // so that it can be read again
-    req.setEntityStream(new ByteArrayInputStream(entity.getBytes(cs)));
-    LOGGER.exiting(entity);
-    return entity;
+      // Set the request input stream to a clone of the original input stream
+      // so that it can be read again
+      req.setEntityStream(new ByteArrayInputStream(entity.getBytes(cs)));
+      LOGGER.exiting(entity);
+      return entity;
+    }
   }
 }
diff --git a/operator/src/main/java/oracle/kubernetes/operator/work/Container.java b/operator/src/main/java/oracle/kubernetes/operator/work/Container.java
@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
 // Licensed under the Universal Permissive License v 1.0 as shown at
 // http://oss.oracle.com/licenses/upl.
 
@@ -22,9 +22,6 @@ private static final class NoneContainer extends Container {}
 
   @Override
   public <S> S getSPI(Class<S> spiType) {
-    if (components == null) {
-      return null;
-    }
     for (Component c : components.values()) {
       S s = c.getSPI(spiType);
       if (s != null) {

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ void waitForExit() {`
`78`	`78`	`if (thread != null) {`
`79`	`79`	`thread.join();`
`80`	`80`	`}`
`81`		`- } catch (InterruptedException ignored) {`
	`81`	`+ } catch (InterruptedException e) {`
	`82`	`+ Thread.currentThread().interrupt();`
`82`	`83`	`}`
`83`	`84`	`}`
`84`	`85`
`@@ -128,6 +129,7 @@ private void watchForEvents() {`
`128`	`129`	`Thread.sleep(delay);`
`129`	`130`	`} catch (InterruptedException ex) {`
`130`	`131`	`LOGGER.warning(MessageKeys.EXCEPTION, ex);`
	`132`	`+ Thread.currentThread().interrupt();`
`131`	`133`	`}`
`132`	`134`	`lastInitialize = System.currentTimeMillis();`
`133`	`135`	`} else {`