Upgrade to spring-javaformat 0.0.15

Closes gh-949

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);

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);
 		}
 

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();
 		}
 

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<GradleBuild> springBootPluginContributor(ResolvedProjectDescription projectDescription) {
+		BuildCustomizer<GradleBuild> 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<GradleBuild> springBootPluginContributor(ResolvedProjectDescription projectDescription) {
+		BuildCustomizer<GradleBuild> springBootPluginContributor(ResolvedProjectDescription projectDescription) {
 			return (build) -> build.addPlugin("org.springframework.boot",
 					projectDescription.getPlatformVersion().toString());
 		}
 
 		@Bean
 		@ConditionalOnPlatformVersion("2.2.0.M3")
-		public BuildCustomizer<GradleBuild> testTaskContributor() {
+		BuildCustomizer<GradleBuild> 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<GradleBuild> springBootPluginContributor(ResolvedProjectDescription projectDescription,
+		BuildCustomizer<GradleBuild> 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<GradleBuild> testTaskContributor() {
+		BuildCustomizer<GradleBuild> testTaskContributor() {
 			return (build) -> build.customizeTasksWithType("Test", (test) -> test.invoke("useJUnitPlatform"));
 		}
 
 		@Bean
-		public GradleAnnotationProcessorScopeBuildCustomizer gradleAnnotationProcessorScopeBuildCustomizer() {
+		GradleAnnotationProcessorScopeBuildCustomizer gradleAnnotationProcessorScopeBuildCustomizer() {
 			return new GradleAnnotationProcessorScopeBuildCustomizer();
 		}
 

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<ServletInitializerCustomizer<?>> 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<ServletInitializerCustomizer<?>> servletInitializerCustomizers) {
 			return new ServletInitializerContributor(this.projectDescription.getPackageName(),
 					"org.springframework.boot.web.servlet.support.SpringBootServletInitializer",

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<GroovyTypeDeclaration> mainMethodContributor() {
+	MainApplicationTypeCustomizer<GroovyTypeDeclaration> 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<GroovyTypeDeclaration> junit4TestMethodContributor() {
+	TestApplicationTypeCustomizer<GroovyTypeDeclaration> 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<GroovyTypeDeclaration> junitJupiterTestMethodContributor() {
+	TestApplicationTypeCustomizer<GroovyTypeDeclaration> 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<Build> groovyDependenciesConfigurer() {
+	BuildCustomizer<Build> groovyDependenciesConfigurer() {
 		return new GroovyDependenciesConfigurer();
 	}
 
@@ -94,7 +94,7 @@ class GroovyProjectGenerationDefaultContributorsConfiguration {
 	static class WarPackagingConfiguration {
 
 		@Bean
-		public ServletInitializerCustomizer<GroovyTypeDeclaration> javaServletInitializerCustomizer(
+		ServletInitializerCustomizer<GroovyTypeDeclaration> 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();
 		}
 

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<JavaTypeDeclaration> mainMethodContributor() {
+	MainApplicationTypeCustomizer<JavaTypeDeclaration> 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<JavaTypeDeclaration> junit4TestMethodContributor() {
+	TestApplicationTypeCustomizer<JavaTypeDeclaration> 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<JavaTypeDeclaration> junitJupiterTestMethodContributor() {
+	TestApplicationTypeCustomizer<JavaTypeDeclaration> 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<JavaTypeDeclaration> javaServletInitializerCustomizer(
+		ServletInitializerCustomizer<JavaTypeDeclaration> javaServletInitializerCustomizer(
 				ResolvedProjectDescription projectDescription) {
 			return (typeDeclaration) -> {
 				typeDeclaration.modifiers(Modifier.PUBLIC);

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<KotlinTypeDeclaration> junit4TestMethodContributor() {
+	TestApplicationTypeCustomizer<KotlinTypeDeclaration> 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<KotlinTypeDeclaration> junitJupiterTestMethodContributor() {
+	TestApplicationTypeCustomizer<KotlinTypeDeclaration> 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<Build> kotlinDependenciesConfigurer(ResolvedProjectDescription projectDescription) {
+	BuildCustomizer<Build> 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<KotlinTypeDeclaration, KotlinCompilationUnit> boot15MainFunctionContributor(
+		MainCompilationUnitCustomizer<KotlinTypeDeclaration, KotlinCompilationUnit> boot15MainFunctionContributor(
 				ResolvedProjectDescription projectDescription) {
 			return (compilationUnit) -> compilationUnit.addTopLevelFunction(
 					KotlinFunctionDeclaration.function("main").parameters(new Parameter("Array<String>", "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<KotlinTypeDeclaration, KotlinCompilationUnit> mainFunctionContributor(
+		MainCompilationUnitCustomizer<KotlinTypeDeclaration, KotlinCompilationUnit> mainFunctionContributor(
 				ResolvedProjectDescription projectDescription) {
 			return (compilationUnit) -> compilationUnit.addTopLevelFunction(
 					KotlinFunctionDeclaration.function("main").parameters(new Parameter("Array<String>", "args"))
@@ -135,7 +135,7 @@ class KotlinProjectGenerationDefaultContributorsConfiguration {
 	static class WarPackagingConfiguration {
 
 		@Bean
-		public ServletInitializerCustomizer<KotlinTypeDeclaration> javaServletInitializerCustomizer(
+		ServletInitializerCustomizer<KotlinTypeDeclaration> 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);
 		}
 

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<C, A> filter) {
+		SELF withFilter(Filter<C, A> filter) {
 			Assert.notNull(filter, "Filter must not be null");
 			this.filter = filter;
 			return self();

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";
 		}
 

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";
 		}
 

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";
 		}
 

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";
 		}
 

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";
 		}
 

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";
 		}
 

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)));

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);

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);

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<DefaultMetadataElement> getBootVersions() {
+	List<DefaultMetadataElement> getBootVersions() {
 		ArrayNode releases = (ArrayNode) this.content.get("projectReleases");
 		List<DefaultMetadataElement> list = new ArrayList<>();
 		for (JsonNode node : releases) {

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);
 		}
 

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) {

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;
 		}
 

pom.xml

@@ -46,7 +46,7 @@
 		<maven-resolver.version>1.3.3</maven-resolver.version>
 		<spring-boot.version>2.1.6.RELEASE</spring-boot.version>
 		<spring-cloud-contract.version>2.1.1.RELEASE</spring-cloud-contract.version>
-		<spring-javaformat.version>0.0.14</spring-javaformat.version>
+		<spring-javaformat.version>0.0.15</spring-javaformat.version>
 	</properties>
 
 	<modules>