[refactort] remove allocator classes

kares · kares · commit 8702c89b5df3 · 2022-05-13T10:29:45.000+02:00
diff --git a/src/main/java/org/jruby/ext/openssl/BN.java b/src/main/java/org/jruby/ext/openssl/BN.java
@@ -46,7 +46,6 @@
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.Arity;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
@@ -77,10 +76,6 @@ public class BN extends RubyObject {
 
     private static final int DEFAULT_CERTAINTY = 100;
 
-    private static final ObjectAllocator BN_ALLOCATOR = new ObjectAllocator() {
-        public BN allocate(Ruby runtime, RubyClass klass) { return new BN(runtime, klass); }
-    };
-
     public static BN newBN(Ruby runtime, BigInteger value) {
         return newInstance(runtime, value);
     }
@@ -92,7 +87,7 @@ static BN newInstance(final Ruby runtime, BigInteger value) {
     static void createBN(final Ruby runtime, final RubyModule OpenSSL, final RubyClass OpenSSLError) {
         OpenSSL.defineClassUnder("BNError", OpenSSLError, OpenSSLError.getAllocator());
 
-        RubyClass BN = OpenSSL.defineClassUnder("BN", runtime.getObject(), BN_ALLOCATOR);
+        RubyClass BN = OpenSSL.defineClassUnder("BN", runtime.getObject(), (r, klass) -> new BN(r, klass));
         BN.includeModule( runtime.getModule("Comparable") );
         BN.defineAnnotatedMethods(BN.class);
     }
diff --git a/src/main/java/org/jruby/ext/openssl/Cipher.java b/src/main/java/org/jruby/ext/openssl/Cipher.java
@@ -42,7 +42,6 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.GCMParameterSpec;
 import javax.crypto.spec.IvParameterSpec;
@@ -78,12 +77,8 @@
 public class Cipher extends RubyObject {
     private static final long serialVersionUID = -5390983669951165103L;
 
-    private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
-        public Cipher allocate(Ruby runtime, RubyClass klass) { return new Cipher(runtime, klass); }
-    };
-
     static void createCipher(final Ruby runtime, final RubyModule OpenSSL, final RubyClass OpenSSLError) {
-        final RubyClass Cipher = OpenSSL.defineClassUnder("Cipher", runtime.getObject(), ALLOCATOR);
+        final RubyClass Cipher = OpenSSL.defineClassUnder("Cipher", runtime.getObject(), (r, klass) -> new Cipher(r, klass));
         Cipher.defineClassUnder("CipherError", OpenSSLError, OpenSSLError.getAllocator());
         Cipher.defineAnnotatedMethods(Cipher.class);
 
diff --git a/src/main/java/org/jruby/ext/openssl/Digest.java b/src/main/java/org/jruby/ext/openssl/Digest.java
@@ -52,16 +52,12 @@
 public class Digest extends RubyObject {
     private static final long serialVersionUID = 7409857414064319518L;
 
-    private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
-        public Digest allocate(Ruby runtime, RubyClass klass) { return new Digest(runtime, klass); }
-    };
-
     static void createDigest(Ruby runtime, final RubyModule OpenSSL, final RubyClass OpenSSLError) {
         runtime.getLoadService().require("digest");
 
         final RubyModule coreDigest = runtime.getModule("Digest");
         final RubyClass DigestClass = coreDigest.getClass("Class"); // ::Digest::Class
-        RubyClass Digest = OpenSSL.defineClassUnder("Digest", DigestClass, ALLOCATOR);
+        RubyClass Digest = OpenSSL.defineClassUnder("Digest", DigestClass, (r, klass) -> new Digest(r, klass));
         OpenSSL.defineClassUnder("DigestError", OpenSSLError, OpenSSLError.getAllocator());
         Digest.defineAnnotatedMethods(Digest.class);
 
diff --git a/src/main/java/org/jruby/ext/openssl/HMAC.java b/src/main/java/org/jruby/ext/openssl/HMAC.java
@@ -37,7 +37,6 @@
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 import org.jruby.runtime.Visibility;
@@ -50,12 +49,8 @@
 public class HMAC extends RubyObject {
     private static final long serialVersionUID = 7602535792884680307L;
 
-    private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
-        public HMAC allocate(Ruby runtime, RubyClass klass) { return new HMAC(runtime, klass); }
-    };
-
     static void createHMAC(final Ruby runtime, final RubyModule OpenSSL, final RubyClass OpenSSLError) {
-        RubyClass HMAC = OpenSSL.defineClassUnder("HMAC", runtime.getObject(), ALLOCATOR);
+        RubyClass HMAC = OpenSSL.defineClassUnder("HMAC", runtime.getObject(), (r, klass) -> new HMAC(r, klass));
         OpenSSL.defineClassUnder("HMACError", OpenSSLError, OpenSSLError.getAllocator());
         HMAC.defineAnnotatedMethods(HMAC.class);
     }
diff --git a/src/main/java/org/jruby/ext/openssl/NetscapeSPKI.java b/src/main/java/org/jruby/ext/openssl/NetscapeSPKI.java
@@ -49,7 +49,6 @@
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.ext.openssl.impl.Base64;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
@@ -68,15 +67,9 @@
 public class NetscapeSPKI extends RubyObject {
     private static final long serialVersionUID = 3211242351810109432L;
 
-    private static ObjectAllocator NETSCAPESPKI_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new NetscapeSPKI(runtime, klass);
-        }
-    };
-
     static void createNetscapeSPKI(Ruby runtime, final RubyModule OpenSSL, final RubyClass OpenSSLError) {
         RubyModule Netscape = OpenSSL.defineModuleUnder("Netscape");
-        RubyClass SPKI = Netscape.defineClassUnder("SPKI",runtime.getObject(),NETSCAPESPKI_ALLOCATOR);
+        RubyClass SPKI = Netscape.defineClassUnder("SPKI", runtime.getObject(), (r, klass) -> new NetscapeSPKI(r, klass));
         Netscape.defineClassUnder("SPKIError", OpenSSLError, OpenSSLError.getAllocator());
         SPKI.defineAnnotatedMethods(NetscapeSPKI.class);
     }
diff --git a/src/main/java/org/jruby/ext/openssl/OCSPBasicResponse.java b/src/main/java/org/jruby/ext/openssl/OCSPBasicResponse.java
@@ -88,7 +88,6 @@
 import org.jruby.ext.openssl.x509store.X509AuxCertificate;
 import org.jruby.ext.openssl.x509store.X509Utils;
 import org.jruby.runtime.Arity;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -117,14 +116,8 @@ public class OCSPBasicResponse extends RubyObject {
     private static final String OCSP_RESPID_KEY = "RESPID_KEY";
     private static final String OCSP_TRUSTOTHER = "TRUSTOTHER";
     
-    private static ObjectAllocator BASICRESPONSE_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new OCSPBasicResponse(runtime, klass);
-        }
-    };
-    
     public static void createBasicResponse(final Ruby runtime, final RubyModule OCSP) {
-        RubyClass BasicResponse = OCSP.defineClassUnder("BasicResponse", runtime.getObject(), BASICRESPONSE_ALLOCATOR);
+        RubyClass BasicResponse = OCSP.defineClassUnder("BasicResponse", runtime.getObject(), (r, klass) -> new OCSPBasicResponse(r, klass));
         BasicResponse.defineAnnotatedMethods(OCSPBasicResponse.class);
     }
     
diff --git a/src/main/java/org/jruby/ext/openssl/OCSPCertificateId.java b/src/main/java/org/jruby/ext/openssl/OCSPCertificateId.java
@@ -52,8 +52,6 @@
 import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.ext.openssl.impl.ASN1Registry;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -70,14 +68,8 @@
 public class OCSPCertificateId extends RubyObject {
     private static final long serialVersionUID = 6324454052172773918L;
 
-    private static ObjectAllocator CERTIFICATEID_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new OCSPCertificateId(runtime, klass);
-        }
-    };
-        
     public static void createCertificateId(final Ruby runtime, final RubyModule _OCSP) {
-        RubyClass _certificateId = _OCSP.defineClassUnder("CertificateId", runtime.getObject(), CERTIFICATEID_ALLOCATOR);
+        RubyClass _certificateId = _OCSP.defineClassUnder("CertificateId", runtime.getObject(), (r, klass) -> new OCSPCertificateId(r, klass));
         _certificateId.defineAnnotatedMethods(OCSPCertificateId.class);
     }
     
diff --git a/src/main/java/org/jruby/ext/openssl/OCSPRequest.java b/src/main/java/org/jruby/ext/openssl/OCSPRequest.java
@@ -82,7 +82,6 @@
 import org.jruby.anno.JRubyMethod;
 import org.jruby.ext.openssl.x509store.X509AuxCertificate;
 import org.jruby.runtime.Arity;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -98,19 +97,13 @@
  */
 public class OCSPRequest extends RubyObject {
     private static final long serialVersionUID = -4020616730425816999L;
-
-    private static ObjectAllocator REQUEST_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new OCSPRequest(runtime, klass);
-        }
-    };
     
     public OCSPRequest(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
     }
     
     public static void createRequest(final Ruby runtime, final RubyModule _OCSP) {
-        RubyClass _request = _OCSP.defineClassUnder("Request", runtime.getObject(), REQUEST_ALLOCATOR);
+        RubyClass _request = _OCSP.defineClassUnder("Request", runtime.getObject(), (r, klass) -> new OCSPRequest(r, klass));
         _request.defineAnnotatedMethods(OCSPRequest.class);
     }
     
