fixes from code inspection

Author: markxnelson

pom.xml

@@ -119,7 +119,7 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.24</version>
+            <version>1.23</version>
         </dependency>
     </dependencies>
 </project>

samples/weblogicLoggingExporter.yaml

@@ -11,7 +11,7 @@
 # domain config directory.
 # If file doesn't exist, will use all the defaults.
 
-# The index name for weblogic loggings used in elastic search.  By default it is set to "wls";
+# The index name for weblogic logs used in elastic search.  By default it is set to "wls";
 # Elastic Search restricts the index name to be lower case only.  Exporter will automatically convert this to all lower case.
 # and gives a warning.
 weblogicLoggingIndexName: wls
@@ -48,7 +48,7 @@ weblogicLoggingExporterBulkSize: 2
 
 # Filters that will be applied to all the messages.
 # More than 1 filter can be specified, messages MUST satisfy all the filter condition before it will be exported.
-# If FilterServers is specified,  then that filter will be applied only to messages thats generated by the specified servers.
+# If FilterServers is specified,  then that filter will be applied only to messages that is generated by the specified servers.
 # More than one server is allowed.
 # If no FilterServers is specified, it will be applied to all messages.
 # WLDF includes a query language for constructing log filter expressions.
@@ -58,7 +58,7 @@ weblogicLoggingExporterBulkSize: 2
 weblogicLoggingExporterFilters:
 - FilterExpression:  MSGID != 'BEA-000449'
 
-# example of filter, this filter will only be applied to messages thats generated by Server-0
+# example of filter, this filter will only be applied to messages that is generated by Server-0
 #- FilterExpression:  "(MACHINE = 'machine1') OR (SEVERITY >= Warning)"
 #  FilterServers:     Server-0
 

src/main/java/weblogic/logging/exporter/LogExportHandler.java

@@ -26,7 +26,8 @@
 import weblogic.logging.exporter.config.Config;
 import weblogic.logging.exporter.config.FilterConfig;
 
