directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject directory-kerby git commit: Fix checkstyle issue: RedundantModifier: Redundant 'public', 'static', 'final' modifiers.
Date Wed, 19 Aug 2015 03:18:16 GMT
Repository: directory-kerby
Updated Branches:
  refs/heads/pkinit-support 893efe94e -> 5f3b3bc1c


Fix checkstyle issue: RedundantModifier: Redundant 'public', 'static', 'final' modifiers.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/5f3b3bc1
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/5f3b3bc1
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/5f3b3bc1

Branch: refs/heads/pkinit-support
Commit: 5f3b3bc1cab6380973da229f63c5ce5c0334df47
Parents: 893efe9
Author: plusplusjiajia <jiajia.li@intel.com>
Authored: Wed Aug 19 11:23:47 2015 +0800
Committer: plusplusjiajia <jiajia.li@intel.com>
Committed: Wed Aug 19 11:23:47 2015 +0800

----------------------------------------------------------------------
 .../apache/commons/ssl/HostnameVerifier.java    | 10 +++---
 .../java/org/apache/commons/ssl/Java14.java     | 38 ++++++++++----------
 .../apache/commons/ssl/SSLWrapperFactory.java   |  8 ++---
 3 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5f3b3bc1/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
index 11c1b22..3ec2dde 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/HostnameVerifier.java
@@ -111,7 +111,7 @@ public interface HostnameVerifier extends javax.net.ssl.HostnameVerifier
{
      * as "*.foo.com") with DEFAULT matches all subdomains, including
      * "a.b.foo.com".
      */
