fix: some compiler issues after rebase

Author: Andreas Höhmann

spring-boot-admin-client/pom.xml

@@ -54,16 +54,6 @@
             <artifactId>spring-boot-webclient</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-restclient</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-webclient</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -74,11 +64,6 @@
             <artifactId>spring-boot-starter-webflux</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-webflux</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure-processor</artifactId>

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

@@ -17,6 +17,7 @@
 package de.codecentric.boot.admin.client;
 
 import java.net.InetAddress;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/web/reactive/AdminControllerHandlerMapping.java

@@ -20,7 +20,6 @@
 
 import org.springframework.core.annotation.AnnotatedElementUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.reactive.result.condition.PatternsRequestCondition;
 import org.springframework.web.reactive.result.method.RequestMappingInfo;
 import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
@@ -47,7 +46,7 @@ protected void registerHandlerMethod(Object handler, Method method, RequestMappi
 	}
 
 	private RequestMappingInfo withPrefix(RequestMappingInfo mapping) {
-		if (!StringUtils.hasText(adminContextPath)) {
+		if (!StringUtils.hasText(this.adminContextPath)) {
 			return mapping;
 		}
 		return mapping.mutate().paths(withNewPatterns(mapping.getPatternsCondition())).build();
@@ -56,7 +55,7 @@ private RequestMappingInfo withPrefix(RequestMappingInfo mapping) {
 	private String[] withNewPatterns(PatternsRequestCondition patternsRequestCondition) {
 		return patternsRequestCondition.getPatterns()
 			.stream()
-			.map((pattern) -> PathUtils.normalizePath(adminContextPath + pattern))
+			.map((pattern) -> PathUtils.normalizePath(this.adminContextPath + pattern))
 			.toArray(String[]::new);
 	}
 

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/notify/HipchatNotifierTest.java

@@ -57,14 +57,14 @@ class HipchatNotifierTest {
 	@BeforeEach
 	void setUp() {
 		InstanceRepository repository = mock(InstanceRepository.class);
-		when(repository.find(instance.getId())).thenReturn(Mono.just(instance));
-
-		restTemplate = mock(RestTemplate.class);
-		notifier = new HipchatNotifier(repository, restTemplate);
-		notifier.setNotify(true);
-		notifier.setAuthToken("--token-");
-		notifier.setRoomId("-room-");
-		notifier.setUrl(URI.create("http://localhost/v2"));
+		when(repository.find(this.instance.getId())).thenReturn(Mono.just(this.instance));
+
+		this.restTemplate = mock(RestTemplate.class);
+		this.notifier = new HipchatNotifier(repository, this.restTemplate);
+		this.notifier.setNotify(true);
+		this.notifier.setAuthToken("--token-");
+		this.notifier.setRoomId("-room-");
+		this.notifier.setUrl(URI.create("http://localhost/v2"));
 	}
 
 	@Test
@@ -73,20 +73,20 @@ void test_onApplicationEvent_resolve() {
 		ArgumentCaptor<HttpEntity<Map<String, Object>>> httpRequest = ArgumentCaptor
 			.forClass((Class<HttpEntity<Map<String, Object>>>) (Class<?>) HttpEntity.class);
 
-		when(restTemplate.postForEntity(isA(String.class), httpRequest.capture(), eq(Void.class)))
+		when(this.restTemplate.postForEntity(isA(String.class), httpRequest.capture(), eq(Void.class)))
 			.thenReturn(ResponseEntity.ok().build());
 
 		StepVerifier
-			.create(notifier
-				.notify(new InstanceStatusChangedEvent(instance.getId(), instance.getVersion(), StatusInfo.ofDown())))
+			.create(this.notifier.notify(new InstanceStatusChangedEvent(this.instance.getId(),
+					this.instance.getVersion(), StatusInfo.ofDown())))
 			.verifyComplete();
 		StepVerifier
-			.create(notifier
-				.notify(new InstanceStatusChangedEvent(instance.getId(), instance.getVersion(), StatusInfo.ofUp())))
+			.create(this.notifier.notify(new InstanceStatusChangedEvent(this.instance.getId(),
+					this.instance.getVersion(), StatusInfo.ofUp())))
 			.verifyComplete();
 
 		assertThat(httpRequest.getValue().getHeaders().asMultiValueMap()).containsEntry("Content-Type",
-			.containsAll(Collections.singletonList("application/json"));
+				Collections.singletonList("application/json"));
 
 		Map<String, Object> body = httpRequest.getValue().getBody();
 		assertThat(body).containsEntry("color", "green");
@@ -104,15 +104,16 @@ void test_onApplicationEvent_trigger() {
 		ArgumentCaptor<HttpEntity<Map<String, Object>>> httpRequest = ArgumentCaptor
 			.forClass((Class<HttpEntity<Map<String, Object>>>) (Class<?>) HttpEntity.class);
 
-		when(restTemplate.postForEntity(isA(String.class), httpRequest.capture(), eq(Void.class)))
+		when(this.restTemplate.postForEntity(isA(String.class), httpRequest.capture(), eq(Void.class)))
 			.thenReturn(ResponseEntity.ok().build());
 
 		StepVerifier
-			.create(notifier
-				.notify(new InstanceStatusChangedEvent(instance.getId(), instance.getVersion(), StatusInfo.ofUp())))
+			.create(this.notifier.notify(new InstanceStatusChangedEvent(this.instance.getId(),
+					this.instance.getVersion(), StatusInfo.ofUp())))
 			.verifyComplete();
 		StepVerifier
-			.create(notifier.notify(new InstanceStatusChangedEvent(instance.getId(), instance.getVersion(), infoDown)))
+			.create(this.notifier
+				.notify(new InstanceStatusChangedEvent(this.instance.getId(), this.instance.getVersion(), infoDown)))
 			.verifyComplete();
 
 		assertThat(httpRequest.getValue().getHeaders().toSingleValueMap()).containsEntry("Content-Type",

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/web/client/CompositeHttpHeadersProviderTest.java

@@ -41,7 +41,7 @@ void should_return_all_headers() {
 		}));
 
 		HttpHeaders headers = provider.getHeaders(null);
-		assertThat(headers.asMultiValueMap()).containsEntry("a", singletonList("1"))
+		assertThat(headers.asMultiValueMap()).containsEntry("a", singletonList("1"));
 		assertThat(headers.get("b")).containsAll(asList("2-a", "2-b"));
 		assertThat(headers.get("c")).containsAll(singletonList("3"));
 	}

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/web/client/reactive/CompositeReactiveHttpHeadersProviderTest.java

@@ -43,7 +43,7 @@ void should_return_all_headers() {
 		}));
 
 		StepVerifier.create(provider.getHeaders(null)).thenConsumeWhile((headers) -> {
-			assertThat(headers.asMultiValueMap()).containsEntry("a", singletonList("1"))
+			assertThat(headers.asMultiValueMap()).containsEntry("a", singletonList("1"));
 			assertThat(headers.get("b")).containsAll(asList("2-a", "2-b"));
 			assertThat(headers.get("c")).containsAll(singletonList("3"));
 			return true;