Merge branch 'jruby-10.0'

* jruby-10.0:
  Also make constructor public
  Make SeekableByteArayChannelImpl public
  [test] review passing OpenSSL tests
  [deps] bump jruby-openssl to latest
  remove redundant test from TestJava.java
Fix prepended module initialize not called for Ruby classes rooted in
a Java superclass

Author: kares

core/src/main/java/org/jruby/java/proxies/ConcreteJavaProxy.java

@@ -201,7 +201,7 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
         }
 
     }
-    
+
     /**
      * Manually added as an override of `new` for Concrete Extension
      */
@@ -221,10 +221,12 @@ public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule claz
                 IRubyObject[] args, Block block) {
             try {
                 ConcreteJavaProxy cjp = (ConcreteJavaProxy) self;
-                // TODO: Insead of selectively overwriting, silently fail? or only use the other method/this method?
+                // TODO: Instead of selectively overwriting, silently fail? or only use the other method/this method?
                 if (cjp.getObject() == null) {
                     withBlock.newInstance(cjp, args, block, context.runtime, clazz);
                     // note: the generated ctor sets self.object = our discarded return of the new object
+                } else if (oldInit != null) {
+                    return oldInit.call(context, self, clazz, name, args, block);
                 }
             } catch (InstantiationException | InvocationTargetException e) {
                 throw JavaProxyConstructor.throwInstantiationExceptionCause(context.runtime, e);
@@ -243,7 +245,7 @@ public static void tryInstall(Ruby runtime, RubyClass clazz, JavaProxyClass prox
                 // TODO: don't lock in this initialize method
                 var context = runtime.getCurrentContext();
                 if (overwriteInitialize) clazz.addMethod(context,"initialize",
-                        new StaticJCreateMethod(clazz, withBlock, clazz.searchMethod("initialize")));
+                    new StaticJCreateMethod(clazz, withBlock, clazz.getMethodLocation().searchMethod("initialize")));
                 clazz.addMethod(context, "__jallocate!", new StaticJCreateMethod(clazz, withBlock, null));
             } catch (SecurityException | NoSuchMethodException e) {
                 // TODO log?
@@ -321,36 +323,38 @@ public static final class SplitCtorData {
         // public fields used by RealClassGenerator's generated code
         public final Object[] arguments;
         public final int ctorIndex;
-        
+
         // public field used by finishInitialized &  (ruby < ruby < java) generated classes
         public final IRubyObject[] rbarguments;
         public final Block block;
 
         // fields below are only used in ConcreteJavaProxy finishInitialize
         private final AbstractIRMethod method;
+        private final RubyModule clazz;
         private final String name;
         private final SplitSuperState<?> state;
+        private final SplitCtorData nested;
 
         /**
          * Picks and converts arguments for the super call
          * Leaves ctorIndex and arguments ready for the super call
          */
         SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache) {
-            this(runtime, args, cache, null, null, null, Block.NULL_BLOCK);
+            this(runtime, args, cache, null, null, null, null, Block.NULL_BLOCK, null);
         }
 
         SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache,
-                      AbstractIRMethod method, SplitSuperState<?> state, Block block) {
-            this(runtime, args, cache, method, null, state, block);
+                      AbstractIRMethod method, RubyModule clazz, String name, Block block) {
+            this(runtime, args, cache, method, clazz, name, null, block, null);
         }
 
         SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache,
-                      AbstractIRMethod method, String name, Block block) {
-            this(runtime, args, cache, method, name, null, block);
+                      AbstractIRMethod method, RubyModule clazz, String name, SplitSuperState<?> state, Block block) {
+            this(runtime, args, cache, method, clazz, name, state, block, null);
         }
 
         private SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache,
