fix(codecentric#4164): client reg with spring boot configured to use snake case

Author: riky2124

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

@@ -81,6 +81,24 @@ public void test_context() throws InterruptedException, UnknownHostException {
 		wireMock.verify(request);
 	}
 
+	@Test
+	public void test_context_with_snake_case() throws InterruptedException, UnknownHostException {
+		cdl.await();
+		Thread.sleep(2500);
+		String hostName = InetAddress.getLocalHost().getCanonicalHostName();
+		String serviceHost = "http://" + hostName + ":" + getServerPort();
+		String managementHost = "http://" + hostName + ":" + getManagementPort();
+		RequestPatternBuilder request = postRequestedFor(urlEqualTo("/instances"));
+		request.withHeader("Content-Type", equalTo("application/json"))
+			.withRequestBody(matchingJsonPath("$.name", equalTo("Test-Client")))
+			.withRequestBody(matchingJsonPath("$.health_url", equalTo(managementHost + "/mgmt/health")))
+			.withRequestBody(matchingJsonPath("$.management_url", equalTo(managementHost + "/mgmt")))
+			.withRequestBody(matchingJsonPath("$.service_url", equalTo(serviceHost + "/")))
+			.withRequestBody(matchingJsonPath("$.metadata.startup", matching(".+")));
+
+		wireMock.verify(request);
+	}
+
 	protected abstract int getServerPort();
 
 	protected abstract int getManagementPort();

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

@@ -18,6 +18,7 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -27,15 +28,22 @@ public class ClientServletApplicationTest extends AbstractClientApplicationTest
 	private ConfigurableApplicationContext instance;
 
 	@BeforeEach
-	@Override
-	public void setUp() throws Exception {
+	public void setUp(TestInfo testInfo) throws Exception {
 		super.setUp();
 
 		SpringApplication application = new SpringApplication(TestClientApplication.class);
 		application.setWebApplicationType(WebApplicationType.SERVLET);
-		instance = application.run("--spring.application.name=Test-Client", "--server.port=0",
+		if(testInfo.getDisplayName().equalsIgnoreCase("test_context_with_snake_case()")) {
+			instance = application.run("--spring.application.name=Test-Client", "--server.port=0",
+				"--management.endpoints.web.base-path=/mgmt", "--endpoints.health.enabled=true",
+				"--spring.boot.admin.client.url=" + wireMock.url("/"),
+				"--spring.jackson.property-naming-strategy=SNAKE_CASE");
+		}
+		else {
+			instance = application.run("--spring.application.name=Test-Client", "--server.port=0",
 				"--management.endpoints.web.base-path=/mgmt", "--endpoints.health.enabled=true",
 				"--spring.boot.admin.client.url=" + wireMock.url("/"));
+		}
 	}
 
 	@AfterEach

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/utils/jackson/RegistrationDeserializer.java

@@ -17,16 +17,20 @@
 package de.codecentric.boot.admin.server.utils.jackson;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 
 import de.codecentric.boot.admin.server.domain.values.Registration;
 
+import org.springframework.util.ObjectUtils;
+
 public class RegistrationDeserializer extends StdDeserializer<Registration> {
 
 	private static final long serialVersionUID = 1L;
@@ -38,6 +42,7 @@ public RegistrationDeserializer() {
 	@Override
 	public Registration deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
 		JsonNode node = p.readValueAsTree();
+		Map<String, String> normalizedKvPair = getNormalizedKvPair(node);
 		Registration.Builder builder = Registration.builder();
 
 		if (node.hasNonNull("name")) {
@@ -48,14 +53,14 @@ public Registration deserialize(JsonParser p, DeserializationContext ctxt) throw
 			builder.healthUrl(url.replaceFirst("/+$", "") + "/health").managementUrl(url);
 		}
 		else {
-			if (node.hasNonNull("healthUrl")) {
-				builder.healthUrl(node.get("healthUrl").asText());
+			if (!ObjectUtils.isEmpty(normalizedKvPair.get("healthurl"))) {
+				builder.healthUrl(normalizedKvPair.get("healthurl"));
 			}
-			if (node.hasNonNull("managementUrl")) {
-				builder.managementUrl(node.get("managementUrl").asText());
+			if (!ObjectUtils.isEmpty(normalizedKvPair.get("managementurl"))) {
+				builder.managementUrl(normalizedKvPair.get("managementurl"));
 			}
-			if (node.hasNonNull("serviceUrl")) {
-				builder.serviceUrl(node.get("serviceUrl").asText());
+			if (!ObjectUtils.isEmpty(normalizedKvPair.get("serviceurl"))) {
+				builder.serviceUrl(normalizedKvPair.get("serviceurl"));
 			}
 		}
 
@@ -74,4 +79,21 @@ public Registration deserialize(JsonParser p, DeserializationContext ctxt) throw
 		return builder.build();
 	}
 
+	private Map<String, String> getNormalizedKvPair(JsonNode jn) throws IOException {
+		Map<String, String> normalizedKvPair = new HashMap<>();
+		JsonParser jp = jn.traverse();
+		while(!jp.isClosed()) {
+			if(jp.nextToken() == JsonToken.FIELD_NAME) {
+				String fieldName = jp.currentName();
+				if(!ObjectUtils.isEmpty(fieldName)) {
+					JsonToken jsonValueToken = jp.nextValue();
+					if(jsonValueToken == JsonToken.VALUE_STRING) {
+						normalizedKvPair.putIfAbsent(fieldName.replaceAll("[_-]", "").toLowerCase(), jp.getValueAsString());
+					}
+				}
+			}
+		}
+		return normalizedKvPair;
+	}
+
 }