From 5f5e33c5e796c91bf043ddbc513e0f8470027742 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 7 May 2025 15:52:23 +0200 Subject: [PATCH] Polishing. Original Pull Request: #3282 --- .../data/repository/aot/generate/AotRepositoryBuilder.java | 2 +- .../repository/aot/generate/RepositoryContributor.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBuilder.java b/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBuilder.java index ebf1760cf..d26fd21f3 100644 --- a/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBuilder.java +++ b/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBuilder.java @@ -179,7 +179,7 @@ class AotRepositoryBuilder { ? AotRepositoryMetadata.RepositoryType.REACTIVE : AotRepositoryMetadata.RepositoryType.IMPERATIVE; - String jsonModuleName = moduleName.replaceAll("Reactive", "").trim(); + String jsonModuleName = moduleName != null ? moduleName.replaceAll("Reactive", "").trim() : null; return new AotRepositoryMetadata(repositoryInformation.getRepositoryInterface().getName(), jsonModuleName, repositoryType, methodMetadata); diff --git a/src/main/java/org/springframework/data/repository/aot/generate/RepositoryContributor.java b/src/main/java/org/springframework/data/repository/aot/generate/RepositoryContributor.java index bcfc9d7a1..6c66c7ffe 100644 --- a/src/main/java/org/springframework/data/repository/aot/generate/RepositoryContributor.java +++ b/src/main/java/org/springframework/data/repository/aot/generate/RepositoryContributor.java @@ -32,7 +32,6 @@ import org.springframework.data.repository.query.QueryMethod; import org.springframework.javapoet.JavaFile; import org.springframework.javapoet.TypeName; import org.springframework.javapoet.TypeSpec; -import org.springframework.util.StringUtils; /** * Contributor for AOT repository fragments. @@ -131,11 +130,7 @@ public class RepositoryContributor { } private static String getRepositoryJsonFileName(Class repositoryInterface) { - - String repositoryJsonName = repositoryInterface.getSimpleName() + ".json"; - String repositoryJsonPath = repositoryInterface.getPackageName().replace('.', '/'); - - return StringUtils.hasText(repositoryJsonPath) ? repositoryJsonPath + "/" + repositoryJsonName : repositoryJsonName; + return repositoryInterface.getName().replace('.', '/') + ".json"; } /**