-                              AbstractIRMethod method, String name, SplitSuperState<?> state, Block block) {
+                              AbstractIRMethod method, RubyModule clazz, String name, SplitSuperState<?> state, Block block, SplitCtorData nested) {
             rbarguments = args;
             if (cache == null) { // (ruby < ruby < java) super call from one IRO to another IRO ctor
                 ctorIndex = -1;
@@ -361,9 +365,24 @@ private SplitCtorData(Ruby runtime, IRubyObject[] args, JCtorCache cache,
             }
 
             this.method = method;
+            this.clazz = clazz;
+            this.name = name;
+            this.state = state;
+            this.block = block;
+            this.nested = nested;
+        }
+
+        private SplitCtorData(SplitCtorData ctorData, IRubyObject[] args,
+                              AbstractIRMethod method, RubyModule clazz, String name, SplitSuperState<?> state, Block block) {
+            this.arguments = ctorData.arguments;
+            this.ctorIndex = ctorData.ctorIndex;
+            this.rbarguments = args;
+            this.method = method;
+            this.clazz = clazz;
             this.name = name;
             this.state = state;
             this.block = block;
+            this.nested = ctorData;
         }
     }
 
@@ -376,30 +395,57 @@ public SplitCtorData splitInitialized(RubyClass base, IRubyObject[] args, Block
         final Ruby runtime = getRuntime();
         final String name = base.getClassConfig().javaCtorMethodName;
         final CacheEntry methodEntry = base.searchWithCache(name);
+        final RubyClass sourceLocation = findIncludedPrependedModule(methodEntry.sourceModule, base);
+        final RubyModule effectiveSource = sourceLocation != null ? sourceLocation : methodEntry.sourceModule;
         final boolean isLateral = isClassOrIncludedPrependedModule(methodEntry.sourceModule, base);
         DynamicMethod method = methodEntry.method.getRealMethod(); // ensure we don't use a wrapper (jruby/jruby#8148)
         if (method instanceof StaticJCreateMethod) method = ((StaticJCreateMethod) method).oldInit;
 
+        if (isPrependedJavaCtorWrapper(sourceLocation, base) && method instanceof AbstractIRMethod air) {
+            SplitSuperState<?> state = air.startSplitSuperCall(runtime.getCurrentContext(), this, effectiveSource, name, args, block);
+            IRubyObject[] forwardedArgs = state == null ? args : state.callArrayArgs.toJavaArrayMaybeUnsafe();
+            Block forwardedBlock = state == null ? block : state.callBlockArgs;
+            SplitCtorData ctorData = splitInitialized(sourceLocation.getSuperClass(), forwardedArgs, forwardedBlock, jcc);
+            return new SplitCtorData(ctorData, args, air, effectiveSource, name, state, block);
+        }
+
         // jcreate is for nested ruby classes from a java class
         if (isLateral && method instanceof AbstractIRMethod) {
 
             AbstractIRMethod air = (AbstractIRMethod) method; // TODO: getMetaClass() ? or base? (below v)
 
-            SplitSuperState<?> state = air.startSplitSuperCall(runtime.getCurrentContext(), this, getMetaClass(), name, args, block);
+            SplitSuperState<?> state = air.startSplitSuperCall(runtime.getCurrentContext(), this, effectiveSource, name, args, block);
             if (state == null) { // no super in method
-                return new SplitCtorData(runtime, args, jcc, air, name, block);
+                return new SplitCtorData(runtime, args, jcc, air, effectiveSource, name, block);
             }
-            return new SplitCtorData(runtime, state.callArrayArgs.toJavaArrayMaybeUnsafe(), jcc, air, state, block);
+            return new SplitCtorData(runtime, state.callArrayArgs.toJavaArrayMaybeUnsafe(), jcc, air, effectiveSource, name, state, block);
         }
         return new SplitCtorData(runtime, args, jcc);
     }
 
