remove deprecated (internal) Java code

core/src/main/java/org/jruby/embed/internal/EmbedRubyObjectAdapterImpl.java

@@ -41,7 +41,6 @@
 import org.jruby.embed.ScriptingContainer;
 import org.jruby.embed.variable.BiVariable;
 import org.jruby.embed.variable.InstanceVariable;
-import org.jruby.javasupport.Java;
 import org.jruby.javasupport.JavaEmbedUtils;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.runtime.DynamicScope;
@@ -278,16 +277,8 @@ private IRubyObject getTopSelf() {
         return container.getProvider().getRuntime().getTopSelf();
     }
 
-    @SuppressWarnings("deprecation")
     private static IRubyObject[] convertArgs(final Ruby runtime, final Object[] args) {
-        IRubyObject[] rubyArgs = JavaUtil.convertJavaArrayToRuby(runtime, args);
-        for (int i = 0; i < rubyArgs.length; i++) {
-            IRubyObject obj = rubyArgs[i];
-            if (obj instanceof org.jruby.javasupport.JavaObject) {
-                rubyArgs[i] = Java.wrap(runtime, obj);
-            }
-        }
-        return rubyArgs;
+        return JavaUtil.convertJavaArrayToRuby(runtime, args);
     }
 
 }

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

@@ -62,17 +62,6 @@ public static ArrayJavaProxy newArray(final Ruby runtime, final Class<?> element
         return new ArrayJavaProxy(runtime, Java.getProxyClassForObject(runtime, array), array);
     }
 
-    @Override
-    @Deprecated
-    protected org.jruby.javasupport.JavaArray asJavaObject(final Object array) {
-        return new org.jruby.javasupport.JavaArray(getRuntime(), array);
-    }
-
-    @Deprecated
-    public final org.jruby.javasupport.JavaArray getJavaArray() {
-        return asJavaObject(this.object);
-    }
-
     public Object get(final int index) {
         return Array.get(getObject(), index);
     }

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

@@ -140,9 +140,7 @@ public final Object dataGetStruct() {
     @Override
     @SuppressWarnings("deprecation")
     public final void dataWrapStruct(Object object) {
-        if (object instanceof org.jruby.javasupport.JavaObject) {
-            this.object = ((org.jruby.javasupport.JavaObject) object).getValue();
-        } else if (object instanceof JavaProxy) {
+        if (object instanceof JavaProxy) {
             this.object = ((JavaProxy) object).object;
         } else {
             this.object = object;
@@ -159,12 +157,6 @@ public void setObject(Object object) {
 
     public Object unwrap() { return getObject(); }
 
-    @Deprecated // not used
-    @SuppressWarnings("deprecation")
-    protected org.jruby.javasupport.JavaObject asJavaObject(final Object object) {
-        return org.jruby.javasupport.JavaObject.wrap(getRuntime(), object);
-    }
-
     @Override
     public Class<?> getJavaClass() {
         return getObject().getClass();

core/src/main/java/org/jruby/java/util/ArrayUtils.java

@@ -205,17 +205,4 @@ private static void copyDataToJavaArrayDirect(final Class<?> targetType,
             javaArray[i] = (Byte) rubyArray.eltInternal(i).toJava(targetType);
         }
     }
-
-    @Deprecated // not used
-    public static void copyDataToJavaArray(
-            ThreadContext context, RubyArray rubyArray, int src, org.jruby.javasupport.JavaArray javaArray, int dest, int length) {
-        Class targetType = javaArray.getComponentType();
-
-        int destLength = (int)javaArray.length().getLongValue();
-        int srcLength = rubyArray.getLength();
-
-        for (int i = 0; src + i < srcLength && dest + i < destLength && i < length; i++) {
-            javaArray.setWithExceptionHandling(dest + i, rubyArray.entry(src + i).toJava(targetType));
-        }
-    }
 }

core/src/main/java/org/jruby/javasupport/Java.java

@@ -289,11 +289,6 @@ public static IRubyObject getInstance(Ruby runtime, Object rawJavaObject, boolea
         return runtime.getNil();
     }
 
-    @Deprecated
-    public static RubyModule getInterfaceModule(final Ruby runtime, final JavaClass javaClass) {
-        return getInterfaceModule(runtime, javaClass.javaClass());
-    }
-
     public static RubyModule getInterfaceModule(final Ruby runtime, final Class javaClass) {
         return Java.getProxyClass(runtime, javaClass);
     }
@@ -407,12 +402,6 @@ private static Class resolveShortClassName(final String name) {
         return null;
     }
 
-    @Deprecated
-    public static RubyModule getProxyClass(Ruby runtime, JavaClass javaClass) {
-        return getProxyClass(runtime, javaClass.javaClass());
-    }
-
-    @SuppressWarnings("deprecation")
     public static RubyModule getProxyClass(final Ruby runtime, final Class<?> clazz) {
         RubyModule proxy = runtime.getJavaSupport().getUnfinishedProxy(clazz);
         if (proxy != null) return proxy;
@@ -1337,11 +1326,6 @@ public static IRubyObject get_top_level_proxy_or_package(final ThreadContext con
         return result != null ? result : context.nil;
     }
 
-    @Deprecated
-    public static IRubyObject wrap(Ruby runtime, IRubyObject java_object) {
-        return getInstance(runtime, ((JavaObject) java_object).getValue());
-    }
-
     /**
      * High-level object conversion utility function 'java_to_primitive' is the low-level version
      */