From 63e6da9f8540a99c2d3b2eb261db2e336ac0707f Mon Sep 17 00:00:00 2001 From: Jochen Theodorou Date: Fri, 18 Aug 2023 20:13:18 +0200 Subject: [PATCH] GROOVY-11158: deprecate callsite code --- src/main/java/groovy/lang/ExpandoMetaClass.java | 5 +++++ src/main/java/groovy/lang/MetaClassImpl.java | 7 +++++++ .../java/org/codehaus/groovy/reflection/CachedClass.java | 3 +++ .../org/codehaus/groovy/reflection/CachedMethod.java | 3 +++ .../groovy/runtime/callsite/AbstractCallSite.java | 1 + .../runtime/callsite/BooleanClosureForMapPredicate.java | 1 + .../groovy/runtime/callsite/BooleanClosurePredicate.java | 1 + .../groovy/runtime/callsite/BooleanClosureWrapper.java | 7 ++++--- .../runtime/callsite/BooleanReturningMethodInvoker.java | 9 +++++---- .../org/codehaus/groovy/runtime/callsite/CallSite.java | 2 +- .../codehaus/groovy/runtime/callsite/CallSiteArray.java | 1 + .../groovy/runtime/callsite/CallSiteAwareMetaMethod.java | 2 +- .../groovy/runtime/callsite/CallSiteClassLoader.java | 1 + .../groovy/runtime/callsite/CallSiteGenerator.java | 1 + .../runtime/callsite/ClassMetaClassGetPropertySite.java | 2 +- .../runtime/callsite/ConstructorMetaClassSite.java | 1 + .../runtime/callsite/ConstructorMetaMethodSite.java | 1 + .../groovy/runtime/callsite/ConstructorSite.java | 2 ++ .../codehaus/groovy/runtime/callsite/DummyCallSite.java | 1 + .../runtime/callsite/GetEffectivePogoFieldSite.java | 1 + .../runtime/callsite/GetEffectivePogoPropertySite.java | 1 + .../runtime/callsite/GetEffectivePojoFieldSite.java | 1 + .../runtime/callsite/GetEffectivePojoPropertySite.java | 1 + .../runtime/callsite/MetaClassConstructorSite.java | 1 + .../codehaus/groovy/runtime/callsite/MetaClassSite.java | 1 + .../codehaus/groovy/runtime/callsite/MetaMethodSite.java | 1 + .../codehaus/groovy/runtime/callsite/NullCallSite.java | 3 ++- .../runtime/callsite/PerInstancePojoMetaClassSite.java | 3 ++- .../runtime/callsite/PlainObjectMetaMethodSite.java | 1 + .../groovy/runtime/callsite/PogoGetPropertySite.java | 1 + .../groovy/runtime/callsite/PogoInterceptableSite.java | 1 + .../runtime/callsite/PogoMetaClassGetPropertySite.java | 1 + .../groovy/runtime/callsite/PogoMetaClassSite.java | 1 + .../groovy/runtime/callsite/PogoMetaMethodSite.java | 1 + .../runtime/callsite/PojoMetaClassGetPropertySite.java | 1 + .../groovy/runtime/callsite/PojoMetaClassSite.java | 1 + .../groovy/runtime/callsite/PojoMetaMethodSite.java | 1 + .../groovy/runtime/callsite/StaticMetaClassSite.java | 1 + .../groovy/runtime/callsite/StaticMetaMethodSite.java | 1 + .../codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java | 1 + .../groovy/runtime/dgmimpl/NumberNumberMetaMethod.java | 1 + .../groovy/runtime/dgmimpl/NumberNumberMinus.java | 1 + .../groovy/runtime/dgmimpl/NumberNumberMultiply.java | 1 + .../groovy/runtime/dgmimpl/NumberNumberPlus.java | 1 + .../runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java | 1 + .../groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java | 1 + .../runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java | 1 + .../dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java | 1 + .../dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java | 1 + .../runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java | 1 + .../runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java | 1 + .../dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java | 1 + .../dgmimpl/arrays/CharacterArrayPutAtMetaMethod.java | 1 + .../dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java | 1 + .../dgmimpl/arrays/DoubleArrayPutAtMetaMethod.java | 1 + .../dgmimpl/arrays/FloatArrayGetAtMetaMethod.java | 1 + .../dgmimpl/arrays/FloatArrayPutAtMetaMethod.java | 1 + .../dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java | 1 + .../dgmimpl/arrays/IntegerArrayPutAtMetaMethod.java | 1 + .../runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java | 1 + .../runtime/dgmimpl/arrays/LongArrayPutAtMetaMethod.java | 1 + .../dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java | 1 + .../dgmimpl/arrays/ObjectArrayPutAtMetaMethod.java | 1 + .../dgmimpl/arrays/ShortArrayGetAtMetaMethod.java | 1 + .../dgmimpl/arrays/ShortArrayPutAtMetaMethod.java | 1 + .../groovy/runtime/metaclass/ClosureMetaClass.java | 3 +++ 66 files changed, 92 insertions(+), 12 deletions(-) diff --git a/src/main/java/groovy/lang/ExpandoMetaClass.java b/src/main/java/groovy/lang/ExpandoMetaClass.java index c6905bbff3b..520f4b5bf6d 100644 --- a/src/main/java/groovy/lang/ExpandoMetaClass.java +++ b/src/main/java/groovy/lang/ExpandoMetaClass.java @@ -1316,6 +1316,7 @@ public boolean isSetter(String name, CachedClass[] args) { } @Override + @Deprecated public CallSite createPojoCallSite(CallSite site, Object receiver, Object[] args) { if (invokeMethodMethod != null) return new PojoMetaClassSite(site, this); @@ -1324,6 +1325,7 @@ public CallSite createPojoCallSite(CallSite site, Object receiver, Object[] args } @Override + @Deprecated public CallSite createStaticSite(CallSite site, Object[] args) { if (invokeStaticMethodMethod != null) return new StaticMetaClassSite(site, this); @@ -1335,12 +1337,14 @@ public CallSite createStaticSite(CallSite site, Object[] args) { public boolean hasCustomStaticInvokeMethod() {return invokeStaticMethodMethod!=null; } @Override + @Deprecated public CallSite createPogoCallSite(CallSite site, Object[] args) { if (invokeMethodMethod != null) return new PogoMetaClassSite(site, this); return super.createPogoCallSite(site, args); } + @Deprecated public CallSite createPogoCallCurrentSite(CallSite site, Class sender, String name, Object[] args) { if (invokeMethodMethod != null) return new PogoMetaClassSite(site, this); @@ -1356,6 +1360,7 @@ public MetaMethod retrieveConstructor(Object[] args) { } @Override + @Deprecated public CallSite createConstructorSite(CallSite site, Object[] args) { Class[] params = MetaClassHelper.convertToTypeArray(args); MetaMethod method = pickMethod(GROOVY_CONSTRUCTOR, params); diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java index 43f235bce61..3908db30faa 100644 --- a/src/main/java/groovy/lang/MetaClassImpl.java +++ b/src/main/java/groovy/lang/MetaClassImpl.java @@ -3414,6 +3414,7 @@ protected void dropMethodCache(String name) { /** * Create a CallSite */ + @Deprecated public CallSite createPojoCallSite(CallSite site, Object receiver, Object[] args) { if (!(this instanceof AdaptingMetaClass)) { Class[] params = MetaClassHelper.convertToTypeArray(args); @@ -3427,6 +3428,7 @@ public CallSite createPojoCallSite(CallSite site, Object receiver, Object[] args /** * Create a CallSite */ + @Deprecated public CallSite createStaticSite(CallSite site, Object[] args) { if (!(this instanceof AdaptingMetaClass)) { Class[] params = MetaClassHelper.convertToTypeArray(args); @@ -3440,6 +3442,7 @@ public CallSite createStaticSite(CallSite site, Object[] args) { /** * Create a CallSite */ + @Deprecated public CallSite createPogoCallSite(CallSite site, Object[] args) { if (!GroovyCategorySupport.hasCategoryInCurrentThread() && !(this instanceof AdaptingMetaClass)) { Class[] params = MetaClassHelper.convertToTypeArray(args); @@ -3462,6 +3465,7 @@ public CallSite createPogoCallSite(CallSite site, Object[] args) { /** * Create a CallSite */ + @Deprecated public CallSite createPogoCallCurrentSite(CallSite site, Class sender, Object[] args) { if (!GroovyCategorySupport.hasCategoryInCurrentThread() && !(this instanceof AdaptingMetaClass)) { Class[] params = MetaClassHelper.convertToTypeArray(args); @@ -3475,6 +3479,7 @@ public CallSite createPogoCallCurrentSite(CallSite site, Class sender, Object[] /** * Create a CallSite */ + @Deprecated public CallSite createConstructorSite(CallSite site, Object[] args) { if (!(this instanceof AdaptingMetaClass)) { Class[] argTypes = MetaClassHelper.convertToTypeArray(args); @@ -3967,10 +3972,12 @@ private enum InvokeMethodResult { NONE } + @Deprecated public boolean isPermissivePropertyAccess() { return permissivePropertyAccess; } + @Deprecated public void setPermissivePropertyAccess(boolean permissivePropertyAccess) { this.permissivePropertyAccess = permissivePropertyAccess; } diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java index 52f215d6ae6..b5de898186a 100644 --- a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java +++ b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java @@ -135,6 +135,7 @@ public CachedMethod[] initValue() { } }; + @Deprecated private final LazyReference callSiteClassLoader = new LazyReference(softBundle) { private static final long serialVersionUID = 4410385968428074090L; @@ -276,6 +277,7 @@ public CachedConstructor[] getConstructors() { return constructors.get(); } + @Deprecated public CachedMethod searchMethods(String name, CachedClass[] parameterTypes) { CachedMethod[] methods = getMethods(); @@ -484,6 +486,7 @@ public boolean isDirectlyAssignable(Object argument) { return ReflectionCache.isAssignableFrom(getTheClass(), argument.getClass()); } + @Deprecated public CallSiteClassLoader getCallSiteLoader() { return callSiteClassLoader.get(); } diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java b/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java index d0cb91e451b..f0d45b54c6f 100644 --- a/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java +++ b/src/main/java/org/codehaus/groovy/reflection/CachedMethod.java @@ -234,6 +234,7 @@ public void setTransformedMethod(final CachedMethod transformedMethod) { //-------------------------------------------------------------------------- + @Deprecated public CallSite createPogoMetaMethodSite(final CallSite site, final MetaClassImpl metaClass, final Class[] params) { if (!skipCompiled) { Constructor ctor = deref(pogoCallSiteConstructor); @@ -262,6 +263,7 @@ public CallSite createPogoMetaMethodSite(final CallSite site, final MetaClassImp return new PogoMetaMethodSite.PogoCachedMethodSiteNoUnwrapNoCoerce(site, metaClass, this, params); } + @Deprecated public CallSite createPojoMetaMethodSite(final CallSite site, final MetaClassImpl metaClass, final Class[] params) { if (!skipCompiled) { Constructor ctor = deref(pojoCallSiteConstructor); @@ -290,6 +292,7 @@ public CallSite createPojoMetaMethodSite(final CallSite site, final MetaClassImp return new PojoMetaMethodSite.PojoCachedMethodSiteNoUnwrapNoCoerce(site, metaClass, this, params); } + @Deprecated public CallSite createStaticMetaMethodSite(final CallSite site, final MetaClassImpl metaClass, final Class[] params) { if (!skipCompiled) { Constructor ctor = deref(staticCallSiteConstructor); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java index e191fdd6e07..141b64c433b 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/AbstractCallSite.java @@ -39,6 +39,7 @@ /** * Base class for all call sites. */ +@Deprecated public class AbstractCallSite implements CallSite { protected final int index; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureForMapPredicate.java b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureForMapPredicate.java index 5d97a06b040..4a7c0590195 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureForMapPredicate.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureForMapPredicate.java @@ -28,6 +28,7 @@ * This creates a Predicate by calling a {@link Closure} and converting the result to a boolean. * {@link BooleanReturningMethodInvoker} is used for caching. */ +@Deprecated public class BooleanClosureForMapPredicate implements Predicate> { private final BooleanReturningMethodInvoker bmi; private final Closure wrapped; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosurePredicate.java b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosurePredicate.java index 2ad3b3e9db7..90e6300691f 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosurePredicate.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosurePredicate.java @@ -27,6 +27,7 @@ * This creates a Predicate by calling a {@link Closure} and converting the result to a boolean. * {@link BooleanReturningMethodInvoker} is used for caching. */ +@Deprecated public class BooleanClosurePredicate implements Predicate { private final BooleanReturningMethodInvoker bmi; private final Closure wrapped; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java index 9ad34bb1ca7..0f8f7a97036 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanClosureWrapper.java @@ -24,16 +24,17 @@ import java.util.Map.Entry; /** - * Helper class for internal use only. This allows to call a {@link Closure} and + * Helper class for internal use only. This allows to call a {@link Closure} and * convert the result to a boolean. It will do this by caching the possible "doCall" - * as well as the "asBoolean" in CallSiteArray fashion. "asBoolean" will not be + * as well as the "asBoolean" in CallSiteArray fashion. "asBoolean" will not be * called if the result is null or a Boolean. In case of null we return false and - * in case of a Boolean we simply unbox. This logic is designed after the one present + * in case of a Boolean we simply unbox. This logic is designed after the one present * in {@link org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation#castToBoolean(Object)}. The purpose of * this class is to avoid the slow "asBoolean" call in that method. * {@link BooleanReturningMethodInvoker} is used for caching. * */ +@Deprecated public class BooleanClosureWrapper { private final BooleanReturningMethodInvoker bmi; private final Closure wrapped; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java index 171d30541f5..e27eedac93f 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/BooleanReturningMethodInvoker.java @@ -23,15 +23,16 @@ /** * Helper class for internal use only. This allows to call a given method and * convert the result to a boolean. It will do this by caching the method call - * as well as the "asBoolean" in {@link CallSiteArray} fashion. "asBoolean" will not be + * as well as the "asBoolean" in {@link CallSiteArray} fashion. "asBoolean" will not be * called if the result is null or a Boolean. In case of null we return false and - * in case of a Boolean we simply unbox. This logic is designed after the one present + * in case of a Boolean we simply unbox. This logic is designed after the one present * in {@link org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation#castToBoolean(Object)}. The purpose of - * this class is to avoid the slow "asBoolean" call in that method. - * + * this class is to avoid the slow "asBoolean" call in that method. + * * The nature of this class allows a per instance caching instead of a per class * caching like the normal {@link CallSiteArray} logic. */ +@Deprecated public class BooleanReturningMethodInvoker { private final CallSiteArray csa; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSite.java index 7382dad9f21..b00c20d93ce 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSite.java @@ -20,7 +20,7 @@ import groovy.lang.GroovyObject; - +@Deprecated public interface CallSite { CallSiteArray getArray(); int getIndex(); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteArray.java b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteArray.java index cecdac37852..c834b214f22 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteArray.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteArray.java @@ -29,6 +29,7 @@ import java.security.PrivilegedAction; import java.util.stream.IntStream; +@Deprecated public final class CallSiteArray { public static final Object[] NOPARAM = new Object[0]; public final CallSite[] array; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteAwareMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteAwareMetaMethod.java index 42fa7641a12..5489743c870 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteAwareMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteAwareMetaMethod.java @@ -20,7 +20,7 @@ import groovy.lang.MetaClassImpl; import groovy.lang.MetaMethod; - +@Deprecated public abstract class CallSiteAwareMetaMethod extends MetaMethod{ public abstract CallSite createPojoCallSite(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params, Object receiver, Object[] args); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java index dcf9a07195b..5573038b8f4 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteClassLoader.java @@ -24,6 +24,7 @@ import java.util.HashSet; import java.util.Set; +@Deprecated public class CallSiteClassLoader extends ClassLoaderForClassArtifacts { private static final Set KNOWN_CLASSES = new HashSet(); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java index 643c08467f1..e66da4fcbfb 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/CallSiteGenerator.java @@ -32,6 +32,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; +@Deprecated public class CallSiteGenerator { private CallSiteGenerator() { diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java index 7dde456c1ed..bac3df6bda8 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ClassMetaClassGetPropertySite.java @@ -22,7 +22,7 @@ import groovy.lang.MetaClass; import org.codehaus.groovy.reflection.ClassInfo; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; - +@Deprecated class ClassMetaClassGetPropertySite extends AbstractCallSite { final MetaClass metaClass; private final Class aClass; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java index bb1ec595b37..05b0742712a 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaClassSite.java @@ -22,6 +22,7 @@ import groovy.lang.MetaClass; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +@Deprecated public class ConstructorMetaClassSite extends MetaClassSite { public ConstructorMetaClassSite(CallSite site, MetaClass metaClass) { super(site, metaClass); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java index 0dda86c5557..9cdb61d1e8b 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorMetaMethodSite.java @@ -29,6 +29,7 @@ * metaclass - cached * method - not cached */ +@Deprecated public class ConstructorMetaMethodSite extends MetaMethodSite { private final int version; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java index 7e9a5be5d94..570e12ba160 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java @@ -26,6 +26,7 @@ import java.util.Map; +@Deprecated public class ConstructorSite extends MetaClassSite { final CachedConstructor constructor; final Class[] params; @@ -57,6 +58,7 @@ protected final boolean checkCall(Object receiver, Object[] args) { && MetaClassHelper.sameClasses(params, args); } + @Deprecated public static ConstructorSite createConstructorSite(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class[] params, Object[] args) { if (constructor.correctArguments(args) == args) { if (noWrappers(args)) { diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/DummyCallSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/DummyCallSite.java index 584de05ef0f..a5ba4636cd7 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/DummyCallSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/DummyCallSite.java @@ -18,6 +18,7 @@ */ package org.codehaus.groovy.runtime.callsite; +@Deprecated public class DummyCallSite extends AbstractCallSite { public DummyCallSite(CallSiteArray array, int index, String name) { super(array, index,name); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java index b345cbe61c7..012776bbddf 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePogoFieldSite.java @@ -23,6 +23,7 @@ import org.codehaus.groovy.reflection.CachedField; import org.codehaus.groovy.runtime.GroovyCategorySupport; +@Deprecated public class GetEffectivePogoFieldSite extends AbstractCallSite { private final MetaClass metaClass; private final CachedField effective; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java index 39f5d5bb369..8834a7b1cbf 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePogoPropertySite.java @@ -30,6 +30,7 @@ * Date: May 21, 2008 * Time: 10:37:37 AM */ +@Deprecated class GetEffectivePogoPropertySite extends AbstractCallSite { private final MetaClass metaClass; private final MetaProperty effective; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java index 2e8a698e68a..3b6ab307c48 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePojoFieldSite.java @@ -22,6 +22,7 @@ import org.codehaus.groovy.reflection.CachedField; import org.codehaus.groovy.runtime.GroovyCategorySupport; +@Deprecated class GetEffectivePojoFieldSite extends AbstractCallSite { private final MetaClassImpl metaClass; private final CachedField effective; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java index da2f73ddf86..d19510541a4 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/GetEffectivePojoPropertySite.java @@ -24,6 +24,7 @@ import org.codehaus.groovy.runtime.GroovyCategorySupport; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +@Deprecated public class GetEffectivePojoPropertySite extends AbstractCallSite { private final MetaClassImpl metaClass; private final MetaProperty effective; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java index d6535957ab9..903f3f6f515 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassConstructorSite.java @@ -28,6 +28,7 @@ * metaclass - cached * method - not cached */ +@Deprecated public class MetaClassConstructorSite extends MetaClassSite { private final ClassInfo classInfo; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassSite.java index 480ce305e34..109e055e989 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaClassSite.java @@ -23,6 +23,7 @@ /** * Call site which holds reference to metaclass. */ +@Deprecated public abstract class MetaClassSite extends AbstractCallSite { protected final MetaClass metaClass; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaMethodSite.java index e115e8f7276..8d3dc1ad759 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/MetaMethodSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/MetaMethodSite.java @@ -24,6 +24,7 @@ /** * Call site which caches meta method */ +@Deprecated public abstract class MetaMethodSite extends MetaClassSite { final MetaMethod metaMethod; protected final Class[] params; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/NullCallSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/NullCallSite.java index 4c5bde5c08b..31c243b0781 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/NullCallSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/NullCallSite.java @@ -23,6 +23,7 @@ import org.codehaus.groovy.runtime.NullObject; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +@Deprecated public final class NullCallSite extends AbstractCallSite { public NullCallSite(CallSite callSite) { super(callSite); @@ -53,4 +54,4 @@ public Object getProperty(Object receiver) throws Throwable { return acceptGetProperty(receiver).getProperty(receiver); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java index 7f9cbece526..620b5c9a80f 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PerInstancePojoMetaClassSite.java @@ -23,6 +23,7 @@ import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +@Deprecated public class PerInstancePojoMetaClassSite extends AbstractCallSite{ private final ClassInfo info; @@ -43,4 +44,4 @@ public Object call(Object receiver, Object[] args) throws Throwable { return CallSiteArray.defaultCall(this, receiver, args); } } -} \ No newline at end of file +} diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PlainObjectMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PlainObjectMetaMethodSite.java index 3a8ffd04e26..d5f6c6962fc 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PlainObjectMetaMethodSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PlainObjectMetaMethodSite.java @@ -33,6 +33,7 @@ * method - cached * */ +@Deprecated public abstract class PlainObjectMetaMethodSite extends MetaMethodSite { public PlainObjectMetaMethodSite(CallSite site, MetaClass metaClass, MetaMethod metaMethod, Class[] params) { super(site, metaClass, metaMethod, params); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java index 3cb5b830640..d8383acfa65 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoGetPropertySite.java @@ -22,6 +22,7 @@ import groovy.lang.GroovyRuntimeException; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +@Deprecated public class PogoGetPropertySite extends AbstractCallSite { private final Class aClass; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java index 25291a8d372..05d34445b0b 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoInterceptableSite.java @@ -26,6 +26,7 @@ /** * Call site for GroovyInterceptable */ +@Deprecated public class PogoInterceptableSite extends AbstractCallSite { public PogoInterceptableSite(CallSite site) { super(site); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java index 022ac7d7462..90c0bcf466c 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaClassGetPropertySite.java @@ -23,6 +23,7 @@ import groovy.lang.MetaClass; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +@Deprecated public class PogoMetaClassGetPropertySite extends AbstractCallSite { private final MetaClass metaClass; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java index 4ecb003dce0..5f5ea341fc8 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaClassSite.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; import org.codehaus.groovy.runtime.metaclass.MissingMethodExecutionFailed; +@Deprecated public class PogoMetaClassSite extends MetaClassSite { public PogoMetaClassSite(final CallSite site, final MetaClass metaClass) { diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java index 04ca90d8043..d1b9bb2c56a 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PogoMetaMethodSite.java @@ -36,6 +36,7 @@ * metaclass - cached * method - cached */ +@Deprecated public class PogoMetaMethodSite extends PlainObjectMetaMethodSite { private static final VMPlugin VM_PLUGIN = VMPluginFactory.getPlugin(); private final int version; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassGetPropertySite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassGetPropertySite.java index 58ab7083ccc..f0b55ed58c9 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassGetPropertySite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassGetPropertySite.java @@ -22,6 +22,7 @@ import org.codehaus.groovy.runtime.InvokerHelper; import org.codehaus.groovy.runtime.ScriptBytecodeAdapter; +@Deprecated public class PojoMetaClassGetPropertySite extends AbstractCallSite { public PojoMetaClassGetPropertySite(CallSite parent) { super(parent); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java index 03d59dcdef9..775a993642f 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaClassSite.java @@ -28,6 +28,7 @@ * metaclass - cached * method - not cached */ +@Deprecated public class PojoMetaClassSite extends MetaClassSite { private final ClassInfo classInfo; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java index 3bf972f957e..108609475fa 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/PojoMetaMethodSite.java @@ -36,6 +36,7 @@ * metaclass - cached * method - cached */ +@Deprecated public class PojoMetaMethodSite extends PlainObjectMetaMethodSite { private static final VMPlugin VM_PLUGIN = VMPluginFactory.getPlugin(); diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java index 59f2678d329..f9cb2508710 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaClassSite.java @@ -28,6 +28,7 @@ * metaclass - cached * method - not cached */ +@Deprecated public class StaticMetaClassSite extends MetaClassSite { private final ClassInfo classInfo; diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java index 2af8e69d3b7..f8c36ca1f7d 100644 --- a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java +++ b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java @@ -30,6 +30,7 @@ * metaclass - cached * method - cached */ +@Deprecated public class StaticMetaMethodSite extends MetaMethodSite { private final int version; diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java index c431f9b843b..4f88feb460b 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberDiv.java @@ -23,6 +23,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.typehandling.NumberMath; +@Deprecated public final class NumberNumberDiv extends NumberNumberMetaMethod { @Override public String getName() { diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java index 57f2cd5f788..0f2e91a985b 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMetaMethod.java @@ -29,6 +29,7 @@ import java.lang.reflect.Modifier; +@Deprecated public abstract class NumberNumberMetaMethod extends CallSiteAwareMetaMethod { private static final CachedClass NUMBER_CLASS = ReflectionCache.getCachedClass(Number.class); private static final CachedClass [] NUMBER_CLASS_ARR = new CachedClass[] { NUMBER_CLASS }; diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java index 6e54576cb8b..84c6d9e3cb4 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMinus.java @@ -23,6 +23,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.typehandling.NumberMath; +@Deprecated public final class NumberNumberMinus extends NumberNumberMetaMethod { @Override public String getName() { diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java index 2adae511d7f..1c490c5750c 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberMultiply.java @@ -23,6 +23,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.typehandling.NumberMath; +@Deprecated public final class NumberNumberMultiply extends NumberNumberMetaMethod { @Override public String getName() { diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberPlus.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberPlus.java index 605c61efc19..c8764014125 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberPlus.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/NumberNumberPlus.java @@ -23,6 +23,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.typehandling.NumberMath; +@Deprecated public final class NumberNumberPlus extends NumberNumberMetaMethod { @Override public String getName() { diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java index 7994b4e3f97..0562e5f82e9 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayGetAtMetaMethod.java @@ -18,6 +18,7 @@ */ package org.codehaus.groovy.runtime.dgmimpl.arrays; +@Deprecated public abstract class ArrayGetAtMetaMethod extends ArrayMetaMethod { protected ArrayGetAtMetaMethod() { parameterTypes = INTEGER_CLASS_ARR; diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java index 630fe6f551c..4fe1d434c34 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayMetaMethod.java @@ -24,6 +24,7 @@ import java.lang.reflect.Modifier; +@Deprecated public abstract class ArrayMetaMethod extends CallSiteAwareMetaMethod { protected static final CachedClass INTEGER_CLASS = ReflectionCache.getCachedClass(Integer.class); protected static final CachedClass[] INTEGER_CLASS_ARR = new CachedClass[]{INTEGER_CLASS}; diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java index 41fa07027c8..0d63689d83e 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ArrayPutAtMetaMethod.java @@ -18,6 +18,7 @@ */ package org.codehaus.groovy.runtime.dgmimpl.arrays; +@Deprecated public abstract class ArrayPutAtMetaMethod extends ArrayMetaMethod { @Override public String getName() { diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java index 4244b2ad08e..44fb2b3f98f 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class BooleanArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(boolean[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java index 4739fd63833..2895141a448 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/BooleanArrayPutAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class BooleanArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass OBJECT_CLASS = ReflectionCache.OBJECT_CLASS; private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(boolean[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java index 4e5af49e70c..8c49850d556 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class ByteArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(byte[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java index 2c79b481d48..4236e36dcb9 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ByteArrayPutAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class ByteArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass OBJECT_CLASS = ReflectionCache.OBJECT_CLASS; private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(byte[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java index 482d3911b92..dfb704763a4 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/CharacterArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class CharacterArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(char[].class); 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 4371c47e8ce..7d6e9dc843d 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 @@ -26,6 +26,7 @@ import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +@Deprecated public class CharacterArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass OBJECT_CLASS = ReflectionCache.OBJECT_CLASS; private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(char[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java index 692abfbcefa..ccbaecb7982 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/DoubleArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class DoubleArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(double[].class); 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 f89a2d03a30..56e0d34eb19 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 @@ -27,6 +27,7 @@ import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +@Deprecated public class DoubleArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass OBJECT_CLASS = ReflectionCache.OBJECT_CLASS; private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(double[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayGetAtMetaMethod.java index 5caa586505b..c47bd005978 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/FloatArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class FloatArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(float[].class); 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 ebbf2e8f593..26bab287e4d 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 @@ -27,6 +27,7 @@ import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +@Deprecated public class FloatArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass OBJECT_CLASS = ReflectionCache.OBJECT_CLASS; private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(float[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java index 30c4ee5cf80..182f2b006b4 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/IntegerArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class IntegerArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(int[].class); 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 34f114d0ace..798dea746e4 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 @@ -27,6 +27,7 @@ import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +@Deprecated public class IntegerArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass OBJECT_CLASS = ReflectionCache.OBJECT_CLASS; private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(int[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java index f31ef1c7dc0..8f38fbceb9e 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/LongArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class LongArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(long[].class); 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 7d753728b76..d89718aeb9b 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 @@ -27,6 +27,7 @@ import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +@Deprecated public class LongArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass OBJECT_CLASS = ReflectionCache.OBJECT_CLASS; private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(long[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java index 011341f501a..cf95dda1a86 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ObjectArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class ObjectArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass OBJECT_ARR_CLASS = ReflectionCache.OBJECT_ARRAY_CLASS; 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 15e26e230f5..2c43eda52d9 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 @@ -29,6 +29,7 @@ import static org.codehaus.groovy.reflection.ReflectionCache.OBJECT_ARRAY_CLASS; import static org.codehaus.groovy.reflection.ReflectionCache.OBJECT_CLASS; +@Deprecated public class ObjectArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { public ObjectArrayPutAtMetaMethod() { diff --git a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayGetAtMetaMethod.java b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayGetAtMetaMethod.java index e85e212a70d..d5bf037d465 100644 --- a/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayGetAtMetaMethod.java +++ b/src/main/java/org/codehaus/groovy/runtime/dgmimpl/arrays/ShortArrayGetAtMetaMethod.java @@ -25,6 +25,7 @@ import org.codehaus.groovy.runtime.callsite.CallSite; import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; +@Deprecated public class ShortArrayGetAtMetaMethod extends ArrayGetAtMetaMethod { private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(short[].class); 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 6083b24153c..21f43be41bb 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 @@ -27,6 +27,7 @@ import org.codehaus.groovy.runtime.callsite.PojoMetaMethodSite; import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation; +@Deprecated public class ShortArrayPutAtMetaMethod extends ArrayPutAtMetaMethod { private static final CachedClass OBJECT_CLASS = ReflectionCache.OBJECT_CLASS; private static final CachedClass ARR_CLASS = ReflectionCache.getCachedClass(short[].class); diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java index 2ccaabfa20a..04d4b80b2f8 100644 --- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java +++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ClosureMetaClass.java @@ -637,16 +637,19 @@ public Constructor retrieveConstructor(final Class[] arguments) { } @Override + @Deprecated public CallSite createPojoCallSite(final CallSite site, final Object receiver, final Object[] args) { throw new UnsupportedOperationException(); } @Override + @Deprecated public CallSite createPogoCallSite(final CallSite site, final Object[] args) { return new PogoMetaClassSite(site, this); } @Override + @Deprecated public CallSite createPogoCallCurrentSite(final CallSite site, final Class sender, final Object[] args) { return new PogoMetaClassSite(site, this); }