From dd9c9fd171faf89c9ca3e19a93bbe0ac72f4dec5 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 10 Aug 2020 14:53:18 +0200
Subject: [PATCH] Polish "Migrate legacy endpoint that have a dash in their id"

See gh-21615
---
 .../actuate/endpoint/EndpointIdTests.java     | 24 ++++++++++++-------
 ....java => SampleLegacyEndpointWithDot.java} |  4 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)
 rename spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/{SampleLegacyEndpoint.java => SampleLegacyEndpointWithDot.java} (91%)

diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EndpointIdTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EndpointIdTests.java
index a7dece2d2c9..3f272ad1f97 100644
--- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EndpointIdTests.java
+++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EndpointIdTests.java
@@ -101,22 +101,30 @@ class EndpointIdTests {
 
 	@Test
 	void ofWhenMigratingLegacyNameRemovesDots(CapturedOutput output) {
-		EndpointId.resetLoggedWarnings();
-		MockEnvironment environment = new MockEnvironment();
-		environment.setProperty("management.endpoints.migrate-legacy-ids", "true");
-		EndpointId endpointId = EndpointId.of(environment, "foo.bar");
-		assertThat(endpointId.toString()).isEqualTo("foobar");
+		EndpointId endpointId = migrateLegacyName("one.two.three");
+		assertThat(endpointId.toString()).isEqualTo("onetwothree");
 		assertThat(output).doesNotContain("contains invalid characters");
 	}
 
 	@Test
 	void ofWhenMigratingLegacyNameRemovesHyphens(CapturedOutput output) {
+		EndpointId endpointId = migrateLegacyName("one-two-three");
+		assertThat(endpointId.toString()).isEqualTo("onetwothree");
+		assertThat(output).doesNotContain("contains invalid characters");
+	}
+
+	@Test
+	void ofWhenMigratingLegacyNameRemovesMixOfDashAndDot(CapturedOutput output) {
+		EndpointId endpointId = migrateLegacyName("one.two-three");
+		assertThat(endpointId.toString()).isEqualTo("onetwothree");
+		assertThat(output).doesNotContain("contains invalid characters");
+	}
+
+	private EndpointId migrateLegacyName(String name) {
 		EndpointId.resetLoggedWarnings();
 		MockEnvironment environment = new MockEnvironment();
 		environment.setProperty("management.endpoints.migrate-legacy-ids", "true");
-		EndpointId endpointId = EndpointId.of(environment, "foo-bar");
-		assertThat(endpointId.toString()).isEqualTo("foobar");
-		assertThat(output).doesNotContain("contains invalid characters");
+		return EndpointId.of(environment, name);
 	}
 
 	@Test
diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpoint.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpointWithDot.java
similarity index 91%
rename from spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpoint.java
rename to spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpointWithDot.java
index 913bb6e5bc6..fcc437e1fd5 100644
--- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpoint.java
+++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpointWithDot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
 
 @Component
 @Endpoint(id = "lega.cy")
-public class SampleLegacyEndpoint {
+public class SampleLegacyEndpointWithDot {
 
 	@ReadOperation
 	public Map<String, String> example() {