+    private static boolean isPrependedJavaCtorWrapper(final RubyClass methodSource, final RubyClass klass) {
+        if (methodSource == null) return false;
+
+        return methodSource != klass && methodSource.isIncluded() &&
+                methodSource.getSuperClass() != null && methodSource.getSuperClass().getDelegate() == klass;
+    }
+
+    private static RubyClass findIncludedPrependedModule(final RubyModule methodSource, final RubyClass klass) {
+        RubyModule ceiling = klass.getMethodLocation();
+
+        for (RubyClass candidate = klass.getSuperClass(); candidate != null && candidate != ceiling; candidate = candidate.getSuperClass()) {
+            if (candidate.getOrigin() == methodSource.getOrigin()) return candidate;
+        }
+
+        return null;
+    }
+
     private static boolean isClassOrIncludedPrependedModule(final RubyModule methodSource, final RubyClass klass) {
-        if (methodSource == klass) return true;
+        if (methodSource == klass || methodSource.getDelegate() == klass) return true;
 
         RubyClass candidate = klass.getSuperClass();
         while (candidate != null && (candidate.isIncluded() || candidate.isPrepended())) { // up till 'real' superclass
-            if (candidate == klass) return true;
+            if (candidate == methodSource || candidate.getDelegate() == methodSource.getDelegate()) return true;
             candidate = candidate.getSuperClass();
         }
 
@@ -412,11 +458,13 @@ private static boolean isClassOrIncludedPrependedModule(final RubyModule methodS
      * <p>Note: invoked from generated byte-code</p>
      */
     public void finishInitialize(SplitCtorData returned) {
+        if (returned.nested != null) finishInitialize(returned.nested);
+
         if (returned.method != null) {
             if (returned.state != null) {
                 returned.method.finishSplitCall(returned.state);
             } else { // no super, direct call
-                returned.method.call(getRuntime().getCurrentContext(), this, getMetaClass(),
+                returned.method.call(getRuntime().getCurrentContext(), this, returned.clazz,
                         returned.name, returned.rbarguments, returned.block);
             }
         }

core/src/main/java/org/jruby/util/io/SeekableByteChannelImpl.java

@@ -24,7 +24,7 @@
  * Seekable byte channel impl over a byte array stream.
  * @author kares
  */
-final class SeekableByteChannelImpl extends AbstractInterruptibleChannel
+public final class SeekableByteChannelImpl extends AbstractInterruptibleChannel
     implements ReadableByteChannel, SeekableByteChannel {
 
     private final ByteArrayInputStream in;
@@ -34,7 +34,7 @@ final class SeekableByteChannelImpl extends AbstractInterruptibleChannel
 
     private int truncatedBy = 0;
 
-    SeekableByteChannelImpl(ByteArrayInputStream in) {
+    public SeekableByteChannelImpl(ByteArrayInputStream in) {
         this.in = in;
         this.mark = mark(in);
         this.count = count(in);

lib/pom.rb

@@ -50,7 +50,7 @@ def log(message = nil)
   ['ipaddr', '1.2.8'],
   ['jar-dependencies', '0.5.7'],
   ['jruby-readline', '1.3.7'],
-  ['jruby-openssl', '0.15.5'],
+  ['jruby-openssl', '0.15.6'],
   ['json', '2.18.0'],
   ['net-http', '0.9.1'],
   ['net-protocol', '0.2.2'],

lib/pom.xml

@@ -281,7 +281,7 @@ DO NOT MODIFY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>
-      <version>0.15.5</version>
+      <version>0.15.6</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -1163,7 +1163,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>specifications/ipaddr-1.2.8*</include>
           <include>specifications/jar-dependencies-0.5.7*</include>
           <include>specifications/jruby-readline-1.3.7*</include>
-          <include>specifications/jruby-openssl-0.15.5*</include>
+          <include>specifications/jruby-openssl-0.15.6*</include>
           <include>specifications/json-2.18.0*</include>
           <include>specifications/net-http-0.9.1*</include>
           <include>specifications/net-protocol-0.2.2*</include>
@@ -1247,7 +1247,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>gems/ipaddr-1.2.8*/**/*</include>
           <include>gems/jar-dependencies-0.5.7*/**/*</include>
           <include>gems/jruby-readline-1.3.7*/**/*</include>
-          <include>gems/jruby-openssl-0.15.5*/**/*</include>
+          <include>gems/jruby-openssl-0.15.6*/**/*</include>
           <include>gems/json-2.18.0*/**/*</include>
           <include>gems/net-http-0.9.1*/**/*</include>
           <include>gems/net-protocol-0.2.2*/**/*</include>
@@ -1331,7 +1331,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>cache/ipaddr-1.2.8*</include>
           <include>cache/jar-dependencies-0.5.7*</include>
           <include>cache/jruby-readline-1.3.7*</include>
-          <include>cache/jruby-openssl-0.15.5*</include>
+          <include>cache/jruby-openssl-0.15.6*</include>
           <include>cache/json-2.18.0*</include>
           <include>cache/net-http-0.9.1*</include>
           <include>cache/net-protocol-0.2.2*</include>
@@ -1415,7 +1415,7 @@ DO NOT MODIFY - GENERATED CODE
           <include>extensions/universal-java/4.0.0/ipaddr-1.2.8/*</include>
           <include>extensions/universal-java/4.0.0/jar-dependencies-0.5.7/*</include>
           <include>extensions/universal-java/4.0.0/jruby-readline-1.3.7/*</include>
-          <include>extensions/universal-java/4.0.0/jruby-openssl-0.15.5/*</include>
+          <include>extensions/universal-java/4.0.0/jruby-openssl-0.15.6/*</include>
           <include>extensions/universal-java/4.0.0/json-2.18.0/*</include>
           <include>extensions/universal-java/4.0.0/net-http-0.9.1/*</include>
           <include>extensions/universal-java/4.0.0/net-protocol-0.2.2/*</include>

spec/java_integration/reify/become_java_spec.rb

@@ -120,6 +120,42 @@ class TopRightOfTheJStack < MiddleOfTheJStack ;def size; super + 3; end ; end
     expect(TopRightOfTheJStack.new([:a, :b]).size).to eq (2+3)
   end
 
+  it "calls prepended and leaf initialize methods for Ruby classes rooted in a Java superclass" do
+    class PrependJavaBaseInitC < java.util.ArrayList
+      def initialize(trace)
+        trace << :c
+        super()
+      end
+    end
+
+    class PrependJavaBaseInitD < PrependJavaBaseInitC
+      def initialize(trace)
+        trace << :d
+        super
+      end
+    end
+
+    class PrependJavaBaseInitE < PrependJavaBaseInitD
+      def initialize(trace)
+        trace << :e
+        super
+      end
+    end
+
+    module PrependJavaBaseInitM
+      def initialize(trace)
+        trace << :m
+        super
+      end
+    end
+
+    PrependJavaBaseInitE.prepend(PrependJavaBaseInitM)
+
+    trace = []
+    PrependJavaBaseInitE.new(trace)
+    expect(trace).to eq([:m, :e, :d, :c])
+  end
+
   it "supports auto reifying a class hierarchy when class gets redefined" do
     class ASubList < java.util.ArrayList
       attr_reader :args

test/mri/excludes/OpenSSL/TestASN1.rb

@@ -1,25 +1,10 @@
 exclude :test_basic_asn1data, "work in progress"
 exclude :test_basic_constructed, "work in progress"
-exclude :test_basic_primitive, "work in progress"
-exclude :test_bit_string_infinite_length, 'encoding works but decoding not implemented'
-exclude :test_bitstring, "work in progress"
-exclude :test_cons_explicit_tagging, 'needs investigation'
-exclude :test_cons_implicit_tagging, 'needs investigation'
-exclude :test_cons_without_array_forbidden, 'needs investigation'
-exclude :test_create_inf_length_primitive, 'needs investigation'
 exclude :test_decode_constructed_overread, "work in progress"
-exclude :test_decode_x509_certificate, "work in progress"
 exclude :test_end_of_content, "work in progress"
 exclude :test_generalizedtime, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_object_identifier, "work in progress"
-exclude :test_octet_string_constructed_tagging, "work in progress"
-exclude :test_octet_string_infinite_length_explicit_tagging, 'needs investigation'
-exclude :test_octet_string_infinite_length_implicit_tagging, 'needs investigation'
-exclude :test_prim_implicit_tagging, 'needs investigation'
 exclude :test_recursive_octet_string_indefinite_length, "work in progress"
-exclude :test_recursive_octet_string_infinite_length, 'needs investigation'
-exclude :test_recursive_octet_string_parse, 'needs investigation'
+exclude :test_recursive_octet_string_parse, "work in progress"
 exclude :test_sequence, "work in progress"
 exclude :test_set, "work in progress"
-exclude :test_string_basic, "work in progress"
-exclude :test_utctime, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"

test/mri/excludes/OpenSSL/TestCipher.rb

@@ -1,5 +1,3 @@
-exclude :test_AES, 'works - just need to enable JCE unlimited strength'
-exclude :test_AES_crush, 'needs investigation'
 exclude :test_aes_gcm, "work in progress"
 exclude :test_auth_tag_error_inheritance, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
 exclude :test_ciphers, "work in progress"

test/mri/excludes/OpenSSL/TestEC.rb

@@ -1,18 +1,6 @@
-exclude :test_ECPrivateKey, "work in progress"
-exclude :test_ECPrivateKey_encrypted, "work in progress"
-exclude :test_PUBKEY, "work in progress"
 exclude :test_check_key, "work in progress"
-exclude :test_derive_key, "TODO: OpenSSL::PKey::EC#derive not yet implemented"
-exclude :test_dh_compute_key, "work in progress"
-exclude :test_dsa_sign_asn1_FIPS186_3, "work in progress"
-exclude :test_ec_group, "work in progress"
-exclude :test_ec_key, "work in progress"
-exclude :test_ec_key_new, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, private key as well as public key are null"
-exclude :test_ec_key_new_empty, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, null curve name"
 exclude :test_ec_point, "work in progress"
 exclude :test_ec_point_add, "work in progress"
 exclude :test_ec_point_mul, "work in progress"
-exclude :test_generate, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
-exclude :test_generate_key, "work in progress"
 exclude :test_sign_verify_raw, "work in progress"
 exclude :test_small_curve, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, null curve name"

test/mri/excludes/OpenSSL/TestPKey.rb

@@ -8,7 +8,3 @@
 exclude :test_s_generate_key, "work in progress"
 exclude :test_s_generate_parameters, "work in progress"
 exclude :test_s_generate_parameters_with_block, "work in progress"
-exclude :test_s_read_der_then_pem, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, undefined method 'private_to_pem' for an instance of OpenSSL::PKey::RSA"
-exclude :test_s_read_passphrase, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, undefined method 'private_to_pem' for an instance of OpenSSL::PKey::RSA"
-exclude :test_s_read_pem_unknown_block, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, undefined method 'private_to_pem' for an instance of OpenSSL::PKey::RSA"
-exclude :test_x25519, "work in progress"

test/mri/excludes/OpenSSL/TestPKeyDSA.rb

@@ -2,11 +2,5 @@
 exclude :test_DSAPrivateKey_encrypted, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: Bad sequence size: 3"
 exclude :test_PUBKEY, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: Bad sequence size: 3"
 exclude :test_dup, 'passes except for setting (invalid) `key2.p + 1` as validation happens early'
-exclude :test_export_password_length, 'needs investigation'
-exclude :test_marshal, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: Bad sequence size: 3"
 exclude :test_new_break, 'needs investigation'
-exclude :test_new_empty, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271"
-exclude :test_params, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: Bad sequence size: 3"
-exclude :test_private, "new failure with Ruby 4.0 tests, tested on MacOS, https://github.com/jruby/jruby/issues/9271, IllegalArgumentException: Bad sequence size: 3"
-exclude :test_sign_verify, "work in progress"
-exclude :test_sign_verify_raw, "TODO: sign_raw not implemented"
+exclude :test_sign_verify_raw, "work in progress"