[chore] Remove use of deprecated JRuby 9.3 cat19 function

catWithCodeRange will not work with JRuby < 9.4.7.0 (Apr 2024), but as this patch release is 18 months old, it's reasonable to expect patching.

Author: chadlwilson

src/main/java/org/jruby/rack/ext/Input.java

@@ -10,9 +10,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.lang.invoke.MethodHandle;
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.MethodType;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
@@ -27,7 +24,6 @@
 import org.jruby.rack.servlet.RewindableInputStream;
 import org.jruby.rack.util.ExceptionUtils;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -42,24 +38,6 @@
  */
 @SuppressWarnings("serial")
 public class Input extends RubyObject {
-    private static final MethodHandle CONCAT_WITH_CODERANGE;
-
-    static {
-        // set up coderange-aware concat that works with the new catWithCodeRange as well as earlier JRuby without it.
-        // TODO: remove and replace with direct call once 9.3 is fully unsupported
-        MethodHandle catWithCR = null;
-        MethodHandles.Lookup lookup = MethodHandles.lookup();
-        try {
-            catWithCR = lookup.findVirtual(RubyString.class, "catWithCodeRange", MethodType.methodType(int.class, ByteList.class, int.class));
-        } catch (NoSuchMethodException | IllegalAccessException e) {
-            try {
-                catWithCR = lookup.findVirtual(RubyString.class, "cat19", MethodType.methodType(int.class, ByteList.class, int.class));
-            } catch (Exception t) {
-                Helpers.throwException(t);
-            }
-        }
-        CONCAT_WITH_CODERANGE = catWithCR;
-    }
 
     static final ObjectAllocator ALLOCATOR = Input::new;
 
@@ -166,12 +144,7 @@ public IRubyObject read(final ThreadContext context, final IRubyObject[] args) {
             if ( bytes != null ) {
                 if ( buffer != null ) {
                     buffer.clear();
-                    try {
-                        int unused = (int) CONCAT_WITH_CODERANGE.invokeExact(buffer, new ByteList(bytes, false), StringSupport.CR_UNKNOWN);
-                    } catch (Throwable t) {
-                        Helpers.throwException(t);
-                    }
-
+                    buffer.catWithCodeRange(new ByteList(bytes, false), StringSupport.CR_UNKNOWN);
                     return buffer;
                 }
                 return context.runtime.newString(new ByteList(bytes, false));