Skip bridge methods in contract parsing and map them for dispatch by AzazelSensei · Pull Request #3517 · OpenFeign/feign · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion core/src/main/java/feign/Contract.java
58 changes: 58 additions & 0 deletions core/src/main/java/feign/ReflectiveFeign.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,67 @@ public Map<Method, MethodHandler> apply(Target target, C requestContext) {
}
}

for (Method method : target.type().getMethods()) {
if (!method.isBridge()) {
continue;
}
Method bridged = resolveBridgedMethod(method);
MethodHandler handler = result.get(bridged);
if (handler != null) {
result.put(method, handler);
}
}

return result;
}

static Method resolveBridgedMethod(Method bridgeMethod) {
Method matched = null;
Class<?>[] bridgeParams = bridgeMethod.getParameterTypes();
for (Method candidate : bridgeMethod.getDeclaringClass().getDeclaredMethods()) {
if (candidate.isBridge()
|| candidate.isSynthetic()
|| !candidate.getName().equals(bridgeMethod.getName())
|| candidate.getParameterCount() != bridgeParams.length) {
continue;
}
Class<?>[] candidateParams = candidate.getParameterTypes();
boolean paramsMatch = true;
for (int i = 0; i < bridgeParams.length; i++) {
if (!bridgeParams[i].isAssignableFrom(candidateParams[i])) {
paramsMatch = false;
break;
}
}
if (!paramsMatch) {
continue;
}
Class<?> bridgeReturn = bridgeMethod.getReturnType();
Class<?> candidateReturn = candidate.getReturnType();
if (bridgeReturn != void.class && !bridgeReturn.isAssignableFrom(candidateReturn)) {
continue;
}
if (matched == null || isMoreSpecific(candidate, matched)) {
matched = candidate;
}
}
return matched != null ? matched : bridgeMethod;
}

private static boolean isMoreSpecific(Method candidate, Method current) {
Class<?>[] candidateParams = candidate.getParameterTypes();
Class<?>[] currentParams = current.getParameterTypes();
for (int i = 0; i < candidateParams.length; i++) {
if (candidateParams[i] != currentParams[i]
&& currentParams[i].isAssignableFrom(candidateParams[i])) {
return true;
}
}
Class<?> candidateReturn = candidate.getReturnType();
Class<?> currentReturn = current.getReturnType();
return candidateReturn != currentReturn && currentReturn.isAssignableFrom(candidateReturn);
}

private MethodHandler createMethodHandler(
final Target<?> target, final MethodMetadata md, final C requestContext) {
if (md.isIgnored()) {
Expand Down
70 changes: 70 additions & 0 deletions core/src/test/java/feign/BridgeMethodTest.java