From cc6f321da4da5882d032c956632fec51493c241b Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 17 Jul 2019 10:11:18 +0200
Subject: [PATCH] Improve detection of NoSuchMethodError on Java 13

Closes gh-17544
---
 .../analyzer/NoSuchMethodFailureAnalyzer.java | 28 +++++++++++++------
 .../NoSuchMethodFailureAnalyzerTests.java     | 24 +++++++++++++---
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzer.java
index a9c29d42eb0..10978e96c87 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzer.java
@@ -31,12 +31,14 @@ import org.springframework.util.ClassUtils;
  * NoSuchMethodErrors}.
  *
  * @author Andy Wilkinson
+ * @author Stephane Nicoll
  */
 class NoSuchMethodFailureAnalyzer extends AbstractFailureAnalyzer<NoSuchMethodError> {
 
 	@Override
 	protected FailureAnalysis analyze(Throwable rootFailure, NoSuchMethodError cause) {
-		String className = extractClassName(cause);
+		String message = cleanMessage(cause);
+		String className = extractClassName(message);
 		if (className == null) {
 			return null;
 		}
@@ -48,24 +50,33 @@ class NoSuchMethodFailureAnalyzer extends AbstractFailureAnalyzer<NoSuchMethodEr
 		if (actual == null) {
 			return null;
 		}
-		String description = getDescription(cause, className, candidates, actual);
+		String description = getDescription(cause, message, className, candidates, actual);
 		return new FailureAnalysis(description,
 				"Correct the classpath of your application so that it contains a single, compatible version of "
 						+ className,
 				cause);
 	}
 
-	private String extractClassName(NoSuchMethodError cause) {
-		int descriptorIndex = cause.getMessage().indexOf('(');
+	private String cleanMessage(NoSuchMethodError error) {
+		int loadedFromIndex = error.getMessage().indexOf(" (loaded from");
+		if (loadedFromIndex == -1) {
+			return error.getMessage();
+		}
+		return error.getMessage().substring(0, loadedFromIndex);
+	}
+
+	private String extractClassName(String message) {
+		int descriptorIndex = message.indexOf('(');
 		if (descriptorIndex == -1) {
 			return null;
 		}
-		String classAndMethodName = cause.getMessage().substring(0, descriptorIndex);
+		String classAndMethodName = message.substring(0, descriptorIndex);
 		int methodNameIndex = classAndMethodName.lastIndexOf('.');
 		if (methodNameIndex == -1) {
 			return null;
 		}
-		return classAndMethodName.substring(0, methodNameIndex);
+		String className = classAndMethodName.substring(0, methodNameIndex);
+		return className.replace('/', '.');
 	}
 
 	private List<URL> findCandidates(String className) {
@@ -87,7 +98,8 @@ class NoSuchMethodFailureAnalyzer extends AbstractFailureAnalyzer<NoSuchMethodEr
 		}
 	}
 
-	private String getDescription(NoSuchMethodError cause, String className, List<URL> candidates, URL actual) {
+	private String getDescription(NoSuchMethodError cause, String message, String className, List<URL> candidates,
+			URL actual) {
 		StringWriter description = new StringWriter();
 		PrintWriter writer = new PrintWriter(description);
 		writer.println("An attempt was made to call a method that does not"
@@ -99,7 +111,7 @@ class NoSuchMethodFailureAnalyzer extends AbstractFailureAnalyzer<NoSuchMethodEr
 		writer.println("The following method did not exist:");
 		writer.println();
 		writer.print("    ");
-		writer.println(cause.getMessage());
+		writer.println(message);
 		writer.println();
 		writer.println("The method's class, " + className + ", is available from the following locations:");
 		writer.println();
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzerTests.java
index 0f8e7ca988b..628941e3fb7 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/NoSuchMethodFailureAnalyzerTests.java
@@ -20,6 +20,9 @@ import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServlet;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnJre;
+import org.junit.jupiter.api.condition.EnabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
 
 import org.springframework.boot.diagnostics.FailureAnalysis;
 import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
@@ -36,16 +39,29 @@ import static org.mockito.Mockito.mock;
 class NoSuchMethodFailureAnalyzerTests {
 
 	@Test
-	void noSuchMethodErrorIsAnalyzed() {
+	@EnabledOnJre({ JRE.JAVA_8, JRE.JAVA_11, JRE.JAVA_12 })
+	void noSuchMethodErrorIsAnalyzedJava8To12() {
+		testNoSuchMethodErrorFailureAnalysis(
+				"javax.servlet.ServletContext.addServlet(Ljava/lang/String;Ljavax/servlet/Servlet;)"
+						+ "Ljavax/servlet/ServletRegistration$Dynamic;");
+	}
+
+	@Test
+	@DisabledOnJre({ JRE.JAVA_8, JRE.JAVA_11, JRE.JAVA_12 })
+	void noSuchMethodErrorIsAnalyzedJava13AndLater() {
+		testNoSuchMethodErrorFailureAnalysis(
+				"javax/servlet/ServletContext.addServlet(Ljava/lang/String;Ljavax/servlet/Servlet;)"
+						+ "Ljavax/servlet/ServletRegistration$Dynamic;");
+	}
+
+	private void testNoSuchMethodErrorFailureAnalysis(String expectedMethodRepresentation) {
 		Throwable failure = createFailure();
 		assertThat(failure).isNotNull();
 		FailureAnalysis analysis = new NoSuchMethodFailureAnalyzer().analyze(failure);
 		assertThat(analysis).isNotNull();
 		assertThat(analysis.getDescription())
 				.contains(NoSuchMethodFailureAnalyzerTests.class.getName() + ".createFailure(")
-				.contains("javax.servlet.ServletContext.addServlet(Ljava/lang/String;Ljavax/servlet/Servlet;)"
-						+ "Ljavax/servlet/ServletRegistration$Dynamic;")
-				.contains("class, javax.servlet.ServletContext,");
+				.contains(expectedMethodRepresentation).contains("class, javax.servlet.ServletContext,");
 	}
 
 	private Throwable createFailure() {