From e02a2f997b9e5185dec6324eb32b909b6724db79 Mon Sep 17 00:00:00 2001
From: Rafael Winterhalter <rafael.wth@gmail.com>
Date: Sun, 20 Dec 2020 22:02:15 +0100
Subject: [PATCH] Add names for generated cache variables.

---
 .../java/net/bytebuddy/ClassFileVersion.java     |  2 +-
 .../src/main/java/net/bytebuddy/TypeCache.java   |  2 +-
 .../annotation/AnnotationDescription.java        |  4 ++--
 .../description/annotation/AnnotationValue.java  |  8 ++++----
 .../enumeration/EnumerationDescription.java      |  2 +-
 .../description/field/FieldDescription.java      |  6 +++---
 .../description/method/MethodDescription.java    |  8 ++++----
 .../description/method/ParameterDescription.java |  4 ++--
 .../type/RecordComponentDescription.java         |  2 +-
 .../description/type/TypeDescription.java        | 16 ++++++++--------
 .../description/type/TypeVariableToken.java      |  2 +-
 .../dynamic/scaffold/InstrumentedType.java       |  5 -----
 .../bytebuddy/implementation/Implementation.java |  2 +-
 .../main/java/net/bytebuddy/pool/TypePool.java   |  8 ++++----
 .../java/net/bytebuddy/utility/JavaType.java     |  4 ++--
 15 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
