Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.Environment;
import org.springframework.core.env.MapPropertySource;
Expand Down Expand Up @@ -105,6 +106,7 @@ public RouterFunctionHolderFactory routerFunctionHolderFactory(Environment env,
}

@Bean
@Order(0)
public RestClientCustomizer gatewayRestClientCustomizer(
ObjectProvider<ClientHttpRequestFactory> requestFactoryProvider) {
return restClientBuilder -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.springframework.boot.http.client.autoconfigure.HttpClientAutoConfiguration;
import org.springframework.boot.http.client.autoconfigure.HttpClientsProperties;
import org.springframework.boot.http.client.autoconfigure.imperative.ImperativeHttpClientsProperties;
import org.springframework.boot.restclient.RestClientCustomizer;
import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
import org.springframework.boot.test.context.FilteredClassLoader;
Expand All @@ -48,6 +49,8 @@
import org.springframework.cloud.gateway.server.mvc.predicate.PredicateAutoConfiguration;
import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClient;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.core.annotation.Order;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down Expand Up @@ -190,10 +193,45 @@ void loadBalancerFunctionHandlerNotAddedWhenNoLoadBalancerClientOnClasspath() {
.run(context -> assertThat(context).doesNotHaveBean("lbHandlerFunctionDefinition"));
}

@Test
void gatewayRestClientCustomizerHasOrderAnnotation() throws NoSuchMethodException {
Order order = GatewayServerMvcAutoConfiguration.class
.getMethod("gatewayRestClientCustomizer", org.springframework.beans.factory.ObjectProvider.class)
.getAnnotation(Order.class);
assertThat(order).isNotNull();
assertThat(order.value()).isEqualTo(0);
}

@Test
void customRestClientCustomizerCanOverrideGatewayCustomizer() {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont see how this test verifies that additional RestClientCustomizer runs after the default one

new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(FilterAutoConfiguration.class, PredicateAutoConfiguration.class,
HandlerFunctionAutoConfiguration.class, GatewayServerMvcAutoConfiguration.class,
HttpClientAutoConfiguration.class, RestTemplateAutoConfiguration.class,
RestClientAutoConfiguration.class, SslAutoConfiguration.class))
.withUserConfiguration(CustomRestClientCustomizerConfig.class)
.run(context -> {
assertThat(context).hasSingleBean(GatewayServerMvcAutoConfiguration.class);
assertThat(context.getBeansOfType(RestClientCustomizer.class)).hasSize(2);
});
}

@SpringBootConfiguration
@EnableAutoConfiguration
static class TestConfig {

}

static class CustomRestClientCustomizerConfig {

@Bean
@Order(1)
RestClientCustomizer customRestClientCustomizer() {
return restClientBuilder -> {
// Custom customizer that runs after gateway customizer
};
}

}

}
Loading