Fix covariant return type issues with to_s

enebo · enebo · commit 97af910e6525 · 2025-03-07T11:26:53.000-06:00
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -427,7 +427,7 @@ public RubyString inspect(ThreadContext context) {
         ByteList str = new ByteList((path == null ? 4 : path.length()) + 8);
 
         str.append('#').append('<');
-        str.append(getMetaClass().getRealClass().to_s(context).getByteList());
+        str.append(((RubyString) getMetaClass().getRealClass().to_s(context)).getByteList());
         str.append(':').append(path == null ? RubyNil.nilBytes : RubyEncoding.encodeUTF8(path));
         if (!openFile.isOpen()) str.append(CLOSED_MESSAGE);
         str.append('>');
diff --git a/core/src/main/java/org/jruby/RubyInteger.java b/core/src/main/java/org/jruby/RubyInteger.java
@@ -862,10 +862,17 @@ public IRubyObject denominator(ThreadContext context) {
         return RubyFixnum.one(context.runtime);
     }
 
+    @Deprecated(since = "10.0")
+    public RubyString to_s() {
+        return to_s(getCurrentContext());
+    }
+
+    // Note: to not change interface by adding abstract method I made a base impl.
     @Override
     @JRubyMethod(name = {"to_s", "inspect"})
-    public abstract RubyString to_s(ThreadContext context);
-
+    public RubyString to_s(ThreadContext context) {
+        throw new RuntimeException("all numeric types must override this method");
+    }
 
     @Deprecated(since = "10.0")
     public RubyString to_s(IRubyObject x) {
diff --git a/core/src/main/java/org/jruby/RubyModule.java b/core/src/main/java/org/jruby/RubyModule.java
@@ -3243,11 +3243,16 @@ public RubyFixnum hash(ThreadContext context) {
         return asFixnum(context, id);
     }
 
+    @Override
+    public RubyString to_s() {
+        return (RubyString) to_s(getCurrentContext());
+    }
+
     /** rb_mod_to_s
      *
      */
     @JRubyMethod(name = "to_s", alias = "inspect")
-    public RubyString to_s(ThreadContext context) {
+    public IRubyObject to_s(ThreadContext context) {
         if (isSingleton()) {
             IRubyObject attached = ((MetaClass) this).getAttached();
             RubyString buffer = newString(context, "#<Class:");
diff --git a/core/src/main/java/org/jruby/RubyProcess.java b/core/src/main/java/org/jruby/RubyProcess.java
@@ -395,6 +395,11 @@ public IRubyObject to_i(Ruby runtime) {
             return runtime.newFixnum(status);
         }
 
+        @Deprecated(since = "10.0")
+        public IRubyObject to_s(Ruby runtime) {
+            return to_s(getCurrentContext());
+        }
+
         @Override
         @JRubyMethod
         public IRubyObject to_s(ThreadContext context) {
diff --git a/core/src/main/java/org/jruby/RubyRegexp.java b/core/src/main/java/org/jruby/RubyRegexp.java
@@ -848,7 +848,7 @@ public static IRubyObject union(ThreadContext context, IRubyObject recv, IRubyOb
                     } else {
                         hasAsciiOnly = true;
                     }
-                    re = regex.to_s(context).getByteList();
+                    re = ((RubyString) regex.to_s(context)).getByteList();
                 } else {
                     RubyString str = e.convertToString();
                     enc = str.getEncoding();
@@ -1441,6 +1441,11 @@ public IRubyObject inspect(ThreadContext context) {
 
     private final static int EMBEDDABLE = RE_OPTION_MULTILINE|RE_OPTION_IGNORECASE|RE_OPTION_EXTENDED;
 
+    @Deprecated(since = "10.0")
+    public RubyString to_s() {
+        return to_s(getCurrentContext());
+    }
+
     @Override
     @JRubyMethod
     public RubyString to_s(ThreadContext context) {
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -1327,15 +1327,10 @@ public static IRubyObject try_convert(ThreadContext context, IRubyObject recv, I
         return str.checkStringType();
     }
 
-    @Deprecated(since = "10.0")
-    public RubyString to_s() {
-        return (RubyString) to_s(getCurrentContext());
-    }
-
     @SuppressWarnings("ReferenceEquality")
     @JRubyMethod(name = {"to_s", "to_str"})
     @Override
-    public IRubyObject to_s(ThreadContext context) {
+    public RubyString to_s(ThreadContext context) {
         return metaClass.getRealClass() != stringClass(context) ? dupString(context, this) : this;
     }
 
diff --git a/core/src/main/java/org/jruby/javasupport/JavaPackage.java b/core/src/main/java/org/jruby/javasupport/JavaPackage.java
@@ -115,8 +115,13 @@ public RubyString package_name(ThreadContext context) {
         return newString(context, packageName);
     }
 
+    @Deprecated(since = "10.0")
+    public RubyString to_s() {
+        return (RubyString) to_s(getCurrentContext());
+    }
+
     @Override
-    public RubyString to_s(ThreadContext context) { return package_name(); }
+    public IRubyObject to_s(ThreadContext context) { return package_name(); }
 
     @JRubyMethod
     public IRubyObject inspect(ThreadContext context) {