index 4d10625c63f..26548a7b204 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
@@ -275,7 +275,7 @@ public static ClassFileVersion ofJavaVersion(int javaVersion) {
      *
      * @return The currently running Java process's class file version.
      */
-    @CachedReturnPlugin.Enhance
+    @CachedReturnPlugin.Enhance("vm")
     public static ClassFileVersion ofThisVm() {
         return VERSION_LOCATOR.locate();
     }
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/TypeCache.java b/byte-buddy-dep/src/main/java/net/bytebuddy/TypeCache.java
index 25c950b9919..750323c6900 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/TypeCache.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/TypeCache.java
@@ -424,7 +424,7 @@ public SimpleKey(Collection<? extends Class<?>> types) {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             return types.hashCode();
         }
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java
index 4776e5edad2..8738db716a9 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationDescription.java
@@ -355,7 +355,7 @@ private boolean equalsRepresentation(Object self, Object other) {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = annotationType.hashCode();
             result = 31 * result + values.hashCode();
@@ -433,7 +433,7 @@ public boolean isDocumented() {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int hashCode = 0;
             for (MethodDescription.InDefinedShape methodDescription : getAnnotationType().getDeclaredMethods()) {
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationValue.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationValue.java
index c097f4c71f7..e082d02206f 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationValue.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/annotation/AnnotationValue.java
@@ -870,7 +870,7 @@ public AnnotationValue.Loaded<U> load(ClassLoader classLoader) {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             return propertyDelegate.hashCode(value);
         }
@@ -1359,7 +1359,7 @@ public boolean represents(Object value) {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 return propertyDelegate.hashCode(value);
             }
@@ -2143,7 +2143,7 @@ public AnnotationValue.Loaded<V> load(ClassLoader classLoader) {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = 1;
             for (AnnotationValue<?, ?> value : values) {
@@ -2254,7 +2254,7 @@ public boolean represents(Object value) {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 int result = 1;
                 for (AnnotationValue.Loaded<?> value : values) {
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/enumeration/EnumerationDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/enumeration/EnumerationDescription.java
index 9b04f99d965..bdc22c49278 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/enumeration/EnumerationDescription.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/enumeration/EnumerationDescription.java
@@ -64,7 +64,7 @@ public String getActualName() {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             return getValue().hashCode() + 31 * getEnumerationType().hashCode();
         }
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java
index ab97ff7c10f..1cd4f3c25b9 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/field/FieldDescription.java
@@ -192,7 +192,7 @@ public SignatureToken asSignatureToken() {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             return getDeclaringType().hashCode() + 31 * (17 + getName().hashCode());
         }
@@ -587,7 +587,7 @@ public SignatureToken asSignatureToken(TypeDescription declaringType) {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = name.hashCode();
             result = 31 * result + modifiers;
@@ -656,7 +656,7 @@ public TypeDescription getType() {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = name.hashCode();
             result = 31 * result + type.hashCode();
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java
index 1ddfc663c57..1e4e996e2d0 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/MethodDescription.java
@@ -839,7 +839,7 @@ public boolean isBridgeCompatible(TypeToken typeToken) {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int hashCode = 17 + getDeclaringType().hashCode();
             hashCode = 31 * hashCode + getInternalName().hashCode();
@@ -1918,7 +1918,7 @@ public SignatureToken asSignatureToken(TypeDescription declaringType) {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = name.hashCode();
             result = 31 * result + modifiers;
@@ -2038,7 +2038,7 @@ public TypeToken asTypeToken() {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = name.hashCode();
             result = 31 * result + returnType.hashCode();
@@ -2121,7 +2121,7 @@ public List<TypeDescription> getParameterTypes() {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = returnType.hashCode();
             result = 31 * result + parameterTypes.hashCode();
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java
index 178ec271947..2cf29c09059 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/method/ParameterDescription.java
@@ -187,7 +187,7 @@ public Token asToken(ElementMatcher<? super TypeDescription> matcher) {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             return getDeclaringMethod().hashCode() ^ getIndex();
         }
@@ -1254,7 +1254,7 @@ public Token accept(TypeDescription.Generic.Visitor<? extends TypeDescription.Ge
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = type.hashCode();
             result = 31 * result + annotations.hashCode();
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/RecordComponentDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/RecordComponentDescription.java
index e6ee073864b..9e5e8f14839 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/RecordComponentDescription.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/RecordComponentDescription.java
@@ -903,7 +903,7 @@ public Token accept(TypeDescription.Generic.Visitor<? extends TypeDescription.Ge
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             int result = name.hashCode();
             result = 31 * result + type.hashCode();
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java
index a10ee77c67f..19a8211cac7 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeDescription.java
@@ -3868,7 +3868,7 @@ public Iterator<TypeDefinition> iterator() {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 return asErasure().hashCode();
             }
@@ -4423,7 +4423,7 @@ public StackSize getStackSize() {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 return getSort().isNonGeneric()
                         ? asErasure().hashCode()
@@ -4716,7 +4716,7 @@ public StackSize getStackSize() {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 int lowerHash = 1, upperHash = 1;
                 for (Generic lowerBound : getLowerBounds()) {
@@ -5157,7 +5157,7 @@ public StackSize getStackSize() {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 int result = 1;
                 for (Generic typeArgument : getTypeArguments()) {
@@ -5756,7 +5756,7 @@ public Iterator<TypeDefinition> iterator() {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 return getTypeVariableSource().hashCode() ^ getSymbol().hashCode();
             }
@@ -6337,7 +6337,7 @@ public boolean represents(java.lang.reflect.Type type) {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 return resolve().hashCode();
             }
@@ -8174,7 +8174,7 @@ public Iterator<TypeDefinition> iterator() {
         }
 
         @Override
-        @CachedReturnPlugin.Enhance
+        @CachedReturnPlugin.Enhance("hashCode")
         public int hashCode() {
             return getName().hashCode();
         }
@@ -9260,7 +9260,7 @@ protected InternalNameLazyType(ClassLoader classLoader, String internalName) {
                 }
 
                 @Override
-                @CachedReturnPlugin.Enhance
+                @CachedReturnPlugin.Enhance("delegate")
                 protected TypeDescription delegate() {
                     try {
                         return ForLoadedType.of(Class.forName(getName(), false, classLoader));
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeVariableToken.java b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeVariableToken.java
index 6e7cd389dd3..24a53b4fff0 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeVariableToken.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/description/type/TypeVariableToken.java
@@ -115,7 +115,7 @@ public TypeVariableToken accept(TypeDescription.Generic.Visitor<? extends TypeDe
     }
 
     @Override
-    @CachedReturnPlugin.Enhance
+    @CachedReturnPlugin.Enhance("hashCode")
     public int hashCode() {
         int result = symbol.hashCode();
         result = 31 * result + bounds.hashCode();
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/InstrumentedType.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/InstrumentedType.java
index 1e7ae5a49c8..47056fe4611 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/InstrumentedType.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/InstrumentedType.java
@@ -1371,7 +1371,6 @@ public TypeDescription getDeclaringType() {
         /**
          * {@inheritDoc}
          */
-        @CachedReturnPlugin.Enhance
         public Generic getSuperClass() {
             return superClass == null
                     ? Generic.UNDEFINED
@@ -1381,7 +1380,6 @@ public Generic getSuperClass() {
         /**
          * {@inheritDoc}
          */
-        @CachedReturnPlugin.Enhance
         public TypeList.Generic getInterfaces() {
             return new TypeList.Generic.ForDetachedTypes.WithResolvedErasure(interfaceTypes, TypeDescription.Generic.Visitor.Substitutor.ForAttachment.of(this));
         }
@@ -1389,7 +1387,6 @@ public TypeList.Generic getInterfaces() {
         /**
          * {@inheritDoc}
          */
-        @CachedReturnPlugin.Enhance
         public FieldList<FieldDescription.InDefinedShape> getDeclaredFields() {
             return new FieldList.ForTokens(this, fieldTokens);
         }
@@ -1397,7 +1394,6 @@ public FieldList<FieldDescription.InDefinedShape> getDeclaredFields() {
         /**
          * {@inheritDoc}
          */
-        @CachedReturnPlugin.Enhance
         public MethodList<MethodDescription.InDefinedShape> getDeclaredMethods() {
             return new MethodList.ForTokens(this, methodTokens);
         }
@@ -1405,7 +1401,6 @@ public MethodList<MethodDescription.InDefinedShape> getDeclaredMethods() {
         /**
          * {@inheritDoc}
          */
-        @CachedReturnPlugin.Enhance
         public TypeList.Generic getTypeVariables() {
             return TypeList.Generic.ForDetachedTypes.attachVariables(this, typeVariables);
         }
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Implementation.java b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Implementation.java
index 996f4f209ea..bddc3b0c877 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Implementation.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/implementation/Implementation.java
@@ -191,7 +191,7 @@ public boolean isValid() {
             }
 
             @Override
-            @CachedReturnPlugin.Enhance
+            @CachedReturnPlugin.Enhance("hashCode")
             public int hashCode() {
                 return 31 * getMethodDescription().asSignatureToken().hashCode() + getTypeDescription().hashCode();
             }
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java b/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java
index 6a30d0312fc..c1af5b6069d 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java
@@ -6028,7 +6028,7 @@ public Loaded<V> load(ClassLoader classLoader) {
                 }
 
                 @Override
-                @CachedReturnPlugin.Enhance
+                @CachedReturnPlugin.Enhance("hashCode")
                 public int hashCode() {
                     return doResolve().hashCode();
                 }
@@ -6070,7 +6070,7 @@ private ForTypeValue(TypePool typePool, String typeName) {
                     }
 
                     @Override
-                    @CachedReturnPlugin.Enhance
+                    @CachedReturnPlugin.Enhance("resolved")
                     @SuppressWarnings("unchecked")
                     protected AnnotationValue<TypeDescription, Class<?>> doResolve() {
                         Resolution resolution = typePool.describe(typeName);
@@ -6107,7 +6107,7 @@ private ForAnnotationValue(TypePool typePool, AnnotationToken annotationToken) {
                     }
 
                     @Override
-                    @CachedReturnPlugin.Enhance
+                    @CachedReturnPlugin.Enhance("resolved")
                     protected AnnotationValue<AnnotationDescription, Annotation> doResolve() {
                         AnnotationToken.Resolution resolution = annotationToken.toAnnotationDescription(typePool);
                         if (!resolution.isResolved()) {
@@ -6154,7 +6154,7 @@ private ForEnumerationValue(TypePool typePool, String typeName, String value) {
                     }
 
                     @Override
-                    @CachedReturnPlugin.Enhance
+                    @CachedReturnPlugin.Enhance("resolved")
                     @SuppressWarnings("unchecked")
                     protected AnnotationValue<EnumerationDescription, Enum<?>> doResolve() {
                         Resolution resolution = typePool.describe(typeName);
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/JavaType.java b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/JavaType.java
index e42c8dde21f..b5566e1b4d3 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/JavaType.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/JavaType.java
@@ -224,7 +224,7 @@ public TypeDescription getTypeStub() {
      * @return A loaded type of this Java type.
      * @throws ClassNotFoundException If the represented type cannot be loaded.
      */
-    @CachedReturnPlugin.Enhance
+    @CachedReturnPlugin.Enhance("loaded")
     public Class<?> load() throws ClassNotFoundException {
         return Class.forName(typeDescription.getName(), false, ClassLoadingStrategy.BOOTSTRAP_LOADER);
     }
@@ -244,7 +244,7 @@ public TypeDescription loadAsDescription() throws ClassNotFoundException {
      *
      * @return {@code true} if this type is available on the current JVM.
      */
-    @CachedReturnPlugin.Enhance
+    @CachedReturnPlugin.Enhance("available")
     public boolean isAvailable() {
         try {
             load();