[refactor] rename + cleanup X509Object implementers

Author: kares

src/main/java/org/jruby/ext/openssl/SSLContext.java

@@ -86,7 +86,6 @@
 import static org.jruby.ext.openssl.OpenSSL.debug;
 import static org.jruby.ext.openssl.OpenSSL.debugStackTrace;
 import static org.jruby.ext.openssl.OpenSSL.warn;
-import static org.jruby.ext.openssl.Utils.hasNonNilInstanceVariable;
 
 /**
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
@@ -974,7 +973,7 @@ else if ( internalContext.cert != null ) {
                         if (storeCtx.getBySubject(X509Utils.X509_LU_X509, name, s_obj) <= 0) {
                             break;
                         }
-                        x = ((Certificate) s_obj[0]).x509;
+                        x = ((Certificate) s_obj[0]).cert;
                     }
                     catch (RuntimeException e) {
                         debugStackTrace(e);

src/main/java/org/jruby/ext/openssl/x509store/CRL.java

@@ -36,12 +36,9 @@
  */
 public class CRL extends X509Object {
 
-    public /* final */ java.security.cert.CRL crl;
+    public final java.security.cert.CRL crl;
 
-    @Deprecated // not-used
-    public CRL() { /* */ }
-
-    public CRL(X509CRL crl) {
+    public CRL(java.security.cert.CRL crl) {
         this.crl = crl;
     }
 

src/main/java/org/jruby/ext/openssl/x509store/Certificate.java

@@ -34,10 +34,10 @@
  */
 public class Certificate extends X509Object {
 
-    public final X509AuxCertificate x509;
+    public final X509AuxCertificate cert;
 
     public Certificate(final X509AuxCertificate cert) {
-        this.x509 = cert;
+        this.cert = cert;
     }
 
     @Override
@@ -47,15 +47,15 @@ public int type() {
 
     @Override
     public boolean isName(final Name name) {
-        return name.equalToCertificateSubject(x509);
+        return name.equalToCertificateSubject(cert);
     }
 
     @Override
     public boolean matches(final X509Object other) {
         if (other instanceof Certificate) {
             final Certificate that = (Certificate) other;
-            if (X509AuxCertificate.equalSubjects(this.x509, that.x509)) {
-                return this.x509.hashCode() == that.x509.hashCode();
+            if (X509AuxCertificate.equalSubjects(this.cert, that.cert)) {
+                return this.cert.hashCode() == that.cert.hashCode();
             };
         }
         return false;
@@ -65,7 +65,7 @@ public boolean matches(final X509Object other) {
     public int compareTo(final X509Object other) {
         int cmp = super.compareTo(other);
         if (cmp != 0) return cmp;
-        return x509.equals( ( (Certificate) other ).x509 ) ? 0 : -1;
+        return cert.equals( ((Certificate) other).cert ) ? 0 : -1;
     }
 
 }// X509_OBJECT_CERT

src/main/java/org/jruby/ext/openssl/x509store/PKey.java

@@ -36,10 +36,7 @@
  */
 public class PKey extends X509Object {
 
-    public /* final */ java.security.PrivateKey pkey;
-
-    @Deprecated // not-used
-    public PKey() { /* no-op */  }
+    public final java.security.PrivateKey pkey;
 
     public PKey(PrivateKey pkey) {
         this.pkey = pkey;
@@ -48,4 +45,19 @@ public PKey(PrivateKey pkey) {
     public int type() {
         return X509Utils.X509_LU_PKEY;
     }
+
+    @Override
+    public boolean isName(final Name nm) {
+        return false;
+    }
+
+    @Override
+    public boolean matches(final X509Object other) {
+        if (other instanceof PKey) {
+            final PKey that = (PKey) other;
+            return this.pkey.equals( that.pkey );
+        }
+        return false;
+    }
+
 }// X509_OBJECT_PKEY

src/main/java/org/jruby/ext/openssl/x509store/Store.java

@@ -304,7 +304,7 @@ public int addCertificate(final X509Certificate cert) {
     public int addCRL(final java.security.cert.CRL crl) {
         if ( crl == null ) return 0;
 
-        final CRL crlObj = new CRL(); crlObj.crl = crl;
+        final CRL crlObj = new CRL(crl);
 
         final X509Object[] objects = this.objects;
         if ( matchedObject(objects, crlObj) ) {
@@ -334,14 +334,14 @@ private synchronized int addObject(final X509Object xObject, final int prevLengt
 
         int idx = length;
         if (xObject instanceof Certificate) {
-            final X500Principal p1 = ((Certificate) xObject).x509.getIssuerX500Principal();
+            final X500Principal p1 = ((Certificate) xObject).cert.getIssuerX500Principal();
             final Name n1 = new Name(p1);
 
             for (idx = 0; idx < objects.length; idx++) {
                 X509Object xMember  = objects[idx];
                 if (xMember instanceof Certificate) {
-                    X500Principal p2 = ((Certificate) xMember).x509.getIssuerX500Principal();
-                    if(n1.equalTo(p2)) break;
+                    X500Principal p2 = ((Certificate) xMember).cert.getIssuerX500Principal();
+                    if (n1.equalTo(p2)) break;
                 }
             }
         }
@@ -438,7 +438,7 @@ public X509Certificate[] getAcceptedIssuers() {
         for ( int i = 0; i< objects.length; i++ ) {
             final X509Object object = objects[i];
             if ( object instanceof Certificate ) {
-                issuers.add( ( (Certificate) object ).x509 );
+                issuers.add(( (Certificate) object ).cert);
             }
         }
         return issuers.toArray( new X509Certificate[ issuers.size() ] );

src/main/java/org/jruby/ext/openssl/x509store/StoreContext.java

@@ -150,8 +150,8 @@ else if ( ok != X509Utils.X509_LU_FAIL ) {
         }
 
         X509Object obj = s_obj[0];
-        if ( checkIssued.call(this, x, ((Certificate) obj).x509) != 0 ) {
-            issuers[0] = ((Certificate) obj).x509;
+        if ( checkIssued.call(this, x, ((Certificate) obj).cert) != 0 ) {
+            issuers[0] = ((Certificate) obj).cert;
             return 1;
         }
 
@@ -165,7 +165,7 @@ else if ( ok != X509Utils.X509_LU_FAIL ) {
             if ( pobj.type() != X509Utils.X509_LU_X509 ) {
                 return 0;
             }
-            final X509AuxCertificate x509 = ((Certificate) pobj).x509;
+            final X509AuxCertificate x509 = ((Certificate) pobj).cert;
             if ( ! xn.equalTo( x509.getSubjectX500Principal() ) ) {
                 return 0;
             }

src/main/java/org/jruby/ext/openssl/x509store/X509Object.java

@@ -68,15 +68,11 @@ public static X509Object retrieveMatch(final Collection<? extends X509Object> li
         return null;
     }
 
-    public boolean isName(Name nm) {
-        return false;
-    }
+    public abstract boolean isName(Name nm) ;
 
-    public boolean matches(X509Object o) {
-        return false;
-    }
+    public abstract boolean matches(X509Object o) ;
 
-    public abstract int type();
+    public abstract int type() ;
 
     public int compareTo(X509Object other) {
         return type() - other.type();