Revert "Restore some 19 methods still in use by json"

This reverts commit c60310f.
headius · Apr 4, 2024 · 823dce1 · 823dce1
1 parent 9ecab65
commit 823dce1
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 18 deletions.
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -6496,12 +6496,6 @@ public RubySymbol intern() {
         return symbol;
     }
 
-    // Must remain in place until json has migrated to the new method for some time (https://github.com/flori/json/pull/576)
-    @Deprecated
-    public RubySymbol intern19() {
-        return intern();
-    }
-
     @JRubyMethod
     public IRubyObject ord(ThreadContext context) {
         final Ruby runtime = context.runtime;

diff --git a/core/src/main/java/org/jruby/util/ConvertBytes.java b/core/src/main/java/org/jruby/util/ConvertBytes.java
@@ -369,12 +369,6 @@ public static RubyInteger byteListToInum(Ruby runtime, ByteList str, int off, in
         return (RubyInteger) new ConvertBytes(runtime, str, off, end, base, badcheck).byteListToInum(true);
     }
 
-    // Must remain in place until json has migrated to the new method for some time (https://github.com/flori/json/pull/576)
-    @Deprecated
-    public static RubyInteger byteListToInum19(Ruby runtime, ByteList str, int base, boolean badcheck) {
-        return byteListToInum(runtime, str, base, badcheck);
-    }
-
     private final static byte[] conv_digit = new byte[128];
     private final static boolean[] digit = new boolean[128];
     private final static boolean[] space = new boolean[128];

diff --git a/core/src/main/java/org/jruby/util/ConvertDouble.java b/core/src/main/java/org/jruby/util/ConvertDouble.java
@@ -29,12 +29,6 @@
 package org.jruby.util;
 
 public class ConvertDouble {
-    // Must remain in place until json has migrated to the new method for some time (https://github.com/flori/json/pull/576)
-    @Deprecated
-    public static double byteListToDouble19(ByteList bytes, boolean strict) {
-        return byteListToDouble(bytes, strict);
-    }
-
     /**
      * Converts supplied ByteList into a double.  strict-mode will not like
      * extra text non-numeric text or multiple sequention underscores.