-public class LogExportHandler extends Handler {
+@SuppressWarnings("UnnecessaryContinue")
+class LogExportHandler extends Handler {
 
   private static final String DOC_TYPE = "_doc";
   private static final String INDEX = " { \"index\" : { }} ";
@@ -36,15 +37,14 @@ public class LogExportHandler extends Handler {
   private String elasticSearchHost = Config.DEFAULT_ES_HOST;
   private int elasticSearchPort = Config.DEFAULT_ES_PORT;
   private int bulkSize = Config.DEFAULT_BULK_SIZE;
-  private boolean enabled = true;
 
   private String httpHostPort = "http://" + elasticSearchHost + ":" + elasticSearchPort;
   private String singleURL = httpHostPort + "/" + indexName + "/" + DOC_TYPE + "/?pretty";
   private String bulkURL = httpHostPort + "/" + indexName + "/" + DOC_TYPE + "/_bulk?pretty";
 
-  private Client httpClient = ClientBuilder.newClient();
+  private final Client httpClient = ClientBuilder.newClient();
   private List<FilterConfig> filterConfigs = new ArrayList<>();
-  private List<String> payloadBulkList = new ArrayList<>();
+  private final List<String> payloadBulkList = new ArrayList<>();
 
   private String domainUID = null;
 
@@ -217,7 +217,8 @@ private void initialize(Config config) {
 
     elasticSearchHost = config.getHost();
     elasticSearchPort = config.getPort();
-    enabled = config.getEnabled();
+    @SuppressWarnings("unused")
+    boolean enabled = config.getEnabled();
     String severity = config.getSeverity();
     if (severity != null) {
       setLevel(WLLevel.getLevel(Severities.severityStringToNum(severity)));
@@ -286,6 +287,7 @@ private void createMappings() {
 
     Result result = executePutOrPostOnUrl(httpHostPort + "/" + indexName, mappings, false);
     if (!result.successful) {
+      //noinspection StatementWithEmptyBody
       if (result.getStatus() == HttpURLConnection.HTTP_BAD_REQUEST) {
         // ignore.  this is the case where the index has been created in elastic search.
       } else {

src/main/java/weblogic/logging/exporter/Result.java

@@ -10,10 +10,11 @@
  * Holder of response received from REST requests invoked using methods in {@link LogExportHandler}
  * class
  */
-public class Result {
+@SuppressWarnings("unused")
+class Result {
 
-  final String response;
-  final int status;
+  private final String response;
+  private final int status;
   final boolean successful;
 
   public Result(String response, int status, boolean successful) {

src/main/java/weblogic/logging/exporter/Startup.java

@@ -15,7 +15,7 @@ public class Startup {
 
   private static final String DEFAULT_CONFIG_FILE = "config/WebLogicLoggingExporter.yaml";
 
-  public static void main(String argv[]) {
+  public static void main(String[] argv) {
     System.out.println("======================= Weblogic Logging Exporter Startup class called");
     try {
       // Logger logger = LoggingHelper.getDomainLogger();

src/main/java/weblogic/logging/exporter/config/Config.java

@@ -23,7 +23,7 @@ public class Config {
   public static final int DEFAULT_ES_PORT = 9200;
   public static final String DEFAULT_INDEX_NAME = "wls";
   public static final int DEFAULT_BULK_SIZE = 1;
-  public static final String DEFAULT_DOMAIN_UID = "unknown";
+  private static final String DEFAULT_DOMAIN_UID = "unknown";
 
   private static final String HOST = "ElasticSearchHost";
   private static final String PORT = "ElasticSearchPort";
@@ -40,7 +40,7 @@ public class Config {
   private int bulkSize = DEFAULT_BULK_SIZE;
   private boolean enabled = true;
   private String severity = null;
-  private List<FilterConfig> filterConfigs = new ArrayList<>();
+  private final List<FilterConfig> filterConfigs = new ArrayList<>();
   private String domainUID = DEFAULT_DOMAIN_UID;
 
   private Config() {}
@@ -75,7 +75,7 @@ public static Config loadConfig(File file) {
     } catch (Exception ex) {
       System.out.println("Error detected in configuration file.");
     }
-    System.out.println("Using default for all paramters");
+    System.out.println("Using default for all parameters");
     return new Config();
   }
 
@@ -121,7 +121,7 @@ private boolean isArrayOfMaps(Object object) {
   }
 
   private boolean emptyOrContainsMaps(List list) {
-    return list.isEmpty() || Map.class.isInstance(list.get(0));
+    return list.isEmpty() || list.get(0) instanceof Map;
   }
 
   private static Config loadConfig(Map<String, Object> yamlConfig) {

src/main/java/weblogic/logging/exporter/config/ConfigurationException.java

@@ -9,17 +9,17 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class ConfigurationException extends RuntimeException {
-  public static final String BAD_YAML_FORMAT = "Configuration YAML format has errors";
+class ConfigurationException extends RuntimeException {
+  static final String BAD_YAML_FORMAT = "Configuration YAML format has errors";
   public static final String NOT_YAML_FORMAT = "Configuration is not in YAML format";
-  public static final String CONFIG_FILE_NOT_FOUND = "Configuration file cannot be found";
 
-  private List<String> context = new ArrayList<>();
+  private final List<String> context = new ArrayList<>();
 
   ConfigurationException(String description) {
     super(description);
   }
 
+  @SuppressWarnings("unused")
   void addContext(String parentContext) {
     context.add(0, parentContext);
   }

src/main/java/weblogic/logging/exporter/config/FilterConfig.java

@@ -18,21 +18,20 @@
 import weblogic.diagnostics.query.QueryFactory;
 
 public class FilterConfig {
-  static final String EXPRESSION = "FilterExpression";
-  static final String SERVERS = "FilterServers";
+  private static final String EXPRESSION = "FilterExpression";
+  private static final String SERVERS = "FilterServers";
 
-  private static final String[] NO_VALUES = {};
   private String expression;
   private String[] servers = new String[0];
   private Query query = null;
-  LogVariablesImpl lv = LogVariablesImpl.getInstance();
 
   private FilterConfig(Map<String, Object> map) {
     for (String key : map.keySet()) {
       switch (key) {
         case EXPRESSION:
           expression = MapUtils.getStringValue(map, EXPRESSION);
           try {
+            LogVariablesImpl lv = LogVariablesImpl.getInstance();
             query = QueryFactory.createQuery(lv, lv, expression);
           } catch (QueryException ex) {
             System.out.println("Error Parsing expression: " + expression);
@@ -61,7 +60,7 @@ private void setServers(String[] values) {
 
   private void reportDuplicateValues(String[] values, Set<String> uniqueValues) {
     ArrayList<String> duplicate = new ArrayList<>(Arrays.asList(values));
-    for (String unique : uniqueValues) duplicate.remove(duplicate.indexOf(unique));
+    for (String unique : uniqueValues) duplicate.remove(unique);
 
     throw new ConfigurationException("Duplicate values for " + duplicate);
   }

src/main/java/weblogic/logging/exporter/config/MapUtils.java

@@ -9,7 +9,8 @@
 import java.util.List;
 import java.util.Map;
 
-public class MapUtils {
+@SuppressWarnings("SameParameterValue")
+class MapUtils {
 
   private static final String ILLEGAL_VALUE_FORMAT = "Illegal value for %s: %s. Value must be %s";
 

src/main/java/weblogic/logging/exporter/config/YamlParserException.java

@@ -10,7 +10,7 @@
 
 /** An exception thrown when there is an error parsing the YAML. */
 public class YamlParserException extends ConfigurationException {
-  private ScannerException scannerException;
+  private final ScannerException scannerException;
 
   YamlParserException(ScannerException scannerException) {
     super(BAD_YAML_FORMAT);