diff --git a/src/main/java/org/jruby/ext/openssl/OCSPResponse.java b/src/main/java/org/jruby/ext/openssl/OCSPResponse.java
@@ -47,7 +47,6 @@
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.Arity;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -62,12 +61,6 @@
  */
 public class OCSPResponse extends RubyObject {
     private static final long serialVersionUID = 5763247988029815198L;
-
-    private static ObjectAllocator RESPONSE_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new OCSPResponse(runtime, klass);
-        }
-    };
     
     public OCSPResponse(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
@@ -78,7 +71,7 @@ public OCSPResponse(Ruby runtime) {
     }
     
     public static void createResponse(final Ruby runtime, final RubyModule OCSP) {
-        RubyClass Response = OCSP.defineClassUnder("Response", runtime.getObject(), RESPONSE_ALLOCATOR);
+        RubyClass Response = OCSP.defineClassUnder("Response", runtime.getObject(), (r, klass) -> new OCSPResponse(r, klass));
         Response.defineAnnotatedMethods(OCSPResponse.class);
     }
     
diff --git a/src/main/java/org/jruby/ext/openssl/OCSPSingleResponse.java b/src/main/java/org/jruby/ext/openssl/OCSPSingleResponse.java
@@ -56,7 +56,6 @@
 import org.jruby.RubyTime;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.Arity;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -71,15 +70,9 @@
  */
 public class OCSPSingleResponse extends RubyObject {
     private static final long serialVersionUID = 7947277768033100227L;
-
-    private static ObjectAllocator SINGLERESPONSE_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new OCSPSingleResponse(runtime, klass);
-        }
-    };
         
     public static void createSingleResponse(final Ruby runtime, final RubyModule _OCSP) {
-        RubyClass _request = _OCSP.defineClassUnder("SingleResponse", runtime.getObject(), SINGLERESPONSE_ALLOCATOR);
+        RubyClass _request = _OCSP.defineClassUnder("SingleResponse", runtime.getObject(), (r, klass) -> new OCSPSingleResponse(r, klass));
         _request.defineAnnotatedMethods(OCSPSingleResponse.class);
     }
 
