minor refactor: remove deprecated code usage

apache · Dec 4, 2024 · 457ca9b · 457ca9b
1 parent e9cdfbf
commit 457ca9b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayPutAtMetaMethod.java
@@ -24,7 +24,7 @@
 import org.codehaus.groovy.reflection.ReflectionCache;
 import org.codehaus.groovy.runtime.callsite.CallSite;
 import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite;
-import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
 
 public class CharacterArrayPutAtMetaMethod extends ArrayPutAtMetaMethod {
     private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(char[].class);
@@ -38,7 +38,7 @@ public final CachedClass getDeclaringClass() {
     public Object invoke(Object object, Object[] args) {
         final char[] objects = (char[]) object;
         final int index = normaliseIndex((Integer) args[0], objects.length);
-        objects[index] = DefaultTypeTransformation.getCharFromSizeOneString(args[1]);
+        objects[index] = ShortTypeHandling.castToChar(args[1]);
         return null;
     }
 

diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java
@@ -26,6 +26,7 @@
 import org.codehaus.groovy.runtime.callsite.CallSite;
 import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
 
 public class DoubleArrayPutAtMetaMethod extends ArrayPutAtMetaMethod {
     private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(double[].class);
@@ -42,7 +43,7 @@ public Object invoke(Object object, Object[] args) {
         Object newValue = args[1];
         if (!(newValue instanceof Double)) {
             if (newValue instanceof Character || newValue instanceof String || newValue instanceof GString) {
-                Character ch = DefaultTypeTransformation.getCharFromSizeOneString(newValue);
+                Character ch = ShortTypeHandling.castToChar(newValue);
                 objects[index] = (Double) DefaultTypeTransformation.castToType(ch, Double.class);
             } else {
                 objects[index] = ((Number) newValue).doubleValue();

diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayPutAtMetaMethod.java
@@ -26,6 +26,7 @@
 import org.codehaus.groovy.runtime.callsite.CallSite;
 import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
 
 public class FloatArrayPutAtMetaMethod extends ArrayPutAtMetaMethod {
     private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(float[].class);
@@ -42,7 +43,7 @@ public Object invoke(Object object, Object[] args) {
         Object newValue = args[1];
         if (!(newValue instanceof Float)) {
             if (newValue instanceof Character || newValue instanceof String || newValue instanceof GString) {
-                Character ch = DefaultTypeTransformation.getCharFromSizeOneString(newValue);
+                Character ch = ShortTypeHandling.castToChar(newValue);
                 objects[index] = (Float) DefaultTypeTransformation.castToType(ch, Float.class);
             } else {
                 objects[index] = ((Number) newValue).floatValue();

diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayPutAtMetaMethod.java
@@ -26,6 +26,7 @@
 import org.codehaus.groovy.runtime.callsite.CallSite;
 import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
 
 public class IntegerArrayPutAtMetaMethod extends ArrayPutAtMetaMethod {
     private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(int[].class);
@@ -42,7 +43,7 @@ public Object invoke(Object object, Object[] args) {
         Object newValue = args[1];
         if (!(newValue instanceof Integer)) {
             if (newValue instanceof Character || newValue instanceof String || newValue instanceof GString) {
-                Character ch = DefaultTypeTransformation.getCharFromSizeOneString(newValue);
+                Character ch = ShortTypeHandling.castToChar(newValue);
                 objects[index] = (Integer) DefaultTypeTransformation.castToType(ch, Integer.class);
             } else {
                 objects[index] = ((Number) newValue).intValue();

diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayPutAtMetaMethod.java
@@ -26,6 +26,7 @@
 import org.codehaus.groovy.runtime.callsite.CallSite;
 import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
 
 public class LongArrayPutAtMetaMethod extends ArrayPutAtMetaMethod {
     private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(long[].class);
@@ -42,7 +43,7 @@ public Object invoke(Object object, Object[] args) {
         Object newValue = args[1];
         if (!(newValue instanceof Long)) {
             if (newValue instanceof Character || newValue instanceof String || newValue instanceof GString) {
-                Character ch = DefaultTypeTransformation.getCharFromSizeOneString(newValue);
+                Character ch = ShortTypeHandling.castToChar(newValue);
                 objects[index] = (Long) DefaultTypeTransformation.castToType(ch, Long.class);
             } else {
                 objects[index] = ((Number) newValue).longValue();

diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java
@@ -25,6 +25,7 @@
 import org.codehaus.groovy.runtime.callsite.CallSite;
 import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
 
 import static org.codehaus.groovy.reflection.ReflectionCache.OBJECT_ARRAY_CLASS;
 
@@ -51,12 +52,12 @@ private static Object adjustNewValue(final Object[] objects, final Object newVal
                 adjustedNewVal = DefaultTypeTransformation.castToType(newValue, arrayComponentClass);
             }
         } else if (Character.class.isAssignableFrom(arrayComponentClass)) {
-            adjustedNewVal = DefaultTypeTransformation.getCharFromSizeOneString(newValue);
+            adjustedNewVal = ShortTypeHandling.castToChar(newValue);
         } else if (String.class.equals(arrayComponentClass) && newValue instanceof GString) {
             adjustedNewVal = DefaultTypeTransformation.castToType(newValue, arrayComponentClass);
         } else if (Number.class.isAssignableFrom(arrayComponentClass)) {
             if (newValue instanceof Character || newValue instanceof String || newValue instanceof GString) {
-                Character ch = DefaultTypeTransformation.getCharFromSizeOneString(newValue);
+                Character ch = ShortTypeHandling.castToChar(newValue);
                 adjustedNewVal = DefaultTypeTransformation.castToType(ch, arrayComponentClass);
             }
         } else if (arrayComponentClass.isArray()) {

diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayPutAtMetaMethod.java
@@ -26,6 +26,7 @@
 import org.codehaus.groovy.runtime.callsite.CallSite;
 import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite;
 import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
+import org.codehaus.groovy.runtime.typehandling.ShortTypeHandling;
 
 public class ShortArrayPutAtMetaMethod extends ArrayPutAtMetaMethod {
     private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(short[].class);
@@ -42,7 +43,7 @@ public Object invoke(Object object, Object[] args) {
         Object newValue = args[1];
         if (!(newValue instanceof Short)) {
             if (newValue instanceof Character || newValue instanceof String || newValue instanceof GString) {
-                Character ch = DefaultTypeTransformation.getCharFromSizeOneString(newValue);
+                Character ch = ShortTypeHandling.castToChar(newValue);
                 objects[index] = (Short) DefaultTypeTransformation.castToType(ch, Short.class);
             } else {
                 objects[index] = ((Number) newValue).shortValue();

diff --git a/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java b/src/main/java/org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java
@@ -1668,7 +1668,7 @@ private static ClassNode extractType(GenericsType gt) {
 
             if (gt.getLowerBound() != null) {
                 cn = gt.getLowerBound();
-            } else if (asBoolean(gt.getUpperBounds())) {
+            } else if (ArrayGroovyMethods.asBoolean(gt.getUpperBounds())) {
                 cn = gt.getUpperBounds()[0];
             }
         }