diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java index 55ad2fbe..ec3acc1d 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfiguration.java @@ -57,14 +57,14 @@ class InitializrStatsAutoConfiguration { @Bean @ConditionalOnBean(InitializrMetadataProvider.class) - public ProjectGenerationStatPublisher projectRequestStatHandler(RestTemplateBuilder restTemplateBuilder) { + ProjectGenerationStatPublisher projectRequestStatHandler(RestTemplateBuilder restTemplateBuilder) { return new ProjectGenerationStatPublisher(new ProjectRequestDocumentFactory(), this.statsProperties, restTemplateBuilder, statsRetryTemplate()); } @Bean @ConditionalOnMissingBean(name = "statsRetryTemplate") - public RetryTemplate statsRetryTemplate() { + RetryTemplate statsRetryTemplate() { RetryTemplate retryTemplate = new RetryTemplate(); ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy(); backOffPolicy.setInitialInterval(3000L); diff --git a/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfigurationTests.java b/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfigurationTests.java index 674ada0a..88399ca8 100755 --- a/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfigurationTests.java +++ b/initializr-actuator/src/test/java/io/spring/initializr/actuate/autoconfigure/InitializrStatsAutoConfigurationTests.java @@ -90,7 +90,7 @@ class InitializrStatsAutoConfigurationTests { static class CustomStatsRetryTemplateConfiguration { @Bean - public RetryTemplate statsRetryTemplate() { + RetryTemplate statsRetryTemplate() { RetryTemplate retryTemplate = new RetryTemplate(); ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy(); backOffPolicy.setMultiplier(10); @@ -104,7 +104,7 @@ class InitializrStatsAutoConfigurationTests { static class InfrastructureConfiguration { @Bean - public InitializrMetadataProvider initializrMetadataProvider() { + InitializrMetadataProvider initializrMetadataProvider() { return mock(InitializrMetadataProvider.class); } @@ -117,7 +117,7 @@ class InitializrStatsAutoConfigurationTests { private static final ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class); @Bean - public RestTemplateCustomizer testRestTemplateCustomizer() { + RestTemplateCustomizer testRestTemplateCustomizer() { return (b) -> b.setErrorHandler(errorHandler); } diff --git a/initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java b/initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java index 578077e1..078a977d 100755 --- a/initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java +++ b/initializr-docs/src/test/java/io/spring/initializr/stub/ClientApplicationTests.java @@ -67,7 +67,7 @@ class ClientApplicationTests { static class Config { @Bean - public RestTemplate restTemplate(RestTemplateBuilder builder) { + RestTemplate restTemplate(RestTemplateBuilder builder) { return builder.build(); } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java index 2aedadbd..6fcc1928 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java @@ -129,22 +129,22 @@ public class GradleProjectGenerationConfiguration { static class Gradle3ProjectGenerationConfiguration { @Bean - public Gradle3BuildWriter gradleBuildWriter() { + Gradle3BuildWriter gradleBuildWriter() { return new Gradle3BuildWriter(); } @Bean - public GradleWrapperContributor gradle3WrapperContributor() { + GradleWrapperContributor gradle3WrapperContributor() { return new GradleWrapperContributor("3"); } @Bean - public Gradle3SettingsGradleProjectContributor settingsGradleProjectContributor(GradleBuild build) { + Gradle3SettingsGradleProjectContributor settingsGradleProjectContributor(GradleBuild build) { return new Gradle3SettingsGradleProjectContributor(build); } @Bean - public BuildCustomizer springBootPluginContributor(ResolvedProjectDescription projectDescription) { + BuildCustomizer springBootPluginContributor(ResolvedProjectDescription projectDescription) { return (build) -> { build.buildscript( (buildscript) -> buildscript.dependency("org.springframework.boot:spring-boot-gradle-plugin:" @@ -164,7 +164,7 @@ public class GradleProjectGenerationConfiguration { static class Gradle4ProjectGenerationConfiguration { @Bean - public GradleWrapperContributor gradle4WrapperContributor() { + GradleWrapperContributor gradle4WrapperContributor() { return new GradleWrapperContributor("4"); } @@ -178,7 +178,7 @@ public class GradleProjectGenerationConfiguration { static class Gradle5ProjectGenerationConfiguration { @Bean - public GradleWrapperContributor gradle4WrapperContributor() { + GradleWrapperContributor gradle4WrapperContributor() { return new GradleWrapperContributor("5"); } @@ -193,31 +193,31 @@ public class GradleProjectGenerationConfiguration { static class Gradle4Or5ProjectGenerationConfiguration { @Bean - public GroovyDslGradleBuildWriter gradleBuildWriter() { + GroovyDslGradleBuildWriter gradleBuildWriter() { return new GroovyDslGradleBuildWriter(); } @Bean - public SettingsGradleProjectContributor settingsGradleProjectContributor(GradleBuild build, + SettingsGradleProjectContributor settingsGradleProjectContributor(GradleBuild build, IndentingWriterFactory indentingWriterFactory) { return new SettingsGradleProjectContributor(build, indentingWriterFactory, new GroovyDslGradleSettingsWriter(), "settings.gradle"); } @Bean - public BuildCustomizer springBootPluginContributor(ResolvedProjectDescription projectDescription) { + BuildCustomizer springBootPluginContributor(ResolvedProjectDescription projectDescription) { return (build) -> build.addPlugin("org.springframework.boot", projectDescription.getPlatformVersion().toString()); } @Bean @ConditionalOnPlatformVersion("2.2.0.M3") - public BuildCustomizer testTaskContributor() { + BuildCustomizer testTaskContributor() { return (build) -> build.customizeTask("test", (test) -> test.invoke("useJUnitPlatform")); } @Bean - public GradleAnnotationProcessorScopeBuildCustomizer gradleAnnotationProcessorScopeBuildCustomizer() { + GradleAnnotationProcessorScopeBuildCustomizer gradleAnnotationProcessorScopeBuildCustomizer() { return new GradleAnnotationProcessorScopeBuildCustomizer(); } @@ -232,19 +232,19 @@ public class GradleProjectGenerationConfiguration { static class GradleKtsProjectGenerationConfiguration { @Bean - public KotlinDslGradleBuildWriter gradleKtsBuildWriter() { + KotlinDslGradleBuildWriter gradleKtsBuildWriter() { return new KotlinDslGradleBuildWriter(); } @Bean - public SettingsGradleProjectContributor settingsGradleKtsProjectContributor(GradleBuild build, + SettingsGradleProjectContributor settingsGradleKtsProjectContributor(GradleBuild build, IndentingWriterFactory indentingWriterFactory) { return new SettingsGradleProjectContributor(build, indentingWriterFactory, new KotlinDslGradleSettingsWriter(), "settings.gradle.kts"); } @Bean - public BuildCustomizer springBootPluginContributor(ResolvedProjectDescription projectDescription, + BuildCustomizer springBootPluginContributor(ResolvedProjectDescription projectDescription, InitializrMetadata metadata) { return (build) -> { build.addPlugin("org.springframework.boot", projectDescription.getPlatformVersion().toString()); @@ -255,12 +255,12 @@ public class GradleProjectGenerationConfiguration { @Bean @ConditionalOnPlatformVersion("2.2.0.M3") - public BuildCustomizer testTaskContributor() { + BuildCustomizer testTaskContributor() { return (build) -> build.customizeTasksWithType("Test", (test) -> test.invoke("useJUnitPlatform")); } @Bean - public GradleAnnotationProcessorScopeBuildCustomizer gradleAnnotationProcessorScopeBuildCustomizer() { + GradleAnnotationProcessorScopeBuildCustomizer gradleAnnotationProcessorScopeBuildCustomizer() { return new GradleAnnotationProcessorScopeBuildCustomizer(); } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfiguration.java index 1d087ee1..dd7351a0 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfiguration.java @@ -74,7 +74,7 @@ public class SourceCodeProjectGenerationConfiguration { @Bean @ConditionalOnPlatformVersion("[1.5.0.M1, 2.0.0.M1)") - public ServletInitializerContributor boot15ServletInitializerContributor( + ServletInitializerContributor boot15ServletInitializerContributor( ObjectProvider> servletInitializerCustomizers) { return new ServletInitializerContributor(this.projectDescription.getPackageName(), "org.springframework.boot.web.support.SpringBootServletInitializer", servletInitializerCustomizers); @@ -82,7 +82,7 @@ public class SourceCodeProjectGenerationConfiguration { @Bean @ConditionalOnPlatformVersion("2.0.0.M1") - public ServletInitializerContributor boot20ServletInitializerContributor( + ServletInitializerContributor boot20ServletInitializerContributor( ObjectProvider> servletInitializerCustomizers) { return new ServletInitializerContributor(this.projectDescription.getPackageName(), "org.springframework.boot.web.servlet.support.SpringBootServletInitializer", diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java index 72f222e7..55e0ad02 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/groovy/GroovyProjectGenerationDefaultContributorsConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.context.annotation.Configuration; class GroovyProjectGenerationDefaultContributorsConfiguration { @Bean - public MainApplicationTypeCustomizer mainMethodContributor() { + MainApplicationTypeCustomizer mainMethodContributor() { return (typeDeclaration) -> typeDeclaration.addMethodDeclaration( GroovyMethodDeclaration.method("main").modifiers(Modifier.PUBLIC | Modifier.STATIC).returning("void") .parameters(new Parameter("java.lang.String[]", "args")) @@ -62,7 +62,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { @Bean @ConditionalOnPlatformVersion("[1.5.0.RELEASE,2.2.0.M3)") - public TestApplicationTypeCustomizer junit4TestMethodContributor() { + TestApplicationTypeCustomizer junit4TestMethodContributor() { return (typeDeclaration) -> { GroovyMethodDeclaration method = GroovyMethodDeclaration.method("contextLoads").modifiers(Modifier.PUBLIC) .returning("void").body(); @@ -73,7 +73,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { @Bean @ConditionalOnPlatformVersion("2.2.0.M3") - public TestApplicationTypeCustomizer junitJupiterTestMethodContributor() { + TestApplicationTypeCustomizer junitJupiterTestMethodContributor() { return (typeDeclaration) -> { GroovyMethodDeclaration method = GroovyMethodDeclaration.method("contextLoads").returning("void").body(); method.annotate(Annotation.name("org.junit.jupiter.api.Test")); @@ -82,7 +82,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { } @Bean - public BuildCustomizer groovyDependenciesConfigurer() { + BuildCustomizer groovyDependenciesConfigurer() { return new GroovyDependenciesConfigurer(); } @@ -94,7 +94,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { static class WarPackagingConfiguration { @Bean - public ServletInitializerCustomizer javaServletInitializerCustomizer( + ServletInitializerCustomizer javaServletInitializerCustomizer( ResolvedProjectDescription projectDescription) { return (typeDeclaration) -> { GroovyMethodDeclaration configure = GroovyMethodDeclaration.method("configure") @@ -119,7 +119,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { static class GroovyMavenProjectConfiguration { @Bean - public GroovyMavenBuildCustomizer groovyBuildCustomizer() { + GroovyMavenBuildCustomizer groovyBuildCustomizer() { return new GroovyMavenBuildCustomizer(); } @@ -133,7 +133,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration { static class GroovyGradleProjectConfiguration { @Bean - public GroovyGradleBuildCustomizer groovyBuildCustomizer() { + GroovyGradleBuildCustomizer groovyBuildCustomizer() { return new GroovyGradleBuildCustomizer(); } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java index 006f29a8..44f8a094 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/java/JavaProjectGenerationDefaultContributorsConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.context.annotation.Configuration; class JavaProjectGenerationDefaultContributorsConfiguration { @Bean - public MainApplicationTypeCustomizer mainMethodContributor() { + MainApplicationTypeCustomizer mainMethodContributor() { return (typeDeclaration) -> { typeDeclaration.modifiers(Modifier.PUBLIC); typeDeclaration.addMethodDeclaration( @@ -60,7 +60,7 @@ class JavaProjectGenerationDefaultContributorsConfiguration { @Bean @ConditionalOnPlatformVersion("[1.5.0.RELEASE,2.2.0.M3)") - public TestApplicationTypeCustomizer junit4TestMethodContributor() { + TestApplicationTypeCustomizer junit4TestMethodContributor() { return (typeDeclaration) -> { typeDeclaration.modifiers(Modifier.PUBLIC); JavaMethodDeclaration method = JavaMethodDeclaration.method("contextLoads").modifiers(Modifier.PUBLIC) @@ -72,7 +72,7 @@ class JavaProjectGenerationDefaultContributorsConfiguration { @Bean @ConditionalOnPlatformVersion("2.2.0.M3") - public TestApplicationTypeCustomizer junitJupiterTestMethodContributor() { + TestApplicationTypeCustomizer junitJupiterTestMethodContributor() { return (typeDeclaration) -> { JavaMethodDeclaration method = JavaMethodDeclaration.method("contextLoads").returning("void").body(); method.annotate(Annotation.name("org.junit.jupiter.api.Test")); @@ -88,7 +88,7 @@ class JavaProjectGenerationDefaultContributorsConfiguration { static class WarPackagingConfiguration { @Bean - public ServletInitializerCustomizer javaServletInitializerCustomizer( + ServletInitializerCustomizer javaServletInitializerCustomizer( ResolvedProjectDescription projectDescription) { return (typeDeclaration) -> { typeDeclaration.modifiers(Modifier.PUBLIC); 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 2a8de159..b7ceea3b 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 @@ -54,7 +54,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { @Bean @ConditionalOnPlatformVersion("[1.5.0.RELEASE,2.2.0.M3)") - public TestApplicationTypeCustomizer junit4TestMethodContributor() { + TestApplicationTypeCustomizer junit4TestMethodContributor() { return (typeDeclaration) -> { KotlinFunctionDeclaration function = KotlinFunctionDeclaration.function("contextLoads").body(); function.annotate(Annotation.name("org.junit.Test")); @@ -64,7 +64,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { @Bean @ConditionalOnPlatformVersion("2.2.0.M3") - public TestApplicationTypeCustomizer junitJupiterTestMethodContributor() { + TestApplicationTypeCustomizer junitJupiterTestMethodContributor() { return (typeDeclaration) -> { KotlinFunctionDeclaration function = KotlinFunctionDeclaration.function("contextLoads").body(); function.annotate(Annotation.name("org.junit.jupiter.api.Test")); @@ -73,7 +73,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { } @Bean - public BuildCustomizer kotlinDependenciesConfigurer(ResolvedProjectDescription projectDescription) { + BuildCustomizer kotlinDependenciesConfigurer(ResolvedProjectDescription projectDescription) { return new KotlinDependenciesConfigurer(projectDescription.getPlatformVersion()); } @@ -86,12 +86,12 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { @Bean @ConditionalOnBuildSystem(MavenBuildSystem.ID) - public KotlinMavenFullBuildCustomizer kotlinBuildCustomizer(KotlinProjectSettings kotlinProjectSettings) { + KotlinMavenFullBuildCustomizer kotlinBuildCustomizer(KotlinProjectSettings kotlinProjectSettings) { return new KotlinMavenFullBuildCustomizer(kotlinProjectSettings); } @Bean - public MainCompilationUnitCustomizer boot15MainFunctionContributor( + MainCompilationUnitCustomizer boot15MainFunctionContributor( ResolvedProjectDescription projectDescription) { return (compilationUnit) -> compilationUnit.addTopLevelFunction( KotlinFunctionDeclaration.function("main").parameters(new Parameter("Array", "args")) @@ -111,12 +111,12 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { @Bean @ConditionalOnBuildSystem(MavenBuildSystem.ID) - public KotlinMavenBuildCustomizer kotlinBuildCustomizer(KotlinProjectSettings kotlinProjectSettings) { + KotlinMavenBuildCustomizer kotlinBuildCustomizer(KotlinProjectSettings kotlinProjectSettings) { return new KotlinMavenBuildCustomizer(kotlinProjectSettings); } @Bean - public MainCompilationUnitCustomizer mainFunctionContributor( + MainCompilationUnitCustomizer mainFunctionContributor( ResolvedProjectDescription projectDescription) { return (compilationUnit) -> compilationUnit.addTopLevelFunction( KotlinFunctionDeclaration.function("main").parameters(new Parameter("Array", "args")) @@ -135,7 +135,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { static class WarPackagingConfiguration { @Bean - public ServletInitializerCustomizer javaServletInitializerCustomizer( + ServletInitializerCustomizer javaServletInitializerCustomizer( ResolvedProjectDescription projectDescription) { return (typeDeclaration) -> { KotlinFunctionDeclaration configure = KotlinFunctionDeclaration.function("configure") @@ -161,7 +161,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { static class KotlinGradleProjectConfiguration { @Bean - public KotlinGradleBuildCustomizer kotlinBuildCustomizer(KotlinProjectSettings kotlinProjectSettings) { + KotlinGradleBuildCustomizer kotlinBuildCustomizer(KotlinProjectSettings kotlinProjectSettings) { return new GroovyDslKotlinGradleBuildCustomizer(kotlinProjectSettings); } @@ -177,7 +177,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration { static class KotlinGradleKtsProjectConfiguration { @Bean - public KotlinDslKotlinGradleBuildCustomizer kotlinBuildCustomizer(KotlinProjectSettings kotlinProjectSettings) { + KotlinDslKotlinGradleBuildCustomizer kotlinBuildCustomizer(KotlinProjectSettings kotlinProjectSettings) { return new KotlinDslKotlinGradleBuildCustomizer(kotlinProjectSettings); } diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/util/LambdaSafe.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/util/LambdaSafe.java index 591030d8..93916d1a 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/util/LambdaSafe.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/util/LambdaSafe.java @@ -121,7 +121,7 @@ public final class LambdaSafe { * @param loggerSource the logger source to use * @return this instance */ - public SELF withLogger(Class loggerSource) { + SELF withLogger(Class loggerSource) { return withLogger(LogFactory.getLog(loggerSource)); } @@ -130,7 +130,7 @@ public final class LambdaSafe { * @param logger the logger to use * @return this instance */ - public SELF withLogger(Log logger) { + SELF withLogger(Log logger) { Assert.notNull(logger, "Logger must not be null"); this.logger = logger; return self(); @@ -143,7 +143,7 @@ public final class LambdaSafe { * @param filter the filter to use * @return this instance */ - public SELF withFilter(Filter filter) { + SELF withFilter(Filter filter) { Assert.notNull(filter, "Filter must not be null"); this.filter = filter; return self(); diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java index cefa7596..d726f1d5 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/ConditionalOnGradleVersionTests.java @@ -122,19 +122,19 @@ public class ConditionalOnGradleVersionTests { @Bean @ConditionalOnGradleVersion("3") - public String gradle3() { + String gradle3() { return "testGradle3"; } @Bean @ConditionalOnGradleVersion("4") - public String gradle4() { + String gradle4() { return "testGradle4"; } @Bean @ConditionalOnGradleVersion("5") - public String gradle5() { + String gradle5() { return "testGradle5"; } @@ -145,7 +145,7 @@ public class ConditionalOnGradleVersionTests { @Bean @ConditionalOnGradleVersion({ "3", "4" }) - public String gradle3AndLater() { + String gradle3AndLater() { return "testGradle3AndLater"; } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnBuildSystemTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnBuildSystemTests.java index f1dcc69c..a8b8fc55 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnBuildSystemTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnBuildSystemTests.java @@ -70,25 +70,25 @@ class ConditionalOnBuildSystemTests { @Bean @ConditionalOnBuildSystem("gradle") - public String gradle() { + String gradle() { return "testGradle"; } @Bean @ConditionalOnBuildSystem("maven") - public String maven() { + String maven() { return "testMaven"; } @Bean @ConditionalOnBuildSystem("not-a-build-system") - public String notABuildSystem() { + String notABuildSystem() { return "testNone"; } @Bean @ConditionalOnBuildSystem(id = "gradle", dialect = "kotlin") - public String gradleKotlin() { + String gradleKotlin() { return "testGradleKotlinDialect"; } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnLanguageTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnLanguageTests.java index 344a69fb..a11fd192 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnLanguageTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnLanguageTests.java @@ -85,13 +85,13 @@ class ConditionalOnLanguageTests { @Bean @ConditionalOnLanguage("java") - public String java() { + String java() { return "testJava"; } @Bean @ConditionalOnLanguage("groovy") - public String groovy() { + String groovy() { return "testGroovy"; } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPackagingTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPackagingTests.java index e76d6c17..d5037f4a 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPackagingTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPackagingTests.java @@ -74,13 +74,13 @@ class ConditionalOnPackagingTests { @Bean @ConditionalOnPackaging("jar") - public String jar() { + String jar() { return "testJar"; } @Bean @ConditionalOnPackaging("war") - public String war() { + String war() { return "testWar"; } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPlatformVersionTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPlatformVersionTests.java index 22141459..66ea6890 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPlatformVersionTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnPlatformVersionTests.java @@ -100,13 +100,13 @@ class ConditionalOnPlatformVersionTests { @Bean @ConditionalOnPlatformVersion("[1.0.0.RELEASE, 2.0.0.M1)") - public String first() { + String first() { return "one"; } @Bean @ConditionalOnPlatformVersion("2.0.0.M1") - public String second() { + String second() { return "two"; } @@ -117,7 +117,7 @@ class ConditionalOnPlatformVersionTests { @Bean @ConditionalOnPlatformVersion({ "[1.0.0.RELEASE, 2.0.0.M1)", "2.0.0.RELEASE" }) - public String firstOrSecond() { + String firstOrSecond() { return "oneOrTwo"; } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnRequestedDependencyTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnRequestedDependencyTests.java index 01d96347..40317ac3 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnRequestedDependencyTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/condition/ConditionalOnRequestedDependencyTests.java @@ -63,7 +63,7 @@ class ConditionalOnRequestedDependencyTests { @Bean @ConditionalOnRequestedDependency("web") - public String webActive() { + String webActive() { return "webDependency"; } diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java index a79abbd4..b08c086b 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java @@ -133,13 +133,13 @@ public class InitializrAutoConfiguration { static class InitializrWebConfiguration { @Bean - public InitializrWebConfig initializrWebConfig() { + InitializrWebConfig initializrWebConfig() { return new InitializrWebConfig(); } @Bean @ConditionalOnMissingBean - public MainController initializrMainController(InitializrMetadataProvider metadataProvider, + MainController initializrMainController(InitializrMetadataProvider metadataProvider, TemplateRenderer templateRenderer, DependencyMetadataProvider dependencyMetadataProvider, ProjectGenerationInvoker projectGenerationInvoker) { return new MainController(metadataProvider, templateRenderer, dependencyMetadataProvider, @@ -148,7 +148,7 @@ public class InitializrAutoConfiguration { @Bean @ConditionalOnMissingBean - public ProjectGenerationInvoker projectGenerationInvoker(ApplicationContext applicationContext, + ProjectGenerationInvoker projectGenerationInvoker(ApplicationContext applicationContext, ApplicationEventPublisher eventPublisher, ProjectRequestToDescriptionConverter projectRequestToDescriptionConverter) { return new ProjectGenerationInvoker(applicationContext, eventPublisher, @@ -156,12 +156,12 @@ public class InitializrAutoConfiguration { } @Bean - public ProjectRequestToDescriptionConverter projectRequestToDescriptionConverter() { + ProjectRequestToDescriptionConverter projectRequestToDescriptionConverter() { return new ProjectRequestToDescriptionConverter(); } @Bean - public InitializrModule InitializrJacksonModule() { + InitializrModule InitializrJacksonModule() { return new InitializrModule(); } @@ -175,7 +175,7 @@ public class InitializrAutoConfiguration { static class InitializrCacheConfiguration { @Bean - public JCacheManagerCustomizer initializrCacheManagerCustomizer() { + JCacheManagerCustomizer initializrCacheManagerCustomizer() { return (cacheManager) -> { cacheManager.createCache("initializr.metadata", config().setExpiryPolicyFactory(CreatedExpiryPolicy.factoryOf(Duration.TEN_MINUTES))); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/Agent.java b/initializr-web/src/main/java/io/spring/initializr/web/support/Agent.java index 1daf4957..7921cb35 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/Agent.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/Agent.java @@ -140,7 +140,7 @@ public class Agent { private static final Pattern NETBEANS_REGEX = Pattern.compile("nb-springboot-plugin\\/(.*)"); - public static Agent parse(String userAgent) { + static Agent parse(String userAgent) { Matcher matcher = TOOL_REGEX.matcher(userAgent); if (matcher.matches()) { String name = matcher.group(1); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/CommandLineHelpGenerator.java b/initializr-web/src/main/java/io/spring/initializr/web/support/CommandLineHelpGenerator.java index adfd6e42..fb6b6231 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/CommandLineHelpGenerator.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/CommandLineHelpGenerator.java @@ -232,7 +232,7 @@ public class CommandLineHelpGenerator { * @param content the table content * @return the generated table */ - public static String generate(String[][] content) { + static String generate(String[][] content) { StringBuilder sb = new StringBuilder(); int[] columnsLength = computeColumnsLength(content); appendTableSeparation(sb, columnsLength); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java b/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java index a6faa502..e519fa16 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java @@ -52,7 +52,7 @@ class SpringBootMetadataReader { * Return the boot versions parsed by this instance. * @return the versions */ - public List getBootVersions() { + List getBootVersions() { ArrayNode releases = (ArrayNode) this.content.get("projectReleases"); List list = new ArrayList<>(); for (JsonNode node : releases) { diff --git a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfigurationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfigurationTests.java index ce60a10c..6765cccc 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfigurationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfigurationTests.java @@ -160,7 +160,7 @@ class InitializrAutoConfigurationTests { private static final ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class); @Bean - public RestTemplateCustomizer testRestTemplateCustomizer() { + RestTemplateCustomizer testRestTemplateCustomizer() { return (b) -> b.setErrorHandler(errorHandler); } @@ -170,7 +170,7 @@ class InitializrAutoConfigurationTests { static class CustomTemplateRendererConfiguration { @Bean - public TemplateRenderer testTemplateRenderer() { + TemplateRenderer testTemplateRenderer() { return Mockito.mock(TemplateRenderer.class); } @@ -180,7 +180,7 @@ class InitializrAutoConfigurationTests { static class CustomInitializrMetadataUpdateStrategyConfiguration { @Bean - public InitializrMetadataUpdateStrategy testInitializrMetadataUpdateStrategy() { + InitializrMetadataUpdateStrategy testInitializrMetadataUpdateStrategy() { return Mockito.mock(InitializrMetadataUpdateStrategy.class); } @@ -190,7 +190,7 @@ class InitializrAutoConfigurationTests { static class CustomInitializrMetadataProviderConfiguration { @Bean - public InitializrMetadataProvider testInitializrMetadataProvider() { + InitializrMetadataProvider testInitializrMetadataProvider() { return Mockito.mock(InitializrMetadataProvider.class); } @@ -200,7 +200,7 @@ class InitializrAutoConfigurationTests { static class CustomDependencyMetadataProviderConfiguration { @Bean - public DependencyMetadataProvider testDependencyMetadataProvider() { + DependencyMetadataProvider testDependencyMetadataProvider() { return Mockito.mock(DependencyMetadataProvider.class); } diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationDescriptionCustomizerTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationDescriptionCustomizerTests.java index c247612b..c8e61442 100755 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationDescriptionCustomizerTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationDescriptionCustomizerTests.java @@ -43,7 +43,7 @@ class ProjectGenerationDescriptionCustomizerTests extends AbstractInitializrCont static class ProjectDescriptionCustomizerConfiguration { @Bean - public ProjectDescriptionCustomizer secondPostProcessor() { + ProjectDescriptionCustomizer secondPostProcessor() { return new ProjectDescriptionCustomizer() { @Override public void customize(ProjectDescription description) { @@ -58,7 +58,7 @@ class ProjectGenerationDescriptionCustomizerTests extends AbstractInitializrCont } @Bean - public ProjectDescriptionCustomizer firstPostProcessor() { + ProjectDescriptionCustomizer firstPostProcessor() { return new ProjectDescriptionCustomizer() { @Override public void customize(ProjectDescription description) { diff --git a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationInvokerTests.java b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationInvokerTests.java index ecf484e4..c30bd77c 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationInvokerTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/project/ProjectGenerationInvokerTests.java @@ -191,22 +191,22 @@ public class ProjectGenerationInvokerTests { static class TestConfiguration { @Bean - public IndentingWriterFactory factory() { + IndentingWriterFactory factory() { return IndentingWriterFactory.create(new SimpleIndentStrategy("\t")); } @Bean - public MustacheTemplateRenderer templateRenderer() { + MustacheTemplateRenderer templateRenderer() { return new MustacheTemplateRenderer("classpath:/templates"); } @Bean - public ProjectDirectoryFactory projectDirectoryFactory() { + ProjectDirectoryFactory projectDirectoryFactory() { return (description) -> Files.createTempDirectory("project-"); } @Bean - public InitializrMetadataProvider initializrMetadataProvider() { + InitializrMetadataProvider initializrMetadataProvider() { return () -> metadata; } diff --git a/pom.xml b/pom.xml index 4bebe500..0247080a 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 1.3.3 2.1.6.RELEASE 2.1.1.RELEASE - 0.0.14 + 0.0.15