This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 457ca9b2f61ea6279aa948bf6e3a61c6d2fb1eab Author: Paul King <[email protected]> AuthorDate: Thu Dec 5 06:33:51 2024 +1000 minor refactor: remove deprecated code usage --- .../groovy/runtime/dgmimpl/arrays/CharacterArrayPutAtMetaMethod.java | 4 ++-- .../groovy/runtime/dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java | 3 ++- .../groovy/runtime/dgmimpl/arrays/FloatArrayPutAtMetaMethod.java | 3 ++- .../groovy/runtime/dgmimpl/arrays/IntegerArrayPutAtMetaMethod.java | 3 ++- .../groovy/runtime/dgmimpl/arrays/LongArrayPutAtMetaMethod.java | 3 ++- .../groovy/runtime/dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java | 5 +++-- .../groovy/runtime/dgmimpl/arrays/ShortArrayPutAtMetaMethod.java | 3 ++- .../org/codehaus/groovy/transform/stc/StaticTypeCheckingSupport.java | 2 +- 8 files changed, 16 insertions(+), 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 index 88fb05bea1..c8c122a6ec 100644 --- 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.CachedClass; 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 class CharacterArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { 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 index e3db4a9fda..95cebd9beb 100644 --- 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.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 DoubleArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(double[].class); @@ -42,7 +43,7 @@ public class DoubleArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { 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 index 5cb0abcaec..428b7a82da 100644 --- 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.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 FloatArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(float[].class); @@ -42,7 +43,7 @@ public class FloatArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { 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 index 2424e9aa5b..c8353c6b1a 100644 --- 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.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 IntegerArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(int[].class); @@ -42,7 +43,7 @@ public class IntegerArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { 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 index 6e8afff874..112cdadfe4 100644 --- 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.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 LongArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(long[].class); @@ -42,7 +43,7 @@ public class LongArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { 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 index 992ee72207..538624c5f2 100644 --- 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.reflection.CachedClass; 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 @@ public class ObjectArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { 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 index aad4e9a29a..295645e64f 100644 --- 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.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 ShortArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass ARRAY_CLASS = ReflectionCache.getCachedClass(short[].class); @@ -42,7 +43,7 @@ public class ShortArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { 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 index 1530e0ab24..4867825693 100644 --- 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 @@ public abstract class StaticTypeCheckingSupport { if (gt.getLowerBound() != null) { cn = gt.getLowerBound(); - } else if (asBoolean(gt.getUpperBounds())) { + } else if (ArrayGroovyMethods.asBoolean(gt.getUpperBounds())) { cn = gt.getUpperBounds()[0]; } }
