From 7460b7baa42e931d31f22ed114597c8cf0289e4e Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Fri, 11 Oct 2024 10:07:26 +0200 Subject: [PATCH] Polish "Add Configuration for Kotlin's All-Open Plugin for JPA Entities" See gh-1576 --- .../spring/build/BuildMetadataResolver.java | 13 ------------- ...tGenerationDefaultContributorsConfiguration.java | 8 ++++---- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildMetadataResolver.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildMetadataResolver.java index b9673d56f7..38660f6dfa 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildMetadataResolver.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildMetadataResolver.java @@ -29,7 +29,6 @@ * * @author Stephane Nicoll * @author Moritz Halbritter - * @author Sijun Yang */ public class BuildMetadataResolver { @@ -66,16 +65,4 @@ public boolean hasFacet(Build build, String facet) { return dependencies(build).anyMatch((dependency) -> dependency.getFacets().contains(facet)); } - /** - * Checks if the given {@link Build} contains dependencies with the given - * {@code groupId}. - * @param build the build to query - * @param groupId the groupId to query - * @return {@code true} if this build defines at least a dependency with that groupId, - * {@code false} otherwise - */ - public boolean hasGroupId(Build build, String groupId) { - return dependencies(build).anyMatch((dependency) -> dependency.getGroupId().equals(groupId)); - } - } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java index 6bb36e4a81..aa2aa4d898 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java @@ -68,14 +68,14 @@ BuildCustomizer kotlinDependenciesConfigurer() { } @Bean - @ConditionalOnBuildSystem(value = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_KOTLIN) + @ConditionalOnBuildSystem(id = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_KOTLIN) KotlinJpaGradleBuildCustomizer kotlinJpaGradleBuildCustomizerKotlinDsl(InitializrMetadata metadata, KotlinProjectSettings settings, ProjectDescription projectDescription) { return new KotlinJpaGradleBuildCustomizer(metadata, settings, projectDescription, '\"'); } @Bean - @ConditionalOnBuildSystem(value = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_GROOVY) + @ConditionalOnBuildSystem(id = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_GROOVY) KotlinJpaGradleBuildCustomizer kotlinJpaGradleBuildCustomizerGroovyDsl(InitializrMetadata metadata, KotlinProjectSettings settings, ProjectDescription projectDescription) { return new KotlinJpaGradleBuildCustomizer(metadata, settings, projectDescription, '\''); @@ -89,13 +89,13 @@ KotlinJpaMavenBuildCustomizer kotlinJpaMavenBuildCustomizer(InitializrMetadata m } @Bean - @ConditionalOnBuildSystem(value = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_KOTLIN) + @ConditionalOnBuildSystem(id = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_KOTLIN) KotlinGradleBuildCustomizer kotlinBuildCustomizerKotlinDsl(KotlinProjectSettings kotlinProjectSettings) { return new KotlinGradleBuildCustomizer(kotlinProjectSettings, '\"'); } @Bean - @ConditionalOnBuildSystem(value = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_GROOVY) + @ConditionalOnBuildSystem(id = GradleBuildSystem.ID, dialect = GradleBuildSystem.DIALECT_GROOVY) KotlinGradleBuildCustomizer kotlinBuildCustomizerGroovyDsl(KotlinProjectSettings kotlinProjectSettings) { return new KotlinGradleBuildCustomizer(kotlinProjectSettings, '\''); }