Skip to content
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

Jump to bottom

allow overriding registration client in blocking or reactive env #2004

Merged
merged 1 commit into from
Mar 18, 2022
Merged

allow overriding registration client in blocking or reactive env #2004

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../java/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public static class BlockingRegistrationClientConfig {

@Bean
@ConditionalOnMissingBean
public BlockingRegistrationClient registrationClient(ClientProperties client) {
public RegistrationClient registrationClient(ClientProperties client) {
RestTemplateBuilder builder = new RestTemplateBuilder().setConnectTimeout(client.getConnectTimeout())
.setReadTimeout(client.getReadTimeout());
if (client.getUsername() != null && client.getPassword() != null) {
Expand All @@ -155,7 +155,7 @@ public static class ReactiveRegistrationClientConfig {

@Bean
@ConditionalOnMissingBean
public ReactiveRegistrationClient registrationClient(ClientProperties client, WebClient.Builder webClient) {
public RegistrationClient registrationClient(ClientProperties client, WebClient.Builder webClient) {
if (client.getUsername() != null && client.getPassword() != null) {
webClient = webClient.filter(basicAuthentication(client.getUsername(), client.getPassword()));
}
Expand Down
46 changes: 46 additions & 0 deletions ...a/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,17 @@
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
import org.springframework.boot.context.annotation.UserConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;

import de.codecentric.boot.admin.client.registration.ApplicationRegistrator;
import de.codecentric.boot.admin.client.registration.BlockingRegistrationClient;
import de.codecentric.boot.admin.client.registration.RegistrationClient;

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

Expand Down Expand Up @@ -76,4 +82,44 @@ public void reactiveEnvironment() {
.run((context) -> assertThat(context).hasSingleBean(ApplicationRegistrator.class));
}

@Test
public void customBlockingClientInReactiveEnvironment() {
ReactiveWebApplicationContextRunner reactiveContextRunner = new ReactiveWebApplicationContextRunner()
.withConfiguration(UserConfigurations.of(CustomBlockingConfiguration.class)).withConfiguration(
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
WebClientAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
reactiveContextRunner.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081")
.run((context) -> {
assertThat(context).hasSingleBean(ApplicationRegistrator.class);
assertThat(context).getBean("registrationClient")
.isEqualTo(context.getBean(CustomBlockingConfiguration.class).registrationClient);
});
}

@Test
public void customBlockingClientInBlockingEnvironment() {
ReactiveWebApplicationContextRunner reactiveContextRunner = new ReactiveWebApplicationContextRunner()
Copy link
Member

Choose a reason for hiding this comment

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

This is still reactive environment ;)

Is working anyways, so we will merge and fix the test to prevent another one-week-roundtrip :)

.withConfiguration(UserConfigurations.of(CustomBlockingConfiguration.class)).withConfiguration(
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
RestTemplateAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
reactiveContextRunner.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081")
.run((context) -> {
assertThat(context).hasSingleBean(ApplicationRegistrator.class);
assertThat(context).getBean("registrationClient")
.isEqualTo(context.getBean(CustomBlockingConfiguration.class).registrationClient);
});
}

@Configuration
public static class CustomBlockingConfiguration {

RegistrationClient registrationClient = new BlockingRegistrationClient(new RestTemplate());

@Bean
public RegistrationClient registrationClient() {
return registrationClient;
}

}

}