diff --git a/src/main/java/org/jruby/ext/openssl/SSLSession.java b/src/main/java/org/jruby/ext/openssl/SSLSession.java
@@ -35,7 +35,6 @@
 import org.jruby.RubyString;
 import org.jruby.RubyTime;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -51,14 +50,8 @@
  */
 public class SSLSession extends RubyObject {
 
-    private static final ObjectAllocator SESSION_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new SSLSession(runtime, klass);
-        }
-    };
-
     static void createSession(final Ruby runtime, final RubyModule SSL, final RubyClass OpenSSLError) { // OpenSSL::SSL
-        RubyClass Session = SSL.defineClassUnder("Session", runtime.getObject(), SESSION_ALLOCATOR);
+        RubyClass Session = SSL.defineClassUnder("Session", runtime.getObject(), (r, klass) -> new SSLSession(r, klass));
         // OpenSSL::SSL::Session::SessionError
         Session.defineClassUnder("SessionError", OpenSSLError, OpenSSLError.getAllocator());
         Session.defineAnnotatedMethods(SSLSession.class);
diff --git a/src/main/java/org/jruby/ext/openssl/SSLSocket.java b/src/main/java/org/jruby/ext/openssl/SSLSocket.java
@@ -33,12 +33,9 @@
 import java.nio.channels.Channel;
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.NotYetConnectedException;
-import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 
@@ -69,12 +66,6 @@ public class SSLSocket extends RubyObject {
 
     private static final long serialVersionUID = -2084816623554406237L;
 
-    private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new SSLSocket(runtime, klass);
-        }
-    };
-
     private enum CallSiteIndex {
 
         // self
@@ -110,7 +101,8 @@ public static void createSSLSocket(final Ruby runtime, final RubyModule SSL) { /
             }
         }
 
-        RubyClass SSLSocket = runtime.defineClassUnder("SSLSocket", runtime.getObject(), ALLOCATOR, SSL, extraCallSites);
+        RubyClass SSLSocket = runtime.defineClassUnder("SSLSocket", runtime.getObject(),
+                (r, klass) -> new SSLSocket(r, klass), SSL, extraCallSites);
 
         final ThreadContext context = runtime.getCurrentContext();
 
diff --git a/src/main/java/org/jruby/ext/openssl/X509Attribute.java b/src/main/java/org/jruby/ext/openssl/X509Attribute.java
@@ -44,7 +44,6 @@
 import org.jruby.RubyObject;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.Arity;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.Visibility;
