lots more sonar cleanup (#1110)

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/aliases/TypeUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle Corporation and/or its affiliates.
+ * Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.aliases;
@@ -291,7 +291,7 @@ public static Object[] convertToObjectArray(Object value, String strValue, Strin
         return result;
     }
 
-    private static List convertToList(Object value, String strValue, String delimiter) throws AliasException {
+    private static List<?> convertToList(Object value, String strValue, String delimiter) throws AliasException {
         List<?> result = null;
         if (value instanceof List) {
             result = (List<?>) value;
@@ -372,7 +372,7 @@ private static PyDictionary convertToDictionary(Object value, String delimiter,
         return dictionary.__len__() == 0 ? null : dictionary;
     }
 
-    private static Map convertToMap(Object value, String strValue, String delimiter) throws AliasException {
+    private static Map<?,?> convertToMap(Object value, String strValue, String delimiter) throws AliasException {
         Map<?,?> result;
         if (Map.class.isAssignableFrom(value.getClass())) {
             result = (Map<?,?>)value;

core/src/main/java/oracle/weblogic/deploy/exception/BundleAwareException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.exception;
@@ -38,7 +38,7 @@ public abstract class BundleAwareException extends Exception {
     /**
      * Constructs a default exception.
      */
-    public BundleAwareException() {
+    protected BundleAwareException() {
         super();
     }
 
@@ -47,7 +47,7 @@ public BundleAwareException() {
      *
      * @param messageID the message to use
      */
-    public BundleAwareException(String messageID) {
+    protected BundleAwareException(String messageID) {
         super();
         this.messageID = messageID;
     }
@@ -58,7 +58,7 @@ public BundleAwareException(String messageID) {
      * @param messageID the message to use
      * @param params the arguments to use to fill in the placeholders in the message
      */
-    public BundleAwareException(String messageID, Object... params) {
+    protected BundleAwareException(String messageID, Object... params) {
         super();
         this.messageID = messageID;
         this.params = params;
@@ -70,7 +70,7 @@ public BundleAwareException(String messageID, Object... params) {
      * @param messageID the message to use
      * @param cause the nested exception
      */
-    public BundleAwareException(String messageID, Throwable cause) {
+    protected BundleAwareException(String messageID, Throwable cause) {
         super(cause);
         if (messageID != null) {
             this.messageID = messageID;
@@ -86,7 +86,7 @@ public BundleAwareException(String messageID, Throwable cause) {
      * @param cause the nested exception
      * @param params the arguments to use to fill in the placeholders in the message
      */
-    public BundleAwareException(String messageID, Throwable cause, Object... params) {
+    protected BundleAwareException(String messageID, Throwable cause, Object... params) {
         super(cause);
         if (messageID != null) {
             this.messageID = messageID;
@@ -103,7 +103,7 @@ public BundleAwareException(String messageID, Throwable cause, Object... params)
      *
      * @param cause the nested exception
      */
-    public BundleAwareException(Throwable cause) {
+    protected BundleAwareException(Throwable cause) {
         super(cause);
         if (cause != null) {
             copyFromCause(cause);

core/src/main/java/oracle/weblogic/deploy/util/CLAException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.util;
@@ -13,62 +13,80 @@
 public class CLAException extends BundleAwareException {
     private static final long serialVersionUID = 1L;
 
-    private int exitCode;
+    private final int exitCode;
 
     /**
-     * Constructs a default exception.
+     * Constructs a default exception with exit code of 2.
      */
     public CLAException() {
-        // default constructor
+        this.exitCode = 2;
+    }
+
+    /**
+     * Construct a default exception with specified exit code
+     * @param exitCode the exit code to use
+     */
+    public CLAException(int exitCode) {
+        this.exitCode = exitCode;
     }
 
     /**
      * Constructs a new exception with the specified message id.
      *
+     * @param exitCode  the exit code to use
      * @param messageID the message ID
      */
-    public CLAException(String messageID) {
+    public CLAException(int exitCode, String messageID) {
         super(messageID);
+        this.exitCode = exitCode;
     }
 
     /**
      * Constructs a new exception with the specified message id and parameters.
      *
+     * @param exitCode  the exit code to use
      * @param messageID the message ID
      * @param params    the parameters to use to fill in the message tokens
      */
-    public CLAException(String messageID, Object... params) {
+    public CLAException(int exitCode, String messageID, Object... params) {
         super(messageID, params);
+        this.exitCode = exitCode;
     }
 
     /**
      * Constructs a new exception with the specified message id and cause.
      *
+     * @param exitCode  the exit code to use
      * @param messageID the message ID
      * @param cause     the exception that triggered the creation of this exception
      */
-    public CLAException(String messageID, Throwable cause) {
+    public CLAException(int exitCode, String messageID, Throwable cause) {
         super(messageID, cause);
+        this.exitCode = exitCode;
     }
 
     /**
      * Constructs a new exception with passed message id, cause, and parameters.
      *
+     * @param exitCode  the exit code to use
      * @param messageID the message ID
      * @param cause     the exception that triggered the creation of this exception
      * @param params    the parameters to use to fill in the message tokens
      */
-    public CLAException(String messageID, Throwable cause, Object... params) {
+    public CLAException(int exitCode, String messageID, Throwable cause, Object... params) {
         super(messageID, cause, params);
+        this.exitCode = exitCode;
     }
 
     /**
      * Constructs a new exception with the specified cause.
      *
+     * @param exitCode  the exit code to use
      * @param cause the exception that triggered the creation of this exception
      */
-    public CLAException(Throwable cause) {
+    public CLAException(int exitCode, Throwable cause) {
         super(cause);
+        this.exitCode = exitCode;
     }
 
     /**
@@ -87,13 +105,4 @@ public String getBundleName() {
     public int getExitCode() {
         return this.exitCode;
     }
-
-    /**
-     * Set the exit code for this exception.
-     *
-     * @param exitCode the exit code for this exception
-     */
-    public void setExitCode(int exitCode) {
-        this.exitCode = exitCode;
-    }
 }

core/src/main/java/oracle/weblogic/deploy/util/PyOrderedDict.java

@@ -97,14 +97,14 @@ public static PyObject fromkeys(PyObject keys, PyObject value) {
      * {@inheritDoc}
      */
     @Override
-    public int __cmp__(PyObject ob_other) {
+    public int __cmp__(PyObject obOther) {
         int result = 0;
 
         PyOrderedDict other = null;
-        if (ob_other == null || ob_other.getType() != getType()) {
+        if (obOther == null || obOther.getType() != getType()) {
             return -2;
         } else {
-            other = (PyOrderedDict) ob_other;
+            other = (PyOrderedDict) obOther;
             int an = this.linkedHashMap.size();
             int bn = other.linkedHashMap.size();
             if (an < bn) {
@@ -212,13 +212,13 @@ public void __delitem__(PyObject key) {
      * {@inheritDoc}
      */
     @Override
-    public PyObject __eq__(PyObject ob_other) {
-        if (ob_other.getType() != getType()) {
+    public PyObject __eq__(PyObject obOther) {
+        if (obOther.getType() != getType()) {
             return null;
         }
 
         PyObject result = Py.One;
-        PyOrderedDict other = (PyOrderedDict)ob_other;
+        PyOrderedDict other = (PyOrderedDict)obOther;
         int an = this.linkedHashMap.size();
         int bn = other.linkedHashMap.size();
         if (an != bn) {
@@ -321,10 +321,10 @@ public PyObject get(PyObject key) {
      * {@inheritDoc}
      */
     @Override
-    public PyObject get(PyObject key, PyObject default_object) {
+    public PyObject get(PyObject key, PyObject defaultObject) {
         // Cannot use getOrDefault() as this is a Java 8 method and
         // the project is attempting to be compatible with Java 7...
-        PyObject result = default_object;
+        PyObject result = defaultObject;
         if (linkedHashMap.containsKey(key)) {
             result = linkedHashMap.get(key);
         }

core/src/main/java/oracle/weblogic/deploy/util/PyRealBoolean.java

@@ -32,14 +32,14 @@ public PyRealBoolean __deepcopy__(PyObject memo) {
 
     @Override
     // for Python equality checks like abc == xyz
-    public PyObject __eq__(PyObject ob_other) {
-        return equals(ob_other) ? Py.One : Py.Zero;
+    public PyObject __eq__(PyObject obOther) {
+        return equals(obOther) ? Py.One : Py.Zero;
     }
 
     @Override
     // for Python inequality checks like abc != xyz
-    public PyObject __ne__(PyObject ob_other) {
-        return equals(ob_other) ? Py.Zero : Py.One;
+    public PyObject __ne__(PyObject obOther) {
+        return equals(obOther) ? Py.Zero : Py.One;
     }
 
     @Override

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle Corporation and/or its affiliates.  All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle Corporation and/or its affiliates.  All rights reserved.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.util;
@@ -9,7 +9,7 @@
  */
 public class WLSDeployContext {
 
-    public static enum WLSTMode {
+    public enum WLSTMode {
 
         OFFLINE("offline"), ONLINE("online");
 

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployExit.java

@@ -29,7 +29,7 @@ private WLSDeployExit() {
      * @param errorCode for exit from the JVM
      */
     public static void exit(WLSDeployContext deployContext, int errorCode) {
-        String METHOD = "exit";
+        final String METHOD = "exit";
         LOGGER.entering(errorCode, CLASS, METHOD);
         logCleanup(deployContext);
         LOGGER.exiting(CLASS, METHOD);
@@ -39,11 +39,11 @@ public static void exit(WLSDeployContext deployContext, int errorCode) {
     /**
      * Exit the JVM with the provided exit code.
      *
-     * @param error_code for exit from the JVM
+     * @param errorCode for exit from the JVM
      */
-    public static void exit(int error_code) {
+    public static void exit(int errorCode) {
         // might want to validate the exit code first
-        System.exit(error_code);
+        System.exit(errorCode);
     }
 
     private static void logCleanup(WLSDeployContext context) {

core/src/main/java/oracle/weblogic/deploy/util/XPathUtil.java

@@ -31,11 +31,11 @@
  */
 public class XPathUtil {
     private static final PlatformLogger LOGGER = WLSDeployLogFactory.getLogger("wlsdeploy.util");
-    String  oracle_home;
-    String patches_home;
-    public XPathUtil(String oracle_home){
-        this.oracle_home = oracle_home;
-        patches_home = Paths.get(oracle_home, "inventory", "patches").toString();
+    String oracleHome;
+    String patchesHome;
+    public XPathUtil(String oracleHome){
+        this.oracleHome = oracleHome;
+        patchesHome = Paths.get(oracleHome, "inventory", "patches").toString();
     }
 
     public XPathUtil() {
@@ -57,13 +57,13 @@ private static synchronized XPathFactory factory() {
      */
     public String getPSU() {
         // find the names in the directory first
-        if (!(new File(patches_home)).exists()) {
-            LOGGER.info("No patches home at {0}", patches_home);
+        if (!(new File(patchesHome)).exists()) {
+            LOGGER.info("No patches home at {0}", patchesHome);
             return null;
         }
-        List<String> patch_files = findPatchFiles();
+        List<String> patchFiles = findPatchFiles();
         List<String> list = new ArrayList<>();
-        for (String patch_file : patch_files){
+        for (String patch_file : patchFiles){
             Document doc = readXmlFile(patch_file);
             String descrip = description(doc, "//@description");
             LOGGER.fine("Description {0}", descrip);
@@ -92,15 +92,15 @@ public String extractPsu(String descrip) {
      * @return list of patch file names.
      */
     public List<String> findPatchFiles() {
-        List<String> patch_files = new ArrayList<String>();
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(new File(patches_home).toPath())){
+        List<String> patchFiles = new ArrayList<>();
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(new File(patchesHome).toPath())){
             for (Path path : stream) {
-                patch_files.add(path.toString());
+                patchFiles.add(path.toString());
             }
         } catch (IOException ieo) {
-            LOGGER.info("Unable to locate the patch files at {0}", patches_home);
+            LOGGER.info("Unable to locate the patch files at {0}", patchesHome);
         }
-        return patch_files;
+        return patchFiles;
     }
 
     /**