-    public static final HostnameVerifier DEFAULT =
+    HostnameVerifier DEFAULT =
         new AbstractVerifier() {
             public final void check(final String[] hosts, final String[] cns,
                                     final String[] subjectAlts)
@@ -131,7 +131,7 @@ public interface HostnameVerifier extends javax.net.ssl.HostnameVerifier
{
      * "localhost.localdomain", "127.0.0.1", "::1" will always pass, no matter
      * what is in the server's certificate.
      */
-    public static final HostnameVerifier DEFAULT_AND_LOCALHOST =
+    HostnameVerifier DEFAULT_AND_LOCALHOST =
         new AbstractVerifier() {
             public final void check(final String[] hosts, final String[] cns,
                                     final String[] subjectAlts)
@@ -163,7 +163,7 @@ public interface HostnameVerifier extends javax.net.ssl.HostnameVerifier
{
      * level, for example "a.foo.com".  It does not match deeper subdomains
      * such as "a.b.foo.com".
      */
-    public static final HostnameVerifier STRICT =
+    HostnameVerifier STRICT =
         new AbstractVerifier() {
             public final void check(final String[] host, final String[] cns,
                                     final String[] subjectAlts)
@@ -182,7 +182,7 @@ public interface HostnameVerifier extends javax.net.ssl.HostnameVerifier
{
      * server's certificate, not just the first one.  This behaviour is
      * identical to IE6's behaviour.
      */
-    public static final HostnameVerifier STRICT_IE6 =
+    HostnameVerifier STRICT_IE6 =
         new AbstractVerifier() {
             public final void check(final String[] host, final String[] cns,
                                     final String[] subjectAlts)
@@ -199,7 +199,7 @@ public interface HostnameVerifier extends javax.net.ssl.HostnameVerifier
{
      * The ALLOW_ALL HostnameVerifier essentially turns hostname verification
      * off.  This implementation is a no-op, and never throws the SSLException.
      */
-    public static final HostnameVerifier ALLOW_ALL =
+    HostnameVerifier ALLOW_ALL =
         new AbstractVerifier() {
             public final void check(final String[] host, final String[] cns,
                                     final String[] subjectAlts) {

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5f3b3bc1/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Java14.java
----------------------------------------------------------------------
diff --git a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Java14.java
b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Java14.java
index 36f5b3f..d8618ab 100644
--- a/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Java14.java
+++ b/3rdparty/not-yet-commons-ssl/src/main/java/org/apache/commons/ssl/Java14.java
@@ -81,24 +81,24 @@ public final class Java14 extends JavaImpl {
         return instance;
     }
 
-    public final String getVersion() {
+    public String getVersion() {
         return "Java14";
     }
 
-    protected final String retrieveSubjectX500(X509Certificate cert) {
+    protected String retrieveSubjectX500(X509Certificate cert) {
         return cert.getSubjectX500Principal().toString();
     }
 
-    protected final String retrieveIssuerX500(X509Certificate cert) {
+    protected String retrieveIssuerX500(X509Certificate cert) {
         return cert.getIssuerX500Principal().toString();
     }
 
-    protected final Certificate[] retrievePeerCerts(SSLSession sslSession)
+    protected Certificate[] retrievePeerCerts(SSLSession sslSession)
         throws SSLPeerUnverifiedException {
         return sslSession.getPeerCertificates();
     }
 
-    protected final Object buildKeyManagerFactory(KeyStore ks, char[] password)
+    protected Object buildKeyManagerFactory(KeyStore ks, char[] password)
         throws NoSuchAlgorithmException, KeyStoreException,
         UnrecoverableKeyException {
         String alg = KeyManagerFactory.getDefaultAlgorithm();
@@ -107,7 +107,7 @@ public final class Java14 extends JavaImpl {
         return kmf;
     }
 
-    protected final Object buildTrustManagerFactory(KeyStore ks)
+    protected Object buildTrustManagerFactory(KeyStore ks)
         throws NoSuchAlgorithmException, KeyStoreException {
         String alg = TrustManagerFactory.getDefaultAlgorithm();
         TrustManagerFactory tmf = TrustManagerFactory.getInstance(alg);
@@ -115,36 +115,36 @@ public final class Java14 extends JavaImpl {
         return tmf;
     }
 
-    protected final Object[] retrieveKeyManagers(Object keyManagerFactory) {
+    protected Object[] retrieveKeyManagers(Object keyManagerFactory) {
         KeyManagerFactory kmf = (KeyManagerFactory) keyManagerFactory;
         return kmf.getKeyManagers();
     }
 
-    protected final Object[] retrieveTrustManagers(Object trustManagerFactory) {
+    protected Object[] retrieveTrustManagers(Object trustManagerFactory) {
         TrustManagerFactory tmf = (TrustManagerFactory) trustManagerFactory;
         return tmf.getTrustManagers();
     }
 
-    protected final SSLSocketFactory buildSSLSocketFactory(Object ssl) {
+    protected SSLSocketFactory buildSSLSocketFactory(Object ssl) {
         return ((SSLContext) ssl).getSocketFactory();
     }
 
-    protected final SSLServerSocketFactory buildSSLServerSocketFactory(Object ssl) {
+    protected SSLServerSocketFactory buildSSLServerSocketFactory(Object ssl) {
         return ((SSLContext) ssl).getServerSocketFactory();
     }
 
-    protected final RuntimeException buildRuntimeException(Exception cause) {
+    protected RuntimeException buildRuntimeException(Exception cause) {
         return new RuntimeException(cause);
     }
 
-    protected final SSLSocket buildSocket(SSL ssl) throws IOException {
+    protected SSLSocket buildSocket(SSL ssl) throws IOException {
         SSLSocketFactory sf = ssl.getSSLSocketFactory();
         SSLSocket s = (SSLSocket) sf.createSocket();
         ssl.doPreConnectSocketStuff(s);
         return s;
     }
 
-    protected final SSLSocket buildSocket(SSL ssl, String remoteHost,
+    protected SSLSocket buildSocket(SSL ssl, String remoteHost,
                                           int remotePort, InetAddress localHost,
                                           int localPort, int timeout)
         throws IOException {
@@ -156,7 +156,7 @@ public final class Java14 extends JavaImpl {
     }
 
 
-    protected final Socket buildPlainSocket(
+    protected Socket buildPlainSocket(
             SSL ssl, String remoteHost, int remotePort, InetAddress localHost, int localPort,
int timeout
     ) throws IOException {
         Socket s = SocketFactory.getDefault().createSocket();
@@ -168,7 +168,7 @@ public final class Java14 extends JavaImpl {
         return s;
     }
 
-    protected final Socket connectSocket(Socket s, SocketFactory sf,
+    protected Socket connectSocket(Socket s, SocketFactory sf,
                                          String host, int remotePort,
                                          InetAddress localHost, int localPort,
                                          int timeout, SSL ssl)
@@ -189,7 +189,7 @@ public final class Java14 extends JavaImpl {
         return s;
     }
 
-    protected final SSLServerSocket buildServerSocket(SSL ssl)
+    protected SSLServerSocket buildServerSocket(SSL ssl)
         throws IOException {
         ServerSocket s = ssl.getSSLServerSocketFactory().createServerSocket();
         SSLServerSocket ss = (SSLServerSocket) s;
@@ -197,7 +197,7 @@ public final class Java14 extends JavaImpl {
         return ss;
     }
 
-    protected final void wantClientAuth(Object o, boolean wantClientAuth) {
+    protected void wantClientAuth(Object o, boolean wantClientAuth) {
         SSLSocket s;
         SSLServerSocket ss;
         if (o instanceof SSLSocket) {
@@ -211,7 +211,7 @@ public final class Java14 extends JavaImpl {
         }
     }
 
-    protected final void enabledProtocols(Object o, String[] enabledProtocols) {
+    protected void enabledProtocols(Object o, String[] enabledProtocols) {
         SSLSocket s;
         SSLServerSocket ss;
         if (o instanceof SSLSocket) {
@@ -232,7 +232,7 @@ public final class Java14 extends JavaImpl {
         tm.checkServerTrusted(chain, authType);
     }
 
-    protected final Object initSSL(SSL ssl, TrustChain tc, KeyMaterial k)
+    protected Object initSSL(SSL ssl, TrustChain tc, KeyMaterial k)
         throws NoSuchAlgorithmException, KeyStoreException,
         CertificateException, KeyManagementException, IOException {
         SSLContext context = SSLContext.getInstance(ssl.getDefaultProtocol());

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/5f3b3bc1/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 c4ff824..d6e68f7 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
@@ -50,7 +50,7 @@ public interface SSLWrapperFactory {
      * @return The new wrapped SSLSocket.
      * @throws java.io.IOException if wrapping failed
      */
-    public Socket wrap(Socket s) throws IOException;
+    Socket wrap(Socket s) throws IOException;
 
     /**
      * Wraps an SSLServerSocket.
@@ -62,7 +62,7 @@ public interface SSLWrapperFactory {
      * @return The new wrapped SSLServerSocket.
      * @throws java.io.IOException if wrapping failed
      */
-    public SSLServerSocket wrap(SSLServerSocket s, SSL ssl)
+    SSLServerSocket wrap(SSLServerSocket s, SSL ssl)
         throws IOException;
 
 
@@ -73,7 +73,7 @@ public interface SSLWrapperFactory {
      * setEnabledCiphers, setUseClientMode, and the hostname verifier (which
      * should be very rare on SSLServerSockets!).
      */
-    public static final SSLWrapperFactory NO_WRAP = new SSLWrapperFactory() {
+    SSLWrapperFactory NO_WRAP = new SSLWrapperFactory() {
         // Notice!  No wrapping!
         public Socket wrap(Socket s) {
             return s;
@@ -92,7 +92,7 @@ public interface SSLWrapperFactory {
      * anything.  It doesn't actually do anything interesting in its wrapped
      * implementations.
      */
-    public static final SSLWrapperFactory DUMB_WRAP = new SSLWrapperFactory() {
+    SSLWrapperFactory DUMB_WRAP = new SSLWrapperFactory() {
         public Socket wrap(Socket s) {
             return new SSLSocketWrapper(s);
         }


Mime
View raw message