From f2e9d112b1f2ce036f59746515595b47bc5613d0 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Tue, 4 Oct 2022 15:57:20 +0200
Subject: [PATCH] Fix TypeReference#getName for CGLIB proxies

This commit makes sure that the double '$' sign typically used by
generated cglib proxies are not used as an inner class separator.

Closes gh-29252
---
 .../aot/hint/SimpleTypeReference.java           |  2 +-
 .../generate/GeneratedTypeReferenceTests.java   | 17 +++++++++++++++++
 .../aot/hint/SimpleTypeReferenceTests.java      | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java b/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java
index 024471f90d..b21df02e82 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/SimpleTypeReference.java
@@ -49,7 +49,7 @@ final class SimpleTypeReference extends AbstractTypeReference {
 		if (!className.contains("$")) {
 			return createTypeReference(className);
 		}
-		String[] elements = className.split("\\$");
+		String[] elements = className.split("(?<!\\$)\\$(?!\\$)");
 		SimpleTypeReference typeReference = createTypeReference(elements[0]);
 		for (int i = 1; i < elements.length; i++) {
 			typeReference = new SimpleTypeReference(typeReference.getPackageName(), elements[i], typeReference);
diff --git a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedTypeReferenceTests.java b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedTypeReferenceTests.java
index 7976304eda..049b3a020d 100644
--- a/spring-core/src/test/java/org/springframework/aot/generate/GeneratedTypeReferenceTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/generate/GeneratedTypeReferenceTests.java
@@ -73,6 +73,23 @@ class GeneratedTypeReferenceTests {
 		});
 	}
 
+	@Test
+	void nameOfCglibProxy() {
+		TypeReference reference = GeneratedTypeReference.of(
+				ClassName.get("com.example", "Test$$SpringCGLIB$$0"));
+		assertThat(reference.getSimpleName()).isEqualTo("Test$$SpringCGLIB$$0");
+		assertThat(reference.getEnclosingType()).isNull();
+	}
+
+	@Test
+	void nameOfNestedCglibProxy() {
+		TypeReference reference = GeneratedTypeReference.of(
+				ClassName.get("com.example", "Test").nestedClass("Another$$SpringCGLIB$$0"));
+		assertThat(reference.getSimpleName()).isEqualTo("Another$$SpringCGLIB$$0");
+		assertThat(reference.getEnclosingType()).isNotNull();
+		assertThat(reference.getEnclosingType().getSimpleName()).isEqualTo("Test");
+	}
+
 	@Test
 	void equalsWithIdenticalCanonicalNameIsTrue() {
 		assertThat(GeneratedTypeReference.of(ClassName.get("java.lang", "String")))
diff --git a/spring-core/src/test/java/org/springframework/aot/hint/SimpleTypeReferenceTests.java b/spring-core/src/test/java/org/springframework/aot/hint/SimpleTypeReferenceTests.java
index cb43859d45..b3195aad1f 100644
--- a/spring-core/src/test/java/org/springframework/aot/hint/SimpleTypeReferenceTests.java
+++ b/spring-core/src/test/java/org/springframework/aot/hint/SimpleTypeReferenceTests.java
@@ -76,6 +76,21 @@ class SimpleTypeReferenceTests {
 				Arguments.of(SimpleTypeReference.of("com.example.Test[]"), "com.example.Test[]"));
 	}
 
+	@Test
+	void nameOfCglibProxy() {
+		TypeReference reference = TypeReference.of("com.example.Test$$SpringCGLIB$$0");
+		assertThat(reference.getSimpleName()).isEqualTo("Test$$SpringCGLIB$$0");
+		assertThat(reference.getEnclosingType()).isNull();
+	}
+
+	@Test
+	void nameOfNestedCglibProxy() {
+		TypeReference reference = TypeReference.of("com.example.Test$Another$$SpringCGLIB$$0");
+		assertThat(reference.getSimpleName()).isEqualTo("Another$$SpringCGLIB$$0");
+		assertThat(reference.getEnclosingType()).isNotNull();
+		assertThat(reference.getEnclosingType().getSimpleName()).isEqualTo("Test");
+	}
+
 	@Test
 	void typeReferenceInRootPackage() {
 		TypeReference type = SimpleTypeReference.of("MyRootClass");