mirror of
https://gitee.com/dcren/initializr.git
synced 2026-09-27 14:57:39 +08:00
Upgrade to spring javaformat 0.0.35
This commit is contained in:
+16
-16
@@ -164,22 +164,22 @@ public abstract class GradleBuildWriter {
|
|||||||
return "implementation";
|
return "implementation";
|
||||||
}
|
}
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case ANNOTATION_PROCESSOR:
|
case ANNOTATION_PROCESSOR:
|
||||||
return "annotationProcessor";
|
return "annotationProcessor";
|
||||||
case COMPILE:
|
case COMPILE:
|
||||||
return "implementation";
|
return "implementation";
|
||||||
case COMPILE_ONLY:
|
case COMPILE_ONLY:
|
||||||
return "compileOnly";
|
return "compileOnly";
|
||||||
case PROVIDED_RUNTIME:
|
case PROVIDED_RUNTIME:
|
||||||
return "providedRuntime";
|
return "providedRuntime";
|
||||||
case RUNTIME:
|
case RUNTIME:
|
||||||
return "runtimeOnly";
|
return "runtimeOnly";
|
||||||
case TEST_COMPILE:
|
case TEST_COMPILE:
|
||||||
return "testImplementation";
|
return "testImplementation";
|
||||||
case TEST_RUNTIME:
|
case TEST_RUNTIME:
|
||||||
return "testRuntimeOnly";
|
return "testRuntimeOnly";
|
||||||
default:
|
default:
|
||||||
throw new IllegalStateException("Unrecognized dependency type '" + type + "'");
|
throw new IllegalStateException("Unrecognized dependency type '" + type + "'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+33
-33
@@ -264,22 +264,22 @@ public class MavenBuildWriter {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case ANNOTATION_PROCESSOR:
|
case ANNOTATION_PROCESSOR:
|
||||||
return null;
|
return null;
|
||||||
case COMPILE:
|
case COMPILE:
|
||||||
return null;
|
return null;
|
||||||
case COMPILE_ONLY:
|
case COMPILE_ONLY:
|
||||||
return null;
|
return null;
|
||||||
case PROVIDED_RUNTIME:
|
case PROVIDED_RUNTIME:
|
||||||
return "provided";
|
return "provided";
|
||||||
case RUNTIME:
|
case RUNTIME:
|
||||||
return "runtime";
|
return "runtime";
|
||||||
case TEST_COMPILE:
|
case TEST_COMPILE:
|
||||||
return "test";
|
return "test";
|
||||||
case TEST_RUNTIME:
|
case TEST_RUNTIME:
|
||||||
return "test";
|
return "test";
|
||||||
default:
|
default:
|
||||||
throw new IllegalStateException("Unrecognized dependency type '" + type + "'");
|
throw new IllegalStateException("Unrecognized dependency type '" + type + "'");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -613,23 +613,23 @@ public class MavenBuildWriter {
|
|||||||
for (int i = 0; i < text.length(); i++) {
|
for (int i = 0; i < text.length(); i++) {
|
||||||
char character = text.charAt(i);
|
char character = text.charAt(i);
|
||||||
switch (character) {
|
switch (character) {
|
||||||
case '\'':
|
case '\'':
|
||||||
sb.append("'");
|
sb.append("'");
|
||||||
break;
|
break;
|
||||||
case '\"':
|
case '\"':
|
||||||
sb.append(""");
|
sb.append(""");
|
||||||
break;
|
break;
|
||||||
case '<':
|
case '<':
|
||||||
sb.append("<");
|
sb.append("<");
|
||||||
break;
|
break;
|
||||||
case '>':
|
case '>':
|
||||||
sb.append(">");
|
sb.append(">");
|
||||||
break;
|
break;
|
||||||
case '&':
|
case '&':
|
||||||
sb.append("&");
|
sb.append("&");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
sb.append(character);
|
sb.append(character);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
|
|||||||
+12
-12
@@ -52,18 +52,18 @@ public final class MetadataBuildItemMapper {
|
|||||||
|
|
||||||
private static DependencyScope toDependencyScope(String scope) {
|
private static DependencyScope toDependencyScope(String scope) {
|
||||||
switch (scope) {
|
switch (scope) {
|
||||||
case Dependency.SCOPE_ANNOTATION_PROCESSOR:
|
case Dependency.SCOPE_ANNOTATION_PROCESSOR:
|
||||||
return DependencyScope.ANNOTATION_PROCESSOR;
|
return DependencyScope.ANNOTATION_PROCESSOR;
|
||||||
case Dependency.SCOPE_COMPILE:
|
case Dependency.SCOPE_COMPILE:
|
||||||
return DependencyScope.COMPILE;
|
return DependencyScope.COMPILE;
|
||||||
case Dependency.SCOPE_RUNTIME:
|
case Dependency.SCOPE_RUNTIME:
|
||||||
return DependencyScope.RUNTIME;
|
return DependencyScope.RUNTIME;
|
||||||
case Dependency.SCOPE_COMPILE_ONLY:
|
case Dependency.SCOPE_COMPILE_ONLY:
|
||||||
return DependencyScope.COMPILE_ONLY;
|
return DependencyScope.COMPILE_ONLY;
|
||||||
case Dependency.SCOPE_PROVIDED:
|
case Dependency.SCOPE_PROVIDED:
|
||||||
return DependencyScope.PROVIDED_RUNTIME;
|
return DependencyScope.PROVIDED_RUNTIME;
|
||||||
case Dependency.SCOPE_TEST:
|
case Dependency.SCOPE_TEST:
|
||||||
return DependencyScope.TEST_COMPILE;
|
return DependencyScope.TEST_COMPILE;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -156,12 +156,12 @@ public class ProjectMetadataController extends AbstractMetadataController {
|
|||||||
|
|
||||||
private static InitializrMetadataJsonMapper getJsonMapper(InitializrMetadataVersion version) {
|
private static InitializrMetadataJsonMapper getJsonMapper(InitializrMetadataVersion version) {
|
||||||
switch (version) {
|
switch (version) {
|
||||||
case V2:
|
case V2:
|
||||||
return new InitializrMetadataV2JsonMapper();
|
return new InitializrMetadataV2JsonMapper();
|
||||||
case V2_1:
|
case V2_1:
|
||||||
return new InitializrMetadataV21JsonMapper();
|
return new InitializrMetadataV21JsonMapper();
|
||||||
default:
|
default:
|
||||||
return new InitializrMetadataV22JsonMapper();
|
return new InitializrMetadataV22JsonMapper();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+6
-6
@@ -239,12 +239,12 @@ public abstract class AbstractInitializrIntegrationTests {
|
|||||||
Path archiveFile = writeArchive(content);
|
Path archiveFile = writeArchive(content);
|
||||||
Path project = this.folder.resolve("project");
|
Path project = this.folder.resolve("project");
|
||||||
switch (archiveType) {
|
switch (archiveType) {
|
||||||
case ZIP:
|
case ZIP:
|
||||||
unzip(archiveFile, project);
|
unzip(archiveFile, project);
|
||||||
break;
|
break;
|
||||||
case TGZ:
|
case TGZ:
|
||||||
untar(archiveFile, project);
|
untar(archiveFile, project);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return new ProjectStructure(project);
|
return new ProjectStructure(project);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,7 +84,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</activation>
|
</activation>
|
||||||
<properties>
|
<properties>
|
||||||
<spring-javaformat.version>0.0.33</spring-javaformat.version>
|
<spring-javaformat.version>0.0.35</spring-javaformat.version>
|
||||||
<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
|
<nohttp-checkstyle.version>0.0.10</nohttp-checkstyle.version>
|
||||||
</properties>
|
</properties>
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
Reference in New Issue
Block a user