Modernize codebase and increase visibility of problematic code within a developers' IDEs by reducing warnings and code inspection violations. (Up to date with master and all tests passing as-of 2/15/22)

src/main/java/com/splunk/logging/HttpEventCollectorErrorHandler.java

@@ -1,6 +1,6 @@
 package com.splunk.logging;
 
-/**
+/*
  * @copyright
  *
  * Copyright 2013-2015 Splunk, Inc.

src/main/java/com/splunk/logging/HttpEventCollectorEventInfo.java

@@ -1,6 +1,6 @@
 package com.splunk.logging;
 
-/**
+/*
  * @copyright
  *
  * Copyright 2013-2015 Splunk, Inc.

src/main/java/com/splunk/logging/HttpEventCollectorLog4jAppender.java

@@ -40,7 +40,7 @@
 @SuppressWarnings("serial")
 public final class HttpEventCollectorLog4jAppender extends AbstractAppender
 {
-    private HttpEventCollectorSender sender = null;
+    private HttpEventCollectorSender sender;
     private final boolean includeLoggerName;
     private final boolean includeThreadName;
     private final boolean includeMDC;
@@ -154,10 +154,10 @@ public static HttpEventCollectorLog4jAppender createAppender(
             @PluginAttribute(value = "includeException", defaultBoolean = true) final boolean includeException,
             @PluginAttribute(value = "includeMarker", defaultBoolean = true) final boolean includeMarker,
             @PluginAttribute(value = "connect_timeout", defaultLong = HttpEventCollectorSender.TimeoutSettings.DEFAULT_CONNECT_TIMEOUT) final long connectTimeout,
-            @PluginAttribute(value = "call_timeout", defaultLong = HttpEventCollectorSender.TimeoutSettings.DEFAULT_CALL_TIMEOUT) final long callTimeout,
-            @PluginAttribute(value = "read_timeout", defaultLong = HttpEventCollectorSender.TimeoutSettings.DEFAULT_READ_TIMEOUT) final long readTimeout,
-            @PluginAttribute(value = "write_timeout", defaultLong = HttpEventCollectorSender.TimeoutSettings.DEFAULT_WRITE_TIMEOUT) final long writeTimeout,
-            @PluginAttribute(value = "termination_timeout", defaultLong = HttpEventCollectorSender.TimeoutSettings.DEFAULT_TERMINATION_TIMEOUT) final long terminationTimeout,
+            @PluginAttribute(value = "call_timeout") final long callTimeout,
+            @PluginAttribute(value = "read_timeout") final long readTimeout,
+            @PluginAttribute(value = "write_timeout") final long writeTimeout,
+            @PluginAttribute(value = "termination_timeout") final long terminationTimeout,
             @PluginElement("Layout") Layout<? extends Serializable> layout,
             @PluginElement("Filter") final Filter filter
     )

src/main/java/com/splunk/logging/HttpEventCollectorLoggingHandler.java

@@ -1,6 +1,6 @@
 package com.splunk.logging;
 
-/**
+/*
  * @copyright
  *
  * Copyright 2013-2015 Splunk, Inc.
@@ -93,7 +93,7 @@
  * properties file.
  */
 public final class HttpEventCollectorLoggingHandler extends Handler {
-    private HttpEventCollectorSender sender = null;
+    private HttpEventCollectorSender sender;
     private final String IncludeLoggerNameConfTag = "include_logger_name";
     private final boolean includeLoggerName;
     private final String IncludeThreadNameConfTag = "include_thread_name";

src/main/java/com/splunk/logging/HttpEventCollectorMiddleware.java

@@ -1,6 +1,6 @@
 package com.splunk.logging;
 
-/**
+/*
  * @copyright
  *
  * Copyright 2013-2015 Splunk, Inc.
@@ -38,16 +38,16 @@ public class HttpEventCollectorMiddleware {
      * An interface that describes an abstract events sender working asynchronously.
      */
     public interface IHttpSender {
-        public void postEvents(final List<HttpEventCollectorEventInfo> events,
-                               IHttpSenderCallback callback);
+        void postEvents(final List<HttpEventCollectorEventInfo> events,
+                        IHttpSenderCallback callback);
     }
 
     /**
      * Callback methods invoked by events sender.
      */
     public interface IHttpSenderCallback {
-        public void completed(int statusCode, final String reply);
-        public void failed(final Exception ex);
+        void completed(int statusCode, final String reply);
+        void failed(final Exception ex);
     }
 
     /**

src/main/java/com/splunk/logging/HttpEventCollectorResendMiddleware.java

@@ -1,6 +1,6 @@
 package com.splunk.logging;
 
-/**
+/*
  * @copyright
  *
  * Copyright 2013-2015 Splunk, Inc.
@@ -30,7 +30,7 @@
  */
 public class HttpEventCollectorResendMiddleware
         extends HttpEventCollectorMiddleware.HttpSenderMiddleware {
-    private long retriesOnError = 0;
+    private long retriesOnError;
 
     /**
      * Create a resend middleware component.

src/main/java/com/splunk/logging/HttpEventCollectorSender.java

@@ -1,6 +1,6 @@
 package com.splunk.logging;
 
-/**
+/*
  * @copyright
  *
  * Copyright 2013-2015 Splunk, Inc.
@@ -27,7 +27,6 @@
 import javax.net.ssl.*;
 import java.io.IOException;
 import java.io.Serializable;
-import java.security.cert.CertificateException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -63,7 +62,7 @@ public enum SendMode
     {
         Sequential,
         Parallel
-    };
+    }
 
     /**
      * Recommended default values for events batching.
@@ -79,7 +78,7 @@ public enum SendMode
     private long maxEventsBatchCount;
     private long maxEventsBatchSize;
     private Timer timer;
-    private List<HttpEventCollectorEventInfo> eventsBatch = new LinkedList<HttpEventCollectorEventInfo>();
+    private List<HttpEventCollectorEventInfo> eventsBatch = new LinkedList<>();
     private long eventsBatchSize = 0; // estimated total size of events batch
     private static final OkHttpClient httpSharedClient = new OkHttpClient(); // shared instance with the default settings
     private OkHttpClient httpClient = null; // shares the same connection pool and thread pools with the shared instance
@@ -354,11 +353,11 @@ private void startHttpClient() {
             final TrustManager[] trustAllCerts = new TrustManager[]{
                     new X509TrustManager() {
                         @Override
-                        public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                        public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) {
                         }
 
                         @Override
-                        public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) throws CertificateException {
+                        public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) {
                         }
 
                         @Override
@@ -377,12 +376,7 @@ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
                 builder.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0]);
             } catch (Exception ignored) { /* nop */ }
 
-            builder.hostnameVerifier(new HostnameVerifier() {
-                @Override
-                public boolean verify(String hostname, SSLSession session) {
-                    return true;
-                }
-            });
+            builder.hostnameVerifier((hostname, session) -> true);
         }
 
         httpClient = builder.build();

