Skip to content

Commit 4c46644

Browse files
author
Andreas Höhmann
committed
wip: more code-formatting cleanups (final removed)
1 parent cb6cd3e commit 4c46644

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

spring-boot-admin-client/src/test/java/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfigurationTest.java

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void disabled() {
7474

7575
@Test
7676
void nonWebEnvironment() {
77-
final ApplicationContextRunner nonWebContextRunner = new ApplicationContextRunner()
77+
ApplicationContextRunner nonWebContextRunner = new ApplicationContextRunner()
7878
.withConfiguration(AutoConfigurations.of(SpringBootAdminClientAutoConfiguration.class));
7979

8080
nonWebContextRunner.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081")
@@ -83,7 +83,7 @@ void nonWebEnvironment() {
8383

8484
@Test
8585
void reactiveEnvironment() {
86-
final ReactiveWebApplicationContextRunner reactiveContextRunner = new ReactiveWebApplicationContextRunner()
86+
ReactiveWebApplicationContextRunner reactiveContextRunner = new ReactiveWebApplicationContextRunner()
8787
.withConfiguration(
8888
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
8989
WebClientAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class))
@@ -94,7 +94,7 @@ void reactiveEnvironment() {
9494

9595
@Test
9696
void blockingClientInBlockingEnvironment() {
97-
final WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner()
97+
WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner()
9898
.withConfiguration(AutoConfigurations.of(EndpointAutoConfiguration.class,
9999
WebEndpointAutoConfiguration.class, DispatcherServletAutoConfiguration.class,
100100
RestTemplateAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
@@ -103,51 +103,49 @@ void blockingClientInBlockingEnvironment() {
103103
.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081",
104104
"spring.boot.admin.client.connectTimeout=1337", "spring.boot.admin.client.readTimeout=42")
105105
.run((context) -> {
106-
final RegistrationClient registrationClient = context.getBean(RegistrationClient.class);
107-
final RestTemplate restTemplate = (RestTemplate) ReflectionTestUtils.getField(registrationClient,
106+
RegistrationClient registrationClient = context.getBean(RegistrationClient.class);
107+
RestTemplate restTemplate = (RestTemplate) ReflectionTestUtils.getField(registrationClient,
108108
"restTemplate");
109109
assertThat(restTemplate).isNotNull();
110110

111-
final ClientHttpRequestFactory requestFactory = restTemplate.getRequestFactory();
111+
ClientHttpRequestFactory requestFactory = restTemplate.getRequestFactory();
112112

113-
final Integer connectTimeout = (Integer) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
113+
Integer connectTimeout = (Integer) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
114114
assertThat(connectTimeout).isEqualTo(1337);
115-
final Duration readTimeout = (Duration) ReflectionTestUtils.getField(requestFactory, "readTimeout");
115+
Duration readTimeout = (Duration) ReflectionTestUtils.getField(requestFactory, "readTimeout");
116116
assertThat(readTimeout).isEqualTo(Duration.ofMillis(42));
117117
});
118118
}
119119

120120
@Test
121121
void restClientRegistrationClientInBlockingEnvironment() {
122-
final WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner()
123-
.withConfiguration(
124-
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
125-
DispatcherServletAutoConfiguration.class, HttpClientAutoConfiguration.class,
126-
RestClientAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
122+
WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner().withConfiguration(
123+
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
124+
DispatcherServletAutoConfiguration.class, HttpClientAutoConfiguration.class,
125+
RestClientAutoConfiguration.class, SpringBootAdminClientAutoConfiguration.class));
127126

128127
webApplicationContextRunner
129128
.withPropertyValues("spring.boot.admin.client.url:http://localhost:8081",
130129
"spring.boot.admin.client.connectTimeout=1337", "spring.boot.admin.client.readTimeout=42")
131130
.withInitializer(new ConditionEvaluationReportLoggingListener())
132131
.run((context) -> {
133-
final RegistrationClient registrationClient = context.getBean(RegistrationClient.class);
134-
final RestClient restClient = (RestClient) ReflectionTestUtils.getField(registrationClient,
135-
"restClient");
132+
RegistrationClient registrationClient = context.getBean(RegistrationClient.class);
133+
RestClient restClient = (RestClient) ReflectionTestUtils.getField(registrationClient, "restClient");
136134
assertThat(restClient).isNotNull();
137135

138-
final ClientHttpRequestFactory requestFactory = (ClientHttpRequestFactory) ReflectionTestUtils
136+
ClientHttpRequestFactory requestFactory = (ClientHttpRequestFactory) ReflectionTestUtils
139137
.getField(restClient, "clientRequestFactory");
140138

141-
final Integer connectTimeout = (Integer) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
139+
Integer connectTimeout = (Integer) ReflectionTestUtils.getField(requestFactory, "connectTimeout");
142140
assertThat(connectTimeout).isEqualTo(1337);
143-
final Duration readTimeout = (Duration) ReflectionTestUtils.getField(requestFactory, "readTimeout");
141+
Duration readTimeout = (Duration) ReflectionTestUtils.getField(requestFactory, "readTimeout");
144142
assertThat(readTimeout).isEqualTo(Duration.ofMillis(42));
145143
});
146144
}
147145

148146
@Test
149147
void customBlockingClientInReactiveEnvironment() {
150-
final ReactiveWebApplicationContextRunner reactiveContextRunner = new ReactiveWebApplicationContextRunner()
148+
ReactiveWebApplicationContextRunner reactiveContextRunner = new ReactiveWebApplicationContextRunner()
151149
.withConfiguration(UserConfigurations.of(CustomBlockingConfiguration.class))
152150
.withConfiguration(
153151
AutoConfigurations.of(EndpointAutoConfiguration.class, WebEndpointAutoConfiguration.class,
@@ -164,7 +162,7 @@ void customBlockingClientInReactiveEnvironment() {
164162

165163
@Test
166164
void customBlockingClientInBlockingEnvironment() {
167-
final WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner()
165+
WebApplicationContextRunner webApplicationContextRunner = new WebApplicationContextRunner()
168166
.withConfiguration(UserConfigurations.of(CustomBlockingConfiguration.class))
169167
.withConfiguration(AutoConfigurations.of(EndpointAutoConfiguration.class,
170168
WebEndpointAutoConfiguration.class, DispatcherServletAutoConfiguration.class,

0 commit comments

Comments
 (0)