Skip to content

Use binary class name to resolve per-class HTTP interface fallbacks #1715

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HDPark95 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use binary class name to resolve per-class HTTP interface fallbacks #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...ramework/cloud/client/circuitbreaker/httpservice/CircuitBreakerRequestValueProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void process(Method method, MethodParameter[] parameters, @Nullable Objec
builder.addAttribute(PARAMETER_TYPES_ATTRIBUTE_NAME, method.getParameterTypes());
builder.addAttribute(ARGUMENTS_ATTRIBUTE_NAME, arguments);
builder.addAttribute(RETURN_TYPE_ATTRIBUTE_NAME, method.getReturnType());
builder.addAttribute(DECLARING_CLASS_ATTRIBUTE_NAME, method.getDeclaringClass().getCanonicalName());
builder.addAttribute(DECLARING_CLASS_ATTRIBUTE_NAME, method.getDeclaringClass().getName());
}

}
33 changes: 33 additions & 0 deletions ...ramework/cloud/client/circuitbreaker/httpservice/CircuitBreakerAdapterDecoratorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.cloud.client.circuitbreaker.httpservice;

import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Function;
Expand All @@ -24,6 +25,8 @@

import org.springframework.cloud.client.circuitbreaker.CircuitBreaker;
import org.springframework.cloud.client.circuitbreaker.NoFallbackAvailableException;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpMethod;
import org.springframework.web.service.invoker.HttpExchangeAdapter;
import org.springframework.web.service.invoker.HttpRequestValues;

Expand Down Expand Up @@ -128,4 +131,34 @@ void shouldThrowExceptionWhenNoFallbackAvailable() {
.isThrownBy(() -> fallbackHandler.apply(new RuntimeException("test")));
}

// Fallback classes are registered per service under Class#getName() (binary name),
// so the declaring-class attribute written by the processor must use the same form.
// For a nested @HttpExchange interface getName() ("Outer$Inner") differs from
// getCanonicalName() ("Outer.Inner"), which used to leave the per-class fallback
// unresolved and fall through to NoFallbackAvailableException.
@Test
void shouldResolvePerClassFallbackForNestedServiceInterface() throws NoSuchMethodException {
Method method = NestedTestService.class.getMethod("test", String.class, Integer.class);
HttpRequestValues.Builder builder = HttpRequestValues.builder();
new CircuitBreakerRequestValueProcessor().process(method, new MethodParameter[0],
new Object[] { "testDescription", 5 }, builder);
builder.setHttpMethod(HttpMethod.GET);
builder.setUriTemplate("/test");
Map<String, Object> attributes = builder.build().getAttributes();
CircuitBreakerAdapterDecorator nestedDecorator = new CircuitBreakerAdapterDecorator(adapter, circuitBreaker,
Map.of(NestedTestService.class.getName(), Fallbacks.class));
when(httpRequestValues.getAttributes()).thenReturn(attributes);
Function<Throwable, Object> fallbackHandler = nestedDecorator.createFallbackHandler(httpRequestValues);

Object fallback = fallbackHandler.apply(new RuntimeException("test"));

assertThat(fallback).isEqualTo("testDescription: 5");
}

interface NestedTestService {

String test(String description, Integer value);

}

}