feat: fix failing tests

Author: SteKoe

spring-boot-admin-client/src/test/resources/application.yml

@@ -0,0 +1,2 @@
+server:
+  shutdown: immediate

spring-boot-admin-samples/spring-boot-admin-sample-servlet/src/main/resources/application.yml

@@ -34,17 +34,34 @@ management:
         enabled: true
     health:
       show-details: ALWAYS
+  server:
+    port: 9999
+
 
 spring:
   application:
     name: spring-boot-admin-sample-servlet
+  cloud:
+    discovery:
+      client:
+        simple:
+          instances:
+            SBA:
+              - uri: http://localhost:9999
+                metadata:
+                  management.context-path: /actuator
+                  service-url: http://localhost:8080
+                  service-path: /
   boot:
     admin:
       client:
         url: http://localhost:8080
         instance:
           service-host-type: IP
           metadata:
+            service-path: /foo
+            service-url: http://localhost:8080
+            hide-url: true
             tags:
               environment: test
               de-service-test-1: A large content

spring-boot-admin-server-cloud/src/test/resources/application.yml

@@ -0,0 +1,2 @@
+server:
+  shutdown: immediate

spring-boot-admin-server-ui/src/test/resources/application.yml

@@ -0,0 +1,2 @@
+server:
+  shutdown: immediate

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Registration.java

@@ -54,7 +54,7 @@ public final class Registration implements Serializable {
 	/**
 	 * Absolute URL of the Actuator health endpoint. Required and used by Spring Boot
 	 * Admin to determine the instance status. Example:
-	 * <code>https://example.com/actuator</code>
+	 * <code>https://example.com/actuator/health</code>
 	 */
 	private final String healthUrl;
 
@@ -81,8 +81,6 @@ private Registration(String name, @Nullable String managementUrl, String healthU
 		Assert.isTrue(!StringUtils.hasText(serviceUrl) || checkUrl(serviceUrl),
 				"'serviceUrl' is not valid: " + serviceUrl);
 
-		assert serviceUrl != null;
-
 		this.name = name;
 		this.managementUrl = managementUrl;
 		this.healthUrl = healthUrl;
@@ -111,7 +109,11 @@ public static Registration.Builder copyOf(Registration registration) {
 	 * @param metadata metadata information of registered instance
 	 * @return the actual service url
 	 */
-	private String getServiceUrl(String serviceUrl, Map<String, String> metadata) {
+	@Nullable
+	private String getServiceUrl(@Nullable String serviceUrl, Map<String, String> metadata) {
+		if (serviceUrl == null) {
+			return null;
+		}
 		String url = metadata.getOrDefault("service-url", serviceUrl);
 
 		try {

spring-boot-admin-server/src/test/resources/application.yml

@@ -1,5 +1,6 @@
 server:
-    port: 8080
+  port: 8080
+  shutdown: immediate
 spring:
     application:
         name: spring-boot-admin-server-test