lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2026-09-27 14:57:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to spring-javaformat 0.0.15

Browse Source 
Closes gh-949
This commit is contained in:
Stephane Nicoll
2019-07-10 14:57:35 +02:00
parent 6af13f6dde
commit 449b22403a
23 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java
+16 -16
View File
@@ -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
+2 -2
View File
@@ -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
+7 -7
View File
@@ -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
+4 -4
View File
@@ -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
+10 -10
View File
@@ -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
+3 -3
View File
@@ -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
+4 -4
View File
@@ -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";
}