JNI/JSSE: Code cleanup from SpotBugs review

- Make 14 inner classes static where outer instance is not needed
- Remove unnecessary transient on lock fields in WolfSSLCRL and
  WolfSSLCertificate
- Remove dead local variables in WolfSSLDebug log() and
  JSONFormatter

Author: cconlon

src/java/com/wolfssl/WolfSSLDebug.java

@@ -239,17 +239,6 @@ public String format(LogRecord record) {
                 return "{\"error\": \"null record\"}\n";
             }
 
-            String sourceClass = record.getSourceClassName();
-            if (sourceClass == null) {
-                sourceClass = "unknown";
-            } else {
-                /* Extract simple class name (after last dot) */
-                int lastDot = sourceClass.lastIndexOf('.');
-                if (lastDot >= 0) {
-                    sourceClass = sourceClass.substring(lastDot + 1);
-                }
-            }
-
             String component;
             String loggerName = record.getLoggerName();
             if (loggerName != null && loggerName.contains("jni")) {
@@ -452,11 +441,6 @@ public static synchronized <T> void log(Class<T> cl, Component component,
 
         Level level = tag.equals(ERROR) ? Level.SEVERE : Level.INFO;
 
-        String className = cl.getSimpleName();
-        if (nativePtr != 0) {
-            className = className + ": " + nativePtr;
-        }
-
         LogRecord record = new LogRecord(level, messageSupplier.get());
         record.setSourceClassName(cl.getName());
         record.setLoggerName(targetLogger.getName());

src/java/com/wolfssl/provider/jsse/WolfSSLAuthStore.java

@@ -790,7 +790,7 @@ protected void updateTimeouts(int in, int side) {
         }
     }
 
-    private class SessionStore<K, V> extends LinkedHashMap<K, V> {
+    private static class SessionStore<K, V> extends LinkedHashMap<K, V> {
         /**
          * user defined ID
          */

src/java/com/wolfssl/provider/jsse/WolfSSLEngine.java

@@ -2703,7 +2703,7 @@ protected synchronized int internalSessionTicketCb(byte[] ticket) {
         return 0;
     }
 
-    private class SendCB implements WolfSSLByteBufferIOSendCallback {
+    private static class SendCB implements WolfSSLByteBufferIOSendCallback {
 
         protected SendCB() {
 
@@ -2716,7 +2716,7 @@ public int sendCallback(WolfSSLSession ssl, ByteBuffer toSend, int sz,
 
     }
 
-    private class RecvCB implements WolfSSLByteBufferIORecvCallback {
+    private static class RecvCB implements WolfSSLByteBufferIORecvCallback {
 
         protected RecvCB() {
 
@@ -2729,7 +2729,8 @@ public int receiveCallback(WolfSSLSession ssl, ByteBuffer buf, int sz,
 
     }
 
-    private class SessionTicketCB implements WolfSSLSessionTicketCallback {
+    private static class SessionTicketCB
+        implements WolfSSLSessionTicketCallback {
 
         protected SessionTicketCB() {
         }

src/java/com/wolfssl/provider/jsse/WolfSSLProvider.java

@@ -42,7 +42,7 @@ public final class WolfSSLProvider extends Provider {
     /**
      * Inner callback class for wolfCrypt FIPS 140-2/3 errors
      */
-    public class JSSEFIPSErrorCallback implements WolfSSLFIPSErrorCallback {
+    public static class JSSEFIPSErrorCallback implements WolfSSLFIPSErrorCallback {
 
         /** Default JSSEFIPSErrorCallback constructor */
         public JSSEFIPSErrorCallback() { }

src/java/com/wolfssl/provider/jsse/WolfSSLSocket.java

@@ -2344,7 +2344,7 @@ protected synchronized void finalize() throws Throwable {
      * wolfSSL send callback context, used with SocketSendCallback to
      * gain access to the underlying Socket object.
      */
-    class SocketSendCtx {
+    static class SocketSendCtx {
         private Socket sock = null;
 
         public SocketSendCtx(Socket s) {
@@ -2360,7 +2360,7 @@ public Socket getSocket() {
      * wolfSSL receive callback context, used with SocketRecvCallback to
      * gain access to the underlying Socket object.
      */
-    class SocketRecvCtx {
+    static class SocketRecvCtx {
         private Socket sock = null;
 
         public SocketRecvCtx(Socket s) {
@@ -2381,7 +2381,7 @@ public Socket getSocket() {
      * subclasses contain an internal file descriptor (fd), or alternatively
      * expect the calling application to do I/O using the InputStream and
      * OutputStream of the Socket */
-    class SocketSendCallback implements WolfSSLIOSendCallback {
+    static class SocketSendCallback implements WolfSSLIOSendCallback {
 
         /**
          * I/O send callback method.
@@ -2439,7 +2439,7 @@ public int sendCallback(WolfSSLSession ssl,
      * subclasses contain an internal file descriptor (fd), or alternatively
      * expect the calling application to do I/O using the InputStream and
      * OutputStream of the Socket */
-    class SocketRecvCallback implements WolfSSLIORecvCallback {
+    static class SocketRecvCallback implements WolfSSLIORecvCallback {
 
         /**
          * I/O receive callback method.
@@ -2500,7 +2500,7 @@ public int receiveCallback(WolfSSLSession ssl,
      * wolfSSL receive callback context, used with ConsumedRecvCallback to
      * gain access to underlying Socket and InputStream objects.
      */
-    class ConsumedRecvCtx {
+    static class ConsumedRecvCtx {
         private Socket s = null;
         private DataInputStream consumed = null;
         private DataInputStream sockStream = null;
@@ -2547,7 +2547,7 @@ public synchronized void closeDataStreams()
      * This callback will read all data from the pre-existing/populated
      * InputStream first, then start reading from the Socket proper.
      */
-    class ConsumedRecvCallback implements WolfSSLIORecvCallback {
+    static class ConsumedRecvCallback implements WolfSSLIORecvCallback {
 
         public int receiveCallback(WolfSSLSession ssl, byte[] buf,
             int sz, Object ctx) {
@@ -2592,7 +2592,7 @@ public int receiveCallback(WolfSSLSession ssl, byte[] buf,
         }
     }
 
-    class WolfSSLInputStream extends InputStream {
+    static class WolfSSLInputStream extends InputStream {
 
         private WolfSSLSession ssl;
         private WolfSSLSocket  socket;
@@ -2834,7 +2834,7 @@ public synchronized int read(byte[] b, int off, int len)
         }
     } /* end WolfSSLInputStream inner class */
 
-    class WolfSSLOutputStream extends OutputStream {
+    static class WolfSSLOutputStream extends OutputStream {
 
         private WolfSSLSession ssl;
         private WolfSSLSocket  socket;

src/java/com/wolfssl/provider/jsse/WolfSSLX509.java

@@ -689,7 +689,7 @@ protected void finalize() throws Throwable {
     }
 
     /* wolfSSL Principal class */
-    private class WolfSSLPrincipal implements Principal {
+    private static class WolfSSLPrincipal implements Principal {
         private String name;
         private String[] DNs = { "/emailAddress=", "/CN=", "/OU=",
                 "/O=", "/L=", "/ST=", "/C="};