[fix] compat with JRuby 10 initialize_copy changes

kares · kares · commit 2585b09ec950 · 2025-07-25T20:02:57.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
@@ -171,6 +171,7 @@ private static BigInteger initBigIntegerBase(final Ruby runtime, RubyString str,
         }
     }
 
+    @JRubyMethod(visibility = Visibility.PRIVATE)
     @Override
     public IRubyObject initialize_copy(final IRubyObject that) {
         super.initialize_copy(that);
diff --git a/src/main/java/org/jruby/ext/openssl/PKeyDH.java b/src/main/java/org/jruby/ext/openssl/PKeyDH.java
@@ -101,6 +101,7 @@ public PKeyDH(Ruby runtime, RubyClass clazz) {
         super(runtime, clazz);
     }
 
+    @JRubyMethod(visibility = Visibility.PRIVATE)
     @Override
     public IRubyObject initialize_copy(final IRubyObject original) {
         if (this == original) return this;
diff --git a/src/main/java/org/jruby/ext/openssl/PKeyDSA.java b/src/main/java/org/jruby/ext/openssl/PKeyDSA.java
@@ -117,6 +117,7 @@ public PKeyDSA(Ruby runtime, RubyClass type, DSAPrivateKey privKey, DSAPublicKey
     private transient volatile BigInteger dsa_q;
     private transient volatile BigInteger dsa_g;
 
+    @JRubyMethod(visibility = Visibility.PRIVATE)
     @Override
     public IRubyObject initialize_copy(final IRubyObject original) {
         if (this == original) return this;
diff --git a/src/main/java/org/jruby/ext/openssl/PKeyEC.java b/src/main/java/org/jruby/ext/openssl/PKeyEC.java
@@ -403,6 +403,7 @@ private void setGroup(final Group group) {
         this.curveName = this.group.getCurveName();
     }
 
+    @JRubyMethod(visibility = Visibility.PRIVATE)
     @Override
     public IRubyObject initialize_copy(final IRubyObject original) {
         if (this == original) return this;
diff --git a/src/main/java/org/jruby/ext/openssl/PKeyRSA.java b/src/main/java/org/jruby/ext/openssl/PKeyRSA.java
@@ -148,6 +148,7 @@ public PKeyRSA(Ruby runtime, RubyClass type, RSAPrivateCrtKey privKey, RSAPublic
     private transient volatile BigInteger rsa_dmq1;
     private transient volatile BigInteger rsa_iqmp;
 
+    @JRubyMethod(visibility = Visibility.PRIVATE)
     @Override
     public IRubyObject initialize_copy(final IRubyObject original) {
         if (this == original) return this;
diff --git a/src/main/java/org/jruby/ext/openssl/SSLContext.java b/src/main/java/org/jruby/ext/openssl/SSLContext.java
@@ -324,6 +324,7 @@ public IRubyObject initialize(IRubyObject[] args) {
         return initializeImpl();
     }
 
+    @JRubyMethod(visibility = Visibility.PRIVATE)
     @Override // NOTE: instance variables (no internal state) on #dup
     public IRubyObject initialize_copy(IRubyObject original) {
         SSLContext copy = (SSLContext) super.initialize_copy(original);
diff --git a/src/main/java/org/jruby/ext/openssl/X509Attribute.java b/src/main/java/org/jruby/ext/openssl/X509Attribute.java
@@ -120,6 +120,7 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a
         return this;
     }
 
+    @JRubyMethod(visibility = Visibility.PRIVATE)
     @Override
     public IRubyObject initialize_copy(final IRubyObject original) {
         if (this == original) return this;
diff --git a/src/main/java/org/jruby/ext/openssl/X509Extension.java b/src/main/java/org/jruby/ext/openssl/X509Extension.java
@@ -250,6 +250,7 @@ else if ( args.length > 1 ) {
         return this;
     }
 
+    @JRubyMethod(visibility = Visibility.PRIVATE)
     @Override
     public IRubyObject initialize_copy(final IRubyObject original) {
         if (this == original) return this;

Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,7 @@ private static BigInteger initBigIntegerBase(final Ruby runtime, RubyString str,`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
	`174`	`+ @JRubyMethod(visibility = Visibility.PRIVATE)`
`174`	`175`	`@Override`
`175`	`176`	`public IRubyObject initialize_copy(final IRubyObject that) {`
`176`	`177`	`super.initialize_copy(that);`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ public PKeyDH(Ruby runtime, RubyClass clazz) {`
`101`	`101`	`super(runtime, clazz);`
`102`	`102`	`}`
`103`	`103`
	`104`	`+ @JRubyMethod(visibility = Visibility.PRIVATE)`
`104`	`105`	`@Override`
`105`	`106`	`public IRubyObject initialize_copy(final IRubyObject original) {`
`106`	`107`	`if (this == original) return this;`
Original file line number	Diff line number	Diff line change
`@@ -403,6 +403,7 @@ private void setGroup(final Group group) {`
`403`	`403`	`this.curveName = this.group.getCurveName();`
`404`	`404`	`}`
`405`	`405`
	`406`	`+ @JRubyMethod(visibility = Visibility.PRIVATE)`
`406`	`407`	`@Override`
`407`	`408`	`public IRubyObject initialize_copy(final IRubyObject original) {`
`408`	`409`	`if (this == original) return this;`
Original file line number	Diff line number	Diff line change
`@@ -324,6 +324,7 @@ public IRubyObject initialize(IRubyObject[] args) {`
`324`	`324`	`return initializeImpl();`
`325`	`325`	`}`
`326`	`326`
	`327`	`+ @JRubyMethod(visibility = Visibility.PRIVATE)`
`327`	`328`	`@Override // NOTE: instance variables (no internal state) on #dup`
`328`	`329`	`public IRubyObject initialize_copy(IRubyObject original) {`
`329`	`330`	`SSLContext copy = (SSLContext) super.initialize_copy(original);`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ public IRubyObject initialize(final ThreadContext context, final IRubyObject[] a`
`120`	`120`	`return this;`
`121`	`121`	`}`
`122`	`122`
	`123`	`+ @JRubyMethod(visibility = Visibility.PRIVATE)`
`123`	`124`	`@Override`
`124`	`125`	`public IRubyObject initialize_copy(final IRubyObject original) {`
`125`	`126`	`if (this == original) return this;`
Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,7 @@ else if ( args.length > 1 ) {`
`250`	`250`	`return this;`
`251`	`251`	`}`
`252`	`252`
	`253`	`+ @JRubyMethod(visibility = Visibility.PRIVATE)`
`253`	`254`	`@Override`
`254`	`255`	`public IRubyObject initialize_copy(final IRubyObject original) {`
`255`	`256`	`if (this == original) return this;`