directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject [1/2] directory-kerby git commit: DIRKRB-398 Fix check style issues in not-yet-commons-ssl module.
Date Wed, 12 Aug 2015 02:14:37 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/pkinit-support 3976c5ab0 -> 351eb01fb


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLClient.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLClient.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLClient.java
index 4bc9156..ada8acb 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLClient.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLClient.java
@@ -36,7 +36,6 @@ import javax.net.ssl.SSLSocketFactory;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
-import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
 import java.security.KeyManagementException;
 import java.security.KeyStoreException;
@@ -77,19 +76,33 @@ public class SSLClient extends SSLSocketFactory {
         ssl.setKeyMaterial(keyMaterial);
     }
 
-    public void setIsSecure(boolean b) { ssl.setIsSecure(b); }
+    public void setIsSecure(boolean b) {
+        ssl.setIsSecure(b);
+    }
 
-    public void setDnsOverride(Map m) { ssl.setDnsOverride(m); }    
+    public void setDnsOverride(Map m) {
+        ssl.setDnsOverride(m);
+    }
 
-    public void setCheckCRL(boolean b) { ssl.setCheckCRL(b); }
+    public void setCheckCRL(boolean b) {
+        ssl.setCheckCRL(b);
+    }
 
-    public void setCheckExpiry(boolean b) { ssl.setCheckExpiry(b); }
+    public void setCheckExpiry(boolean b) {
+        ssl.setCheckExpiry(b);
+    }
 
-    public void setCheckHostname(boolean b) { ssl.setCheckHostname(b); }
+    public void setCheckHostname(boolean b) {
+        ssl.setCheckHostname(b);
+    }
 
-    public void setConnectTimeout(int i) { ssl.setConnectTimeout(i); }
+    public void setConnectTimeout(int i) {
+        ssl.setConnectTimeout(i);
+    }
 
