Changed resolution order of method signatures to begin with a method'…

…s defined shape.
raphw · Jul 30, 2015 · 2b4a7b6 · 2b4a7b6
1 parent 2853a4a
commit 2b4a7b6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/MethodGraph.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/MethodGraph.java
@@ -408,7 +408,7 @@ public String toString() {
                 protected static class Identifying<V extends Identifier> extends Key<V> {
 
                     public static <Q extends Identifier> Key.Identifying<Q> of(MethodDescription methodDescription, Identifier.Factory<Q> factory) {
-                        return new Key.Identifying<Q>(methodDescription.getInternalName(), Collections.singleton(factory.wrap(methodDescription.asToken())));
+                        return new Key.Identifying<Q>(methodDescription.getInternalName(), Collections.singleton(factory.wrap(methodDescription.asDefined().asToken())));
                     }
 
                     protected Identifying(String internalName, V identifier) {
@@ -427,7 +427,7 @@ protected Key<MethodDescription.Token> asTokenKey() {
                         return new Key<MethodDescription.Token>(internalName, identifiers);
                     }
 
-                    protected Key.Identifying<V> expandWith(MethodDescription.InDefinedShape methodDescription, Identifier.Factory<V> factory) {
+                    protected Key.Identifying<V> expandWith(MethodDescription methodDescription, Identifier.Factory<V> factory) {
                         Set<V> keys = new HashSet<V>(this.identifiers);
                         keys.add(factory.wrap(methodDescription.asToken()));
                         return new Key.Identifying<V>(internalName, keys);
@@ -593,7 +593,7 @@ public Key.Identifying<U> getKey() {
 
                             @Override
                             public Entry<U> expandWith(MethodDescription methodDescription, Identifier.Factory<U> identifierFactory) {
-                                Key.Identifying<U> key = this.key.expandWith(methodDescription.asDefined(), identifierFactory);
+                                Key.Identifying<U> key = this.key.expandWith(methodDescription, identifierFactory);
                                 if (methodDescription.getDeclaringType().asRawType().equals(declaringType)) {
                                     return methodToken.isBridge() ^ methodDescription.isBridge()
                                             ? methodToken.isBridge() ? new ForMethod<U>(key, methodDescription) : new Ambiguous<U>(key, declaringType, methodToken)
@@ -725,7 +725,7 @@ protected ForMethod(Key.Identifying<U> key, MethodDescription methodDescription,
 
                             @Override
                             public Entry<U> expandWith(MethodDescription methodDescription, Identifier.Factory<U> identifierFactory) {
-                                Key.Identifying<U> key = this.key.expandWith(methodDescription.asDefined(), identifierFactory);
+                                Key.Identifying<U> key = this.key.expandWith(methodDescription, identifierFactory);
                                 return methodDescription.getDeclaringType().equals(this.methodDescription.getDeclaringType())
                                         ? Ambiguous.of(key, methodDescription, this.methodDescription)
                                         : new ForMethod<U>(key, methodDescription.isBridge() ? this.methodDescription : methodDescription, true);