@@ -59,14 +58,8 @@
 public class X509Attribute extends RubyObject {
     private static final long serialVersionUID = 5569940260019783275L;
 
-    private static ObjectAllocator ATTRIBUTE_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new X509Attribute(runtime, klass);
-        }
-    };
-
     static void createAttribute(Ruby runtime, final RubyModule X509, final RubyClass OpenSSLError) {
-        RubyClass Attribute = X509.defineClassUnder("Attribute", runtime.getObject(), ATTRIBUTE_ALLOCATOR);
+        RubyClass Attribute = X509.defineClassUnder("Attribute", runtime.getObject(), (r, klass) -> new X509Attribute(r, klass));
 
         X509.defineClassUnder("AttributeError", OpenSSLError, OpenSSLError.getAllocator());
 
diff --git a/src/main/java/org/jruby/ext/openssl/X509CRL.java b/src/main/java/org/jruby/ext/openssl/X509CRL.java
@@ -93,14 +93,8 @@
 public class X509CRL extends RubyObject {
     private static final long serialVersionUID = -2463300006179688577L;
 
-    private static ObjectAllocator X509CRL_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new X509CRL(runtime, klass);
-        }
-    };
-
     static void createX509CRL(final Ruby runtime, final RubyModule X509, final RubyClass OpenSSLError) {
-        RubyClass CRL = X509.defineClassUnder("CRL", runtime.getObject(), X509CRL_ALLOCATOR);
+        RubyClass CRL = X509.defineClassUnder("CRL", runtime.getObject(), (r, klass) -> new X509CRL(r, klass));
         X509.defineClassUnder("CRLError", OpenSSLError, OpenSSLError.getAllocator());
         CRL.defineAnnotatedMethods(X509CRL.class);
     }
diff --git a/src/main/java/org/jruby/ext/openssl/X509Cert.java b/src/main/java/org/jruby/ext/openssl/X509Cert.java
@@ -105,14 +105,8 @@
 public class X509Cert extends RubyObject {
     private static final long serialVersionUID = -6524431607032364369L;
 
-    private static ObjectAllocator X509CERT_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new X509Cert(runtime, klass);
-        }
-    };
-
     static void createX509Cert(final Ruby runtime, final RubyModule X509, final RubyClass OpenSSLError) {
-        RubyClass Certificate = X509.defineClassUnder("Certificate", runtime.getObject(), X509CERT_ALLOCATOR);
+        RubyClass Certificate = X509.defineClassUnder("Certificate", runtime.getObject(), (r, klass) -> new X509Cert(r, klass));
         X509.defineClassUnder("CertificateError", OpenSSLError, OpenSSLError.getAllocator());
         Certificate.defineAnnotatedMethods(X509Cert.class);
     }
diff --git a/src/main/java/org/jruby/ext/openssl/X509Extension.java b/src/main/java/org/jruby/ext/openssl/X509Extension.java
@@ -68,7 +68,6 @@
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -87,16 +86,9 @@
 public class X509Extension extends RubyObject {
     private static final long serialVersionUID = 6463713017143658305L;
 
-    private static ObjectAllocator ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new X509Extension(runtime, klass);
-        }
-    };
-
     static void createX509Extension(final Ruby runtime, final RubyModule X509, final RubyClass OpenSSLError) { // OpenSSL::X509
         X509.defineClassUnder("ExtensionError", OpenSSLError, OpenSSLError.getAllocator());
-
-        RubyClass _Extension = X509.defineClassUnder("Extension", runtime.getObject(), X509Extension.ALLOCATOR);
+        RubyClass _Extension = X509.defineClassUnder("Extension", runtime.getObject(), (r, klass) -> new X509Extension(r, klass));
         _Extension.defineAnnotatedMethods(X509Extension.class);
 
         X509ExtensionFactory.createX509ExtensionFactory(runtime, X509);
diff --git a/src/main/java/org/jruby/ext/openssl/X509ExtensionFactory.java b/src/main/java/org/jruby/ext/openssl/X509ExtensionFactory.java
diff --git a/src/main/java/org/jruby/ext/openssl/X509Name.java b/src/main/java/org/jruby/ext/openssl/X509Name.java
diff --git a/src/main/java/org/jruby/ext/openssl/X509Request.java b/src/main/java/org/jruby/ext/openssl/X509Request.java
diff --git a/src/main/java/org/jruby/ext/openssl/X509Revoked.java b/src/main/java/org/jruby/ext/openssl/X509Revoked.java
diff --git a/src/main/java/org/jruby/ext/openssl/X509Store.java b/src/main/java/org/jruby/ext/openssl/X509Store.java
diff --git a/src/main/java/org/jruby/ext/openssl/X509StoreContext.java b/src/main/java/org/jruby/ext/openssl/X509StoreContext.java
