prepare to unify (internal) X509Object descendants

kares · kares · commit d78fb681ea5c · 2016-03-30T19:46:33.000+02:00
diff --git a/src/main/java/org/jruby/ext/openssl/x509store/CRL.java b/src/main/java/org/jruby/ext/openssl/x509store/CRL.java
@@ -36,7 +36,14 @@
  */
 public class CRL extends X509Object {
 
-    public java.security.cert.CRL crl;
+    public /* final */ java.security.cert.CRL crl;
+
+    @Deprecated // not-used
+    public CRL() { /* */ }
+
+    public CRL(X509CRL crl) {
+        this.crl = crl;
+    }
 
     @Override
     public int type() {
@@ -45,22 +52,24 @@ public int type() {
 
     @Override
     public boolean isName(final Name name) {
-        return name.equalTo( ((X509CRL) this.crl).getIssuerX500Principal() );
+        return name.equalTo( ((X509CRL) crl).getIssuerX500Principal() );
     }
 
     @Override
     public boolean matches(final X509Object other) {
-        return other instanceof CRL &&
-        ((X509CRL) crl).getIssuerX500Principal().equals( ((X509CRL)((CRL) other).crl).getIssuerX500Principal() );
+        if (other instanceof CRL) {
+            final X509CRL thisCRL = (X509CRL) crl;
+            final X509CRL thatCRL = (X509CRL)((CRL) other).crl;
+            return thisCRL.getIssuerX500Principal().equals( thatCRL.getIssuerX500Principal() );
+        }
+        return false;
     }
 
     @Override
-    public int compareTo(X509Object oth) {
-        int ret = super.compareTo(oth);
-        if (ret == 0) {
-            ret = crl.equals( ((CRL) oth).crl ) ? 0 : -1;
-        }
-        return ret;
+    public int compareTo(final X509Object other) {
+        int cmp = super.compareTo(other);
+        if (cmp != 0) return cmp;
+        return crl.equals( ((CRL) other).crl ) ? 0 : -1;
     }
 
 }// X509_OBJECT_CRL
diff --git a/src/main/java/org/jruby/ext/openssl/x509store/Certificate.java b/src/main/java/org/jruby/ext/openssl/x509store/Certificate.java
@@ -52,17 +52,18 @@ public boolean isName(final Name name) {
 
     @Override
     public boolean matches(final X509Object other) {
-        return other instanceof Certificate &&
-            x509.getSubjectX500Principal().equals( ((Certificate) other).x509.getSubjectX500Principal() );
+        if (other instanceof Certificate) {
+            final Certificate that = (Certificate) other;
+            return this.x509.getSubjectX500Principal().equals( that.x509.getSubjectX500Principal() );
+        }
+        return false;
     }
 
     @Override
     public int compareTo(final X509Object other) {
-        int ret = super.compareTo(other);
-        if (ret == 0) {
-            ret = x509.equals( ( (Certificate) other ).x509 ) ? 0 : -1;
-        }
-        return ret;
+        int cmp = super.compareTo(other);
+        if (cmp != 0) return cmp;
+        return x509.equals( ( (Certificate) other ).x509 ) ? 0 : -1;
     }
 
 }// X509_OBJECT_CERT
diff --git a/src/main/java/org/jruby/ext/openssl/x509store/PKey.java b/src/main/java/org/jruby/ext/openssl/x509store/PKey.java
@@ -12,7 +12,7 @@
  * rights and limitations under the License.
  *
  * Copyright (C) 2006 Ola Bini <ola@ologix.com>
- * 
+ *
  * Alternatively, the contents of this file may be used under the terms of
  * either of the GNU General Public License Version 2 or later (the "GPL"),
  * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
@@ -27,13 +27,23 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.ext.openssl.x509store;
 
+import java.security.PrivateKey;
+
 /**
  * c: X509_OBJECT
  *
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
  */
 public class PKey extends X509Object {
-    public java.security.PrivateKey pkey;
+
+    public /* final */ java.security.PrivateKey pkey;
+
+    @Deprecated // not-used
+    public PKey() { /* no-op */  }
+
+    public PKey(PrivateKey pkey) {
+        this.pkey = pkey;
+    }
 
     public int type() {
         return X509Utils.X509_LU_PKEY;