src/main/java/com/splunk/logging/SplunkCimLogEvent.java

@@ -61,7 +61,7 @@ public class SplunkCimLogEvent {
      * @param eventID event ID
      */
     public SplunkCimLogEvent(String eventName, String eventID) {
-        entries = new LinkedHashMap<String, Object>();
+        entries = new LinkedHashMap<>();
 
         addField(PREFIX_NAME, eventName);
         addField(PREFIX_EVENT_ID, eventID);
@@ -157,7 +157,7 @@ public String toString() {
     private static final String THROWABLE_MESSAGE = "throwable_message";
     private static final String THROWABLE_STACKTRACE_ELEMENTS = "stacktrace_elements";
 
-    /**
+    /*
      * Splunk Common Information Model(CIM) Fields
      */
 

src/main/java/com/splunk/logging/TcpAppender.java

@@ -148,13 +148,7 @@ private SocketConnector initSocketConnector() {
             connector = getDefaultSocketConnectorConstr().newInstance(address, port, 0, reconnectionDelay);
         }
 
-        catch (InvocationTargetException e) {
-            throwRuntimeException(e);
-        }
-        catch (InstantiationException e) {
-            throwRuntimeException(e);
-        }
-        catch (IllegalAccessException e) {
+        catch (InvocationTargetException | InstantiationException | IllegalAccessException e) {
             throwRuntimeException(e);
         }
 
@@ -243,14 +237,11 @@ public void start() {
 
         // Dispatch this instance of the appender.
         if (!errorPresent) {
-            queue = queueSize <= 0 ? new SynchronousQueue<ILoggingEvent>() : new ArrayBlockingQueue<ILoggingEvent>(queueSize);
-            ThreadFactory factory = new ThreadFactory() {
-                @Override
-                public Thread newThread(Runnable r) {
-                    Thread t = new Thread(r, "splunk-tcp-appender");
-                    t.setDaemon(true);
-                    return t;
-                }
+            queue = queueSize <= 0 ? new SynchronousQueue<>() : new ArrayBlockingQueue<>(queueSize);
+            ThreadFactory factory = r -> {
+                Thread t = new Thread(r, "splunk-tcp-appender");
+                t.setDaemon(true);
+                return t;
             };
             executor = Executors.newSingleThreadExecutor(factory);
             executor.execute(this);

src/main/java/com/splunk/logging/serialization/EventInfoTypeAdapter.java

@@ -6,7 +6,6 @@
 package com.splunk.logging.serialization;
 
 import com.google.gson.*;
-import com.splunk.logging.EventBodySerializer;
 import com.splunk.logging.HttpEventCollectorEventInfo;
 
 import java.lang.reflect.Type;

src/main/java/com/splunk/logging/serialization/HecJsonSerializer.java

@@ -13,7 +13,6 @@
 import com.splunk.logging.hec.MetadataTags;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class HecJsonSerializer {
     private static final Set<String> KEYWORDS = MetadataTags.HEC_TAGS;