-    public void setDefaultProtocol(String s) { ssl.setDefaultProtocol(s); }
+    public void setDefaultProtocol(String s) {
+        ssl.setDefaultProtocol(s);
+    }
 
     public void setEnabledCiphers(String[] ciphers) {
         ssl.setEnabledCiphers(ciphers);
@@ -103,51 +116,81 @@ public class SSLClient extends SSLSocketFactory {
         ssl.setHostnameVerifier(verifier);
     }
 
-    public void setSoTimeout(int soTimeout) { ssl.setSoTimeout(soTimeout); }
+    public void setSoTimeout(int soTimeout) {
+        ssl.setSoTimeout(soTimeout);
+    }
 
     public void setSSLWrapperFactory(SSLWrapperFactory wf) {
         ssl.setSSLWrapperFactory(wf);
     }
 
-    public void setNeedClientAuth(boolean b) { ssl.setNeedClientAuth(b); }
+    public void setNeedClientAuth(boolean b) {
+        ssl.setNeedClientAuth(b);
+    }
 
-    public void setWantClientAuth(boolean b) { ssl.setWantClientAuth(b); }
+    public void setWantClientAuth(boolean b) {
+        ssl.setWantClientAuth(b);
+    }
 
-    public void setUseClientMode(boolean b) { ssl.setUseClientMode(b); }
+    public void setUseClientMode(boolean b) {
+        ssl.setUseClientMode(b);
+    }
 
-    public boolean isSecure() { return ssl.isSecure(); }
+    public boolean isSecure() {
+        return ssl.isSecure();
+    }
 
     public X509Certificate[] getAssociatedCertificateChain() {
         return ssl.getAssociatedCertificateChain();
     }
 
-    public boolean getCheckCRL() { return ssl.getCheckCRL(); }
+    public boolean getCheckCRL() {
+        return ssl.getCheckCRL();
+    }
 
-    public boolean getCheckExpiry() { return ssl.getCheckExpiry(); }
+    public boolean getCheckExpiry() {
+        return ssl.getCheckExpiry();
+    }
 
-    public boolean getCheckHostname() { return ssl.getCheckHostname(); }
+    public boolean getCheckHostname() {
+        return ssl.getCheckHostname();
+    }
 
-    public int getConnectTimeout() { return ssl.getConnectTimeout(); }
+    public int getConnectTimeout() {
+        return ssl.getConnectTimeout();
+    }
 
-    public String getDefaultProtocol() { return ssl.getDefaultProtocol(); }
+    public String getDefaultProtocol() {
+        return ssl.getDefaultProtocol();
+    }
 
-    public String[] getEnabledCiphers() { return ssl.getEnabledCiphers(); }
+    public String[] getEnabledCiphers() {
+        return ssl.getEnabledCiphers();
+    }
 
-    public String[] getEnabledProtocols() { return ssl.getEnabledProtocols(); }
+    public String[] getEnabledProtocols() {
+        return ssl.getEnabledProtocols();
+    }
 
     public HostnameVerifier getHostnameVerifier() {
         return ssl.getHostnameVerifier();
     }
 
-    public int getSoTimeout() { return ssl.getSoTimeout(); }
+    public int getSoTimeout() {
+        return ssl.getSoTimeout();
+    }
 
     public SSLWrapperFactory getSSLWrapperFactory() {
         return ssl.getSSLWrapperFactory();
     }
 
-    public boolean getNeedClientAuth() { return ssl.getNeedClientAuth(); }
+    public boolean getNeedClientAuth() {
+        return ssl.getNeedClientAuth();
+    }
 
-    public boolean getWantClientAuth() { return ssl.getWantClientAuth(); }
+    public boolean getWantClientAuth() {
+        return ssl.getWantClientAuth();
+    }
 
     public boolean getUseClientMode() { /* SSLClient's default is true. */
         return ssl.getUseClientModeDefault() || ssl.getUseClientMode();
@@ -157,7 +200,9 @@ public class SSLClient extends SSLSocketFactory {
         return ssl.getSSLContext();
     }
 
-    public TrustChain getTrustChain() { return ssl.getTrustChain(); }
+    public TrustChain getTrustChain() {
+        return ssl.getTrustChain();
+    }
 
     public X509Certificate[] getCurrentServerChain() {
         return ssl.getCurrentServerChain();
@@ -207,9 +252,9 @@ public class SSLClient extends SSLSocketFactory {
      * @param localPort the port on the local machine
      * @param timeout   the connection timeout (0==infinite)
      * @return Socket a new socket
-     * @throws java.io.IOException          if an I/O error occurs while creating thesocket
+     * @throws java.io.IOException           if an I/O error occurs while creating thesocket
      * @throws java.net.UnknownHostException if the IP address of the host cannot be
-     *                              determined
+     *                                       determined
      */
     public Socket createSocket(String host, int port, InetAddress localHost,
                                int localPort, int timeout)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
index 7bf6941..070d951 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLEchoServer.java
@@ -102,8 +102,7 @@ public class SSLEchoServer {
                             System.out.println(Certificates.toString(cert));
                         }
                     }
-                }
-                catch (SSLPeerUnverifiedException sslpue) {
+                } catch (SSLPeerUnverifiedException sslpue) {
                     // oh well, no client cert for us
                     System.out.println(sslpue);
                 }
@@ -122,8 +121,7 @@ public class SSLEchoServer {
                     out.flush();
                     line = readLine.next();
                 }
-            }
-            catch (IOException ioe) {
+            } catch (IOException ioe) {
                 try {
                     if (out != null) {
                         out.close();
@@ -132,8 +130,8 @@ public class SSLEchoServer {
                         in.close();
                     }
                     s.close();
-                }
-                catch (Exception e) {
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
 
                 if (ioe instanceof InterruptedIOException) {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
index 795dc88..2dcb6a4 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLProxyServer.java
@@ -134,8 +134,7 @@ public class SSLProxyServer {
                                 }
                                 read = rIn.read(buf);
                             }
-                        }
-                        catch (IOException ioe) {
+                        } catch (IOException ioe) {
                             e[0] = ioe;
                         }
                     }
@@ -156,8 +155,7 @@ public class SSLProxyServer {
                 }
 
 
-            }
-            catch (IOException ioe) {
+            } catch (IOException ioe) {
                 try {
                     if (out != null) {
                         out.close();
@@ -166,8 +164,8 @@ public class SSLProxyServer {
                         in.close();
                     }
                     s.close();
-                }
-                catch (Exception e) {
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
 
                 try {
@@ -178,8 +176,8 @@ public class SSLProxyServer {
                         newIn.close();
                     }
                     newSocket.close();
-                }
-                catch (Exception e) {
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
 
 
@@ -192,5 +190,4 @@ public class SSLProxyServer {
             }
         }
     }
-
 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServer.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServer.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServer.java
index 4d58988..cc13e98 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServer.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServer.java
@@ -89,8 +89,7 @@ public class SSLServer extends SSLServerSocketFactory {
             KeyMaterial km = null;
             try {
                 km = new KeyMaterial(path, pwd.toCharArray());
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 // Don't want to blowup just because this silly default
                 // behaviour didn't work out.
                 if (pwdSet) {
@@ -109,7 +108,9 @@ public class SSLServer extends SSLServerSocketFactory {
         return success;
     }
 
-    public void setDnsOverride(Map m) { ssl.setDnsOverride(m); }
+    public void setDnsOverride(Map m) {
+        ssl.setDnsOverride(m);
+    }
 
     public void addTrustMaterial(TrustChain trustChain)
         throws NoSuchAlgorithmException, KeyStoreException,
@@ -129,15 +130,25 @@ public class SSLServer extends SSLServerSocketFactory {
         ssl.setKeyMaterial(keyMaterial);
     }
 
-    public void setCheckCRL(boolean b) { ssl.setCheckCRL(b); }
+    public void setCheckCRL(boolean b) {
+        ssl.setCheckCRL(b);
+    }
 
-    public void setCheckExpiry(boolean b) { ssl.setCheckExpiry(b); }
+    public void setCheckExpiry(boolean b) {
+        ssl.setCheckExpiry(b);
+    }
 
-    public void setCheckHostname(boolean b) { ssl.setCheckHostname(b); }
+    public void setCheckHostname(boolean b) {
+        ssl.setCheckHostname(b);
+    }
 
-    public void setConnectTimeout(int i) { ssl.setConnectTimeout(i); }
+    public void setConnectTimeout(int i) {
+        ssl.setConnectTimeout(i);
+    }
 
-    public void setDefaultProtocol(String s) { ssl.setDefaultProtocol(s); }
+    public void setDefaultProtocol(String s) {
+        ssl.setDefaultProtocol(s);
+    }
 
     public void setEnabledCiphers(String[] ciphers) {
         ssl.setEnabledCiphers(ciphers);
@@ -151,49 +162,77 @@ public class SSLServer extends SSLServerSocketFactory {
         ssl.setHostnameVerifier(verifier);
     }
 
-    public void setSoTimeout(int soTimeout) { ssl.setSoTimeout(soTimeout); }
+    public void setSoTimeout(int soTimeout) {
+        ssl.setSoTimeout(soTimeout);
+    }
 
     public void setSSLWrapperFactory(SSLWrapperFactory wf) {
         ssl.setSSLWrapperFactory(wf);
     }
 
-    public void setNeedClientAuth(boolean b) { ssl.setNeedClientAuth(b); }
+    public void setNeedClientAuth(boolean b) {
+        ssl.setNeedClientAuth(b);
+    }
 
-    public void setWantClientAuth(boolean b) { ssl.setWantClientAuth(b); }
+    public void setWantClientAuth(boolean b) {
+        ssl.setWantClientAuth(b);
+    }
 
-    public void setUseClientMode(boolean b) { ssl.setUseClientMode(b); }
+    public void setUseClientMode(boolean b) {
+        ssl.setUseClientMode(b);
+    }
 
     public X509Certificate[] getAssociatedCertificateChain() {
         return ssl.getAssociatedCertificateChain();
     }
 
-    public boolean getCheckCRL() { return ssl.getCheckCRL(); }
+    public boolean getCheckCRL() {
+        return ssl.getCheckCRL();
+    }
 
-    public boolean getCheckExpiry() { return ssl.getCheckExpiry(); }
+    public boolean getCheckExpiry() {
+        return ssl.getCheckExpiry();
+    }
 
-    public boolean getCheckHostname() { return ssl.getCheckHostname(); }
+    public boolean getCheckHostname() {
+        return ssl.getCheckHostname();
+    }
 
-    public int getConnectTimeout() { return ssl.getConnectTimeout(); }
+    public int getConnectTimeout() {
+        return ssl.getConnectTimeout();
+    }
 
-    public String getDefaultProtocol() { return ssl.getDefaultProtocol(); }
+    public String getDefaultProtocol() {
+        return ssl.getDefaultProtocol();
+    }
 
-    public String[] getEnabledCiphers() { return ssl.getEnabledCiphers(); }
+    public String[] getEnabledCiphers() {
+        return ssl.getEnabledCiphers();
+    }
 
-    public String[] getEnabledProtocols() { return ssl.getEnabledProtocols(); }
+    public String[] getEnabledProtocols() {
+        return ssl.getEnabledProtocols();
+    }
 
     public HostnameVerifier getHostnameVerifier() {
         return ssl.getHostnameVerifier();
     }
 
-    public int getSoTimeout() { return ssl.getSoTimeout(); }
+    public int getSoTimeout() {
+        return ssl.getSoTimeout();
+    }
 
     public SSLWrapperFactory getSSLWrapperFactory() {
         return ssl.getSSLWrapperFactory();
     }
 
-    public boolean getNeedClientAuth() { return ssl.getNeedClientAuth(); }
+    public boolean getNeedClientAuth() {
+        return ssl.getNeedClientAuth();
+    }
 
-    public boolean getWantClientAuth() { return ssl.getWantClientAuth(); }
+    public boolean getWantClientAuth() {
+        return ssl.getWantClientAuth();
+    }
 
     public boolean getUseClientMode() { /* SSLServer's default is false. */
         return !ssl.getUseClientModeDefault() && ssl.getUseClientMode();
@@ -203,7 +242,9 @@ public class SSLServer extends SSLServerSocketFactory {
         return ssl.getSSLContext();
     }
 
-    public TrustChain getTrustChain() { return ssl.getTrustChain(); }
+    public TrustChain getTrustChain() {
+        return ssl.getTrustChain();
+    }
 
     public X509Certificate[] getCurrentClientChain() {
         return ssl.getCurrentClientChain();

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServerSocketWrapper.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServerSocketWrapper.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServerSocketWrapper.java
index c5d24d9..ead1a0f 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServerSocketWrapper.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLServerSocketWrapper.java
@@ -81,23 +81,33 @@ public class SSLServerSocketWrapper extends SSLServerSocket {
         return s.getEnabledCipherSuites();
     }
 
-    public String[] getEnabledProtocols() { return s.getEnabledProtocols(); }
+    public String[] getEnabledProtocols() {
+        return s.getEnabledProtocols();
+    }
 
     public boolean getEnableSessionCreation() {
         return s.getEnableSessionCreation();
     }
 
-    public boolean getNeedClientAuth() { return s.getNeedClientAuth(); }
+    public boolean getNeedClientAuth() {
+        return s.getNeedClientAuth();
+    }
 
     public String[] getSupportedCipherSuites() {
         return s.getSupportedCipherSuites();
     }
 
-    public String[] getSupportedProtocols() { return s.getSupportedProtocols(); }
+    public String[] getSupportedProtocols() {
+        return s.getSupportedProtocols();
+    }
 
-    public boolean getUseClientMode() { return s.getUseClientMode(); }
+    public boolean getUseClientMode() {
+        return s.getUseClientMode();
+    }
 
-    public boolean getWantClientAuth() { return s.getWantClientAuth(); }
+    public boolean getWantClientAuth() {
+        return s.getWantClientAuth();
+    }
 
     public void setEnabledCipherSuites(String[] suites) {
         s.setEnabledCipherSuites(suites);
@@ -115,7 +125,9 @@ public class SSLServerSocketWrapper extends SSLServerSocket {
         s.setNeedClientAuth(need);
     }
 
-    public void setUseClientMode(boolean use) { s.setUseClientMode(use); }
+    public void setUseClientMode(boolean use) {
+        s.setUseClientMode(use);
+    }
 
     public void setWantClientAuth(boolean want) {
         s.setWantClientAuth(want);
@@ -131,13 +143,21 @@ public class SSLServerSocketWrapper extends SSLServerSocket {
         s.bind(ep, bl);
     }
 
-    public void close() throws IOException { s.close(); }
+    public void close() throws IOException {
+        s.close();
+    }
 
-    public ServerSocketChannel getChannel() { return s.getChannel(); }
+    public ServerSocketChannel getChannel() {
+        return s.getChannel();
+    }
 
-    public InetAddress getInetAddress() { return s.getInetAddress(); }
+    public InetAddress getInetAddress() {
+        return s.getInetAddress();
+    }
 
-    public int getLocalPort() { return s.getLocalPort(); }
+    public int getLocalPort() {
+        return s.getLocalPort();
+    }
 
     public SocketAddress getLocalSocketAddress() {
         return s.getLocalSocketAddress();
@@ -151,11 +171,17 @@ public class SSLServerSocketWrapper extends SSLServerSocket {
         return s.getReuseAddress();
     }
 
-    public int getSoTimeout() throws IOException { return s.getSoTimeout(); }
+    public int getSoTimeout() throws IOException {
+        return s.getSoTimeout();
+    }
 
-    public boolean isBound() { return s.isBound(); }
+    public boolean isBound() {
+        return s.isBound();
+    }
 
-    public boolean isClosed() { return s.isClosed(); }
+    public boolean isClosed() {
+        return s.isClosed();
+    }
 
     public void setReceiveBufferSize(int size) throws SocketException {
         s.setReceiveBufferSize(size);
@@ -169,7 +195,9 @@ public class SSLServerSocketWrapper extends SSLServerSocket {
         s.setSoTimeout(timeout);
     }
 
-    public String toString() { return s.toString(); }
+    public String toString() {
+        return s.toString();
+    }
 
     /*  Java 1.5
      public void setPerformancePreferences(int connectionTime, int latency, int bandwidth)

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLWrapperFactory.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLWrapperFactory.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLWrapperFactory.java
index 2d3915e..1c8760b 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLWrapperFactory.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/SSLWrapperFactory.java
@@ -32,7 +32,6 @@
 package org.apache.commons.ssl;
 
 import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLSocket;
 import java.io.IOException;
 import java.net.Socket;
 
@@ -74,9 +73,11 @@ public interface SSLWrapperFactory {
      * setEnabledCiphers, setUseClientMode, and the hostname verifier (which
      * should be very rare on SSLServerSockets!).
      */
-    final static SSLWrapperFactory NO_WRAP = new SSLWrapperFactory() {
+    SSLWrapperFactory NO_WRAP = new SSLWrapperFactory() {
         // Notice!  No wrapping!
-        public Socket wrap(Socket s) { return s; }
+        public Socket wrap(Socket s) {
+            return s;
+        }
 
         // We still wrap the ServerSocket, but we don't wrap the result of the
         // the accept() call.
@@ -91,14 +92,14 @@ public interface SSLWrapperFactory {
      * anything.  It doesn't actually do anything interesting in its wrapped
      * implementations.
      */
-    final static SSLWrapperFactory DUMB_WRAP = new SSLWrapperFactory() {
-        public Socket wrap(Socket s) { return new SSLSocketWrapper(s); }
+    SSLWrapperFactory DUMB_WRAP = new SSLWrapperFactory() {
+        public Socket wrap(Socket s) {
+            return new SSLSocketWrapper(s);
+        }
 
         public SSLServerSocket wrap(SSLServerSocket s, SSL ssl)
             throws IOException {
             return new SSLServerSocketWrapper(s, ssl, this);
         }
     };
-
-
 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
index ca6d5a0..b002c3d 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/TrustMaterial.java
@@ -54,18 +54,18 @@ import java.util.Iterator;
  * @since 27-Feb-2006
  */
 public class TrustMaterial extends TrustChain {
-    final static int SIMPLE_TRUST_TYPE_TRUST_ALL = 1;
-    final static int SIMPLE_TRUST_TYPE_TRUST_THIS_JVM = 2;
+    static final int SIMPLE_TRUST_TYPE_TRUST_ALL = 1;
+    static final int SIMPLE_TRUST_TYPE_TRUST_THIS_JVM = 2;
 
     /**
      * Might be null if "$JAVA_HOME/jre/lib/security/cacerts" doesn't exist.
      */
-    public final static TrustMaterial CACERTS;
+    public static final TrustMaterial CACERTS;
 
     /**
      * Might be null if "$JAVA_HOME/jre/lib/security/jssecacerts" doesn't exist.
      */
-    public final static TrustMaterial JSSE_CACERTS;
+    public static final TrustMaterial JSSE_CACERTS;
 
     /**
      * Should never be null (unless both CACERTS and JSSE_CACERTS are not
@@ -73,7 +73,7 @@ public class TrustMaterial extends TrustChain {
      * JSSE_CACERTS, but 99.9% of the time it's CACERTS, since JSSE_CACERTS
      * is almost never present.
      */
-    public final static TrustMaterial DEFAULT;
+    public static final TrustMaterial DEFAULT;
 
     static {
         JavaImpl.load();
@@ -87,8 +87,7 @@ public class TrustMaterial extends TrustChain {
             if (f.exists()) {
                 cacerts = new TrustMaterial(pathToCacerts);
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         try {
@@ -96,8 +95,7 @@ public class TrustMaterial extends TrustChain {
             if (f.exists()) {
                 jssecacerts = new TrustMaterial(pathToJSSECacerts);
             }
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
@@ -110,10 +108,10 @@ public class TrustMaterial extends TrustChain {
         }
     }
 
-    public final static TrustMaterial TRUST_ALL =
+    public static final TrustMaterial TRUST_ALL =
         new TrustMaterial(SIMPLE_TRUST_TYPE_TRUST_ALL);
 
-    public final static TrustMaterial TRUST_THIS_JVM =
+    public static final TrustMaterial TRUST_THIS_JVM =
         new TrustMaterial(SIMPLE_TRUST_TYPE_TRUST_THIS_JVM);
 
     public final int simpleTrustType;
@@ -272,7 +270,7 @@ public class TrustMaterial extends TrustChain {
 
     protected boolean containsTrustAll() {
         boolean yes = this.simpleTrustType == SIMPLE_TRUST_TYPE_TRUST_ALL;
-        if ( !yes ) {
+        if (!yes) {
             yes = super.containsTrustAll();
         }
         return yes;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java
index 45f716a..37e7da3 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Util.java
@@ -61,8 +61,8 @@ import java.util.TreeSet;
  * @since 28-Feb-2006
  */
 public class Util {
-    public final static int SIZE_KEY = 0;
-    public final static int LAST_READ_KEY = 1;
+    public static final int SIZE_KEY = 0;
+    public static final int LAST_READ_KEY = 1;
 
     /**
      * True if the Keystores have the same # of entries, have the same set of aliases, and
all the certificate-chains
@@ -117,9 +117,9 @@ public class Util {
             return false;
         }
         String s = yesString.trim().toUpperCase();
-        return "1".equals(s) || "YES".equals(s) || "TRUE".equals(s) ||
-               "ENABLE".equals(s) || "ENABLED".equals(s) || "Y".equals(s) ||
-               "ON".equals(s);
+        return "1".equals(s) || "YES".equals(s) || "TRUE".equals(s)
+               || "ENABLE".equals(s) || "ENABLED".equals(s) || "Y".equals(s)
+               || "ON".equals(s);
     }
 
     public static String trim(final String s) {
@@ -169,13 +169,20 @@ public class Util {
                 }
                 bytesRead = in.read(buf);
             }
-        }
-        finally {
+        } finally {
             // Probably it's best to let consumer call "close", but I'm usually
             // the consumer, and I want to be lazy.  [Julius, November 20th, 2006]
-            try { in.close(); } catch (IOException e) { ioe = e; }
+            try {
+                in.close();
+            } catch (IOException e) {
+                ioe = e;
+            }
             if (autoClose) {
-                try { out.close(); } catch (IOException e) { ioe = e; }
+                try {
+                    out.close();
+                } catch (IOException e) {
+                    ioe = e;
+                }
             }
         }
         if (ioe != null) {
@@ -230,8 +237,7 @@ public class Util {
                 System.arraycopy(buf, 0, smallerBuf, 0, size);
                 buf = smallerBuf;
             }
-        }
-        finally {
+        } finally {
             in.close();
         }
         return buf;
@@ -324,18 +330,18 @@ public class Util {
 
     public static Map parseArgs(final String[] cargs) {
         Map args = new TreeMap();
-        Map ARGS_MATCH = Ping.ARGS_MATCH;
+        Map argsMatch = Ping.argsMatch;
 
         int l = cargs.length;
-        final String[] EMPTY_VALUES = {""};
+        final String[] emptyValues = {""};
         for (int i = 0; i < l; i++) {
             String k = cargs[i];
-            Ping.Arg a = (Ping.Arg) ARGS_MATCH.get(k);
+            Ping.Arg a = (Ping.Arg) argsMatch.get(k);
             if (l > i + 1) {
                 String v = cargs[++i];
-                while (ARGS_MATCH.containsKey(v)) {
-                    args.put(a, EMPTY_VALUES);
-                    a = (Ping.Arg) ARGS_MATCH.get(v);
+                while (argsMatch.containsKey(v)) {
+                    args.put(a, emptyValues);
+                    a = (Ping.Arg) argsMatch.get(v);
                     v = "";
                     if (l > i + 1) {
                         v = cargs[++i];
@@ -344,17 +350,17 @@ public class Util {
                 String[] values = new String[1];
                 values[0] = v;
                 args.put(a, values);
-                if (l > i + 1 && !ARGS_MATCH.containsKey(cargs[i + 1])) {
+                if (l > i + 1 && !argsMatch.containsKey(cargs[i + 1])) {
                     LinkedList list = new LinkedList();
                     list.add(v);
-                    while (l > i + 1 && !ARGS_MATCH.containsKey(cargs[i + 1]))
{
+                    while (l > i + 1 && !argsMatch.containsKey(cargs[i + 1]))
{
                         v = cargs[++i];
                         list.add(v);
                     }
                     args.put(a, list.toArray(new String[list.size()]));
                 }
             } else {
-                args.put(a, EMPTY_VALUES);
+                args.put(a, emptyValues);
             }
         }
         return args;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
index b102c81..07dbe86 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Version.java
@@ -54,7 +54,8 @@ import java.util.jar.JarFile;
  * @since 14-Nov-2007
  */
 public class Version {
-    public static final String HEAD_URL = "$HeadURL: http://juliusdavies.ca/svn/not-yet-commons-ssl/tags/commons-ssl-0.3.16/src/java/org/apache/commons/ssl/Version.java
$";
+    public static final String HEAD_URL = "$HeadURL: http://juliusdavies.ca/svn/not-yet-commons-ssl"
+        + "/tags/commons-ssl-0.3.16/src/java/org/apache/commons/ssl/Version.java $";
     public static final String VERSION;
     public static final String COMPILE_TIME;
 
@@ -83,8 +84,8 @@ public class Version {
             v = v.replace('-', '.');
         }
 
-        String V = v.toUpperCase();
-        x = V.indexOf("COMMONS.SSL.");
+        String version = v.toUpperCase();
+        x = version.indexOf("COMMONS.SSL.");
         if (x >= 0) {
             v = v.substring(x + "commons.ssl.".length());
         }
@@ -94,8 +95,7 @@ public class Version {
         String s;
         try {
             s = CompileTime.getCompileTimeString(Version.class);
-        }
-        catch (NoClassDefFoundError e) {
+        } catch (NoClassDefFoundError e) {
             s = null;
         }
         COMPILE_TIME = s;
@@ -125,10 +125,10 @@ public class Version {
      * all the class files.
      */
     private static class CompileTime {
-        private final static String PATTERN = ".jar!";
-        private final static String PREFIX = "file:";
-        private final static String DF_FORMAT = "zzz:yyyy-MM-dd/HH:mm:ss.SSS";
-        private final static DateFormat DF = new SimpleDateFormat(DF_FORMAT);
+        private static final String PATTERN = ".jar!";
+        private static final String PREFIX = "file:";
+        private static final String DF_FORMAT = "zzz:yyyy-MM-dd/HH:mm:ss.SSS";
+        private static final DateFormat DF = new SimpleDateFormat(DF_FORMAT);
 
         public static String getCompileTimeString(Class clazz) {
             String s = clazz.getName();
@@ -142,8 +142,7 @@ public class Version {
                 synchronized (DF) {
                     return d != null ? DF.format(d) : "[unknown]";
                 }
-            }
-            catch (IOException ioe) {
+            } catch (IOException ioe) {
                 return ioe.toString();
             }
         }
@@ -177,8 +176,7 @@ public class Version {
                     File f = new File(urlString);
                     try {
                         return new Date(f.lastModified());
-                    }
-                    catch (Exception e) {
+                    } catch (Exception e) {
                         return null;
                     }
                 }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ByteArrayReadLine.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ByteArrayReadLine.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ByteArrayReadLine.java
index 88d0a29..bf50398 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ByteArrayReadLine.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ByteArrayReadLine.java
@@ -5,9 +5,13 @@ import java.io.IOException;
 
 public class ByteArrayReadLine extends ReadLine {
 
-    public ByteArrayReadLine(ByteArrayInputStream in) { super(in); }
+    public ByteArrayReadLine(ByteArrayInputStream in) {
+        super(in);
+    }
 
-    public String next() { return next(1); }
+    public String next() {
+        return next(1);
+    }
 
     public String next(int lines) {
         try {
@@ -18,7 +22,9 @@ public class ByteArrayReadLine extends ReadLine {
         }
     }
 
-    public byte[] nextAsBytes() { return nextAsBytes(1); }
+    public byte[] nextAsBytes() {
+        return nextAsBytes(1);
+    }
 
     public byte[] nextAsBytes(int lines) {
         try {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ReadLine.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ReadLine.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ReadLine.java
index ee68016..55fc512 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ReadLine.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/util/ReadLine.java
@@ -14,9 +14,13 @@ public class ReadLine {
     int pos = 0;
     int avail = 0;
 
-    public ReadLine(InputStream in) { this.in = in; }
+    public ReadLine(InputStream in) {
+        this.in = in;
+    }
 
-    public String next() throws IOException { return next(1); }
+    public String next() throws IOException {
+        return next(1);
+    }
 
     public String next(int lines) throws IOException {
         if (lines < 1) {
@@ -49,7 +53,9 @@ public class ReadLine {
         return buf.length() > 0 ? buf.toString() : null;
     }
 
-    public byte[] nextAsBytes() throws IOException { return nextAsBytes(1); }
+    public byte[] nextAsBytes() throws IOException {
+        return nextAsBytes(1);
+    }
 
     public byte[] nextAsBytes(int lines) throws IOException {
         if (lines < 1) {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/JUnitConfig.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/JUnitConfig.java
b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/JUnitConfig.java
index 2318737..0573070 100644
--- a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/JUnitConfig.java
+++ b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/JUnitConfig.java
@@ -2,13 +2,12 @@ package org.apache.commons.ssl;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.util.Properties;
 
 public class JUnitConfig {
 
-    public final static String TEST_HOME;
+    public static final String TEST_HOME;
 
     static {
         String home = "";

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestBase64.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestBase64.java
b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestBase64.java
index 9bb9074..59ce2a9 100644
--- a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestBase64.java
+++ b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestBase64.java
@@ -1,7 +1,5 @@
 package org.apache.commons.ssl;
 
-import static org.junit.Assert.assertTrue;
-
 import org.apache.kerby.util.Base64;
 import org.apache.kerby.util.Base64InputStream;
 import org.junit.Test;
@@ -10,6 +8,8 @@ import java.io.ByteArrayInputStream;
 import java.util.Arrays;
 import java.util.Random;
 
+import static org.junit.Assert.assertTrue;
+
 
 public class TestBase64 {
 
@@ -36,7 +36,7 @@ public class TestBase64 {
             random.nextBytes(buf);
             byte[] enc = Base64.encodeBase64(buf);
             ByteArrayInputStream in = new ByteArrayInputStream(enc);
-            enc = Util.streamToBytes(in);            
+            enc = Util.streamToBytes(in);
             byte[] dec = Base64.decodeBase64(enc);
             boolean result = Arrays.equals(buf, dec);
             if (!result) {
@@ -54,17 +54,17 @@ public class TestBase64 {
             byte[] buf = new byte[i];
             random.nextBytes(buf);
 
-            ByteArrayInputStream in = new ByteArrayInputStream( buf );
-            Base64InputStream base64 = new Base64InputStream(in,true);
+            ByteArrayInputStream in = new ByteArrayInputStream(buf);
+            Base64InputStream base64 = new Base64InputStream(in, true);
             byte[] enc = Util.streamToBytes(base64);
-            in = new ByteArrayInputStream( enc );
+            in = new ByteArrayInputStream(enc);
             base64 = new Base64InputStream(in);
             byte[] dec = Util.streamToBytes(base64);
 
             boolean result = Arrays.equals(buf, dec);
             if (!result) {
                 System.out.println();
-                System.out.println("testBase64 Failed on : " + i);                      
         
+                System.out.println("testBase64 Failed on : " + i);
             }
             assertTrue(result);
         }
@@ -73,10 +73,10 @@ public class TestBase64 {
             byte[] buf = new byte[testSize];
             random.nextBytes(buf);
 
-            ByteArrayInputStream in = new ByteArrayInputStream( buf );
-            Base64InputStream base64 = new Base64InputStream(in,true);
+            ByteArrayInputStream in = new ByteArrayInputStream(buf);
+            Base64InputStream base64 = new Base64InputStream(in, true);
             byte[] enc = Util.streamToBytes(base64);
-            in = new ByteArrayInputStream( enc );
+            in = new ByteArrayInputStream(enc);
             base64 = new Base64InputStream(in);
             byte[] dec = Util.streamToBytes(base64);
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestCertificates.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestCertificates.java
b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestCertificates.java
index cc90191..6a87f42 100644
--- a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestCertificates.java
+++ b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestCertificates.java
@@ -7,11 +7,8 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import javax.security.auth.x500.X500Principal;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 
 import static org.apache.commons.ssl.JUnitConfig.TEST_HOME;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestIPAddressParser.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestIPAddressParser.java
b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestIPAddressParser.java
index 4c3cfa0..0dda394 100644
--- a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestIPAddressParser.java
+++ b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestIPAddressParser.java
@@ -1,9 +1,12 @@
 package org.apache.commons.ssl;
 
-import static org.apache.commons.ssl.util.IPAddressParser.*;
-import static org.junit.Assert.*;
 import org.junit.Test;
 
+import static org.apache.commons.ssl.util.IPAddressParser.parseIPv4Literal;
+import static org.apache.commons.ssl.util.IPAddressParser.parseIPv6Literal;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNull;
+
 public class TestIPAddressParser {
 
     @Test

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestKeyMaterial.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestKeyMaterial.java
b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestKeyMaterial.java
index 01932ec..b577f49 100644
--- a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestKeyMaterial.java
+++ b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestKeyMaterial.java
@@ -1,10 +1,9 @@
 package org.apache.commons.ssl;
 
-import static org.apache.commons.ssl.JUnitConfig.TEST_HOME;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import static org.junit.Assert.*;
 import org.junit.Test;
 
+import javax.net.ssl.SSLSocket;
 import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -16,7 +15,10 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import javax.net.ssl.SSLSocket;
+
+import static org.apache.commons.ssl.JUnitConfig.TEST_HOME;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class TestKeyMaterial {
     public static final char[] PASSWORD1 = "changeit".toCharArray();
@@ -33,18 +35,18 @@ public class TestKeyMaterial {
         String[] files = dir.list();
         Arrays.sort(files, String.CASE_INSENSITIVE_ORDER);
         for (String f : files) {
-            String F = f.toUpperCase(Locale.ENGLISH);
-            if (F.endsWith(".KS") || F.contains("PKCS12")) {
+            String file = f.toUpperCase(Locale.ENGLISH);
+            if (file.endsWith(".KS") || file.contains("PKCS12")) {
                 examineKeyStore(samplesDir, f, null);
-            } else if (F.endsWith(".PEM")) {
+            } else if (file.endsWith(".PEM")) {
                 examineKeyStore(samplesDir, f, "rsa.key");
             }
         }
     }
 
     private static void examineKeyStore(String dir, String fileName, String file2) throws
Exception {
-        String FILENAME = fileName.toUpperCase(Locale.ENGLISH);
-        boolean hasMultiPassword = FILENAME.contains(".2PASS.");
+        String filename = fileName.toUpperCase(Locale.ENGLISH);
+        boolean hasMultiPassword = filename.contains(".2PASS.");
 
         System.out.print("Testing KeyMaterial: " + dir + "/" + fileName);        
         char[] pass1 = PASSWORD1;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
index d44a260..c01a22c 100644
--- a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
+++ b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestOpenSSL.java
@@ -1,7 +1,5 @@
 package org.apache.commons.ssl;
 
-import static org.apache.commons.ssl.JUnitConfig.TEST_HOME;
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import java.io.File;
@@ -10,6 +8,10 @@ import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Random;
 
+import static org.apache.commons.ssl.JUnitConfig.TEST_HOME;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class TestOpenSSL {
 
     public void encTest(String cipher) throws Exception {
@@ -124,14 +126,17 @@ public class TestOpenSSL {
                     try {
                         byte[] result = OpenSSL.decrypt(cipher, pwd, encrypted);
                         String s = new String(result, "ISO-8859-1");
-                        assertTrue(cipherPadded + "." + filePadded + " decrypts to 'Hello
World!'", "Hello World!".equals(s));
+                        assertTrue(cipherPadded + "." + filePadded
+                            + " decrypts to 'Hello World!'", "Hello World!".equals(s));
                         return 1;
                     } catch (NoSuchAlgorithmException nsae) {
-                        System.out.println("Warn: " + cipherPadded + filePadded + " NoSuchAlgorithmException");
+                        System.out.println("Warn: " + cipherPadded + filePadded
+                            + " NoSuchAlgorithmException");
                         return 0;
                     } catch (ArithmeticException ae) {
                         if (cipherPadded.contains("cfb1")) {
-                            System.out.println("Warn: " + cipherPadded + filePadded + " BouncyCastle
can't handle cfb1 " + ae);
+                            System.out.println("Warn: " + cipherPadded + filePadded
+                                + " BouncyCastle can't handle cfb1 " + ae);
                             return 0;
                         } else {
                             throw ae;

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/351eb01f/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestPKCS8Key.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestPKCS8Key.java
b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestPKCS8Key.java
index 91d6c17..42820cf 100644
--- a/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestPKCS8Key.java
+++ b/3rdparty/not-yet-commons-ssl/src/test/java/org/apache/commons/ssl/TestPKCS8Key.java
@@ -1,7 +1,5 @@
 package org.apache.commons.ssl;
 
-import static org.apache.commons.ssl.JUnitConfig.TEST_HOME;
-import static org.junit.Assert.*;
 import org.junit.Test;
 
 import java.io.File;
@@ -9,6 +7,10 @@ import java.io.FileInputStream;
 import java.util.Arrays;
 import java.util.Locale;
 
+import static org.apache.commons.ssl.JUnitConfig.TEST_HOME;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class TestPKCS8Key {
 
     @Test
@@ -32,8 +34,8 @@ public class TestPKCS8Key {
         byte[] original = null;
         for (File f : files) {
             String filename = f.getName();
-            String FILENAME = filename.toUpperCase(Locale.ENGLISH);
-            if (!FILENAME.endsWith(".PEM") && !FILENAME.endsWith(".DER")) {
+            String fileName = filename.toUpperCase(Locale.ENGLISH);
+            if (!fileName.endsWith(".PEM") && !fileName.endsWith(".DER")) {
                 // not a sample file
                 continue;
             }


Mime
View raw message