Skip to content

Commit 10d4148

Browse files
committed
Apply Java modernization idioms across the codebase
Replace String.format() with String.formatted() and apply instanceof pattern matching to align with the established conventions already used throughout the project. Signed-off-by: eunseo9311 <eunseo9311@gmail.com> Signed-off-by: Eunseo Song <162149585+eunseo9311@users.noreply.github.com>
1 parent 5f77896 commit 10d4148

File tree

31 files changed

+66
-66
lines changed

31 files changed

+66
-66
lines changed

initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectGenerationStatPublisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void handleEvent(ProjectRequestEvent event) {
8888
});
8989
}
9090
catch (Exception ex) {
91-
logger.warn(String.format("Failed to publish stat to index, document follows %n%n%s%n", json), ex);
91+
logger.warn("Failed to publish stat to index, document follows %n%n%s%n".formatted(json), ex);
9292
}
9393
}
9494

initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ public static class VersionInformation {
211211

212212
public VersionInformation(Version version) {
213213
this.id = version.toString();
214-
this.major = String.format("%s", version.getMajor());
215-
this.minor = (version.getMinor() != null) ? String.format("%s.%s", version.getMajor(), version.getMinor())
214+
this.major = "%s".formatted(version.getMajor());
215+
this.minor = (version.getMinor() != null) ? "%s.%s".formatted(version.getMajor(), version.getMinor())
216216
: null;
217217
}
218218

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/scm/git/GitIgnore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void write(PrintWriter writer) {
139139
if (!this.items.isEmpty()) {
140140
if (this.name != null) {
141141
writer.println();
142-
writer.println(String.format("### %s ###", this.name));
142+
writer.println("### %s ###".formatted(this.name));
143143
}
144144
this.items.forEach(writer::println);
145145
}

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleKtsProjectGenerationConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void gradleWrapperIsContributedWhenGeneratingGradleKtsProject(String platformVer
104104
assertThat(project).containsFiles("gradlew", "gradlew.bat", "gradle/wrapper/gradle-wrapper.properties",
105105
"gradle/wrapper/gradle-wrapper.jar");
106106
assertThat(project).textFile("gradle/wrapper/gradle-wrapper.properties")
107-
.containsOnlyOnce(String.format("gradle-%s-bin.zip", expectedGradleVersion));
107+
.containsOnlyOnce("gradle-%s-bin.zip".formatted(expectedGradleVersion));
108108
}
109109

110110
@Test

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void gradleWrapperIsContributedWhenGeneratingGradleProject(String platformVersio
103103
assertThat(project).containsFiles("gradlew", "gradlew.bat", "gradle/wrapper/gradle-wrapper.properties",
104104
"gradle/wrapper/gradle-wrapper.jar");
105105
assertThat(project).textFile("gradle/wrapper/gradle-wrapper.properties")
106-
.containsOnlyOnce(String.format("gradle-%s-bin.zip", expectedGradleVersion));
106+
.containsOnlyOnce("gradle-%s-bin.zip".formatted(expectedGradleVersion));
107107
}
108108

109109
@Test

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/gradle/GradleWrapperContributorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void gradleWrapperSetExecutableFlagOnScripts(String gradleVersion) throws IOExce
5454
private Consumer<Path> isNotExecutable() {
5555
return (path) -> {
5656
if (supportsExecutableFlag() && Files.isExecutable(path)) {
57-
throw Failures.instance().failure(String.format("%nExpecting:%n <%s>%nto not be executable.", path));
57+
throw Failures.instance().failure("%nExpecting:%n <%s>%nto not be executable.".formatted(path));
5858
}
5959
};
6060
}

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/maven/MavenWrapperContributorTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void mavenWrapperSetExecutableFlagOnScripts(String mavenVersion) throws IOExcept
5252
private Consumer<Path> isNotExecutable() {
5353
return (path) -> {
5454
if (supportsExecutableFlag() && Files.isExecutable(path)) {
55-
throw Failures.instance().failure(String.format("%nExpecting:%n <%s>%nto not be executable.", path));
55+
throw Failures.instance().failure("%nExpecting:%n <%s>%nto not be executable.".formatted(path));
5656
}
5757
};
5858
}

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ void currentGenerationJar(Language language) {
5656
ProjectStructure project = generateProject(language, maven, "2.4.1");
5757
assertThat(project).filePaths()
5858
.contains(
59-
String.format("src/main/%s/com/example/demo/DemoApplication.%s", language.id(),
59+
"src/main/%s/com/example/demo/DemoApplication.%s".formatted(language.id(),
6060
language.sourceFileExtension()),
61-
String.format("src/test/%s/com/example/demo/DemoApplicationTests.%s", language.id(),
61+
"src/test/%s/com/example/demo/DemoApplicationTests.%s".formatted(language.id(),
6262
language.sourceFileExtension()));
6363
}
6464

@@ -69,9 +69,9 @@ void currentGenerationWar(Language language) {
6969
(description) -> description.setPackaging(Packaging.forId("war")));
7070
assertThat(project).filePaths()
7171
.contains(
72-
String.format("src/main/%s/com/example/demo/DemoApplication.%s", language.id(),
72+
"src/main/%s/com/example/demo/DemoApplication.%s".formatted(language.id(),
7373
language.sourceFileExtension()),
74-
String.format("src/test/%s/com/example/demo/DemoApplicationTests.%s", language.id(),
74+
"src/test/%s/com/example/demo/DemoApplicationTests.%s".formatted(language.id(),
7575
language.sourceFileExtension()));
7676
}
7777

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/documentation/HelpDocumentProjectContributorTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void helpDocumentWithLinksToOtherLinks() throws IOException {
8989
@Test
9090
void helpDocumentWithSimpleSection() throws IOException {
9191
HelpDocument document = new HelpDocument(this.templateRenderer);
92-
document.addSection((writer) -> writer.println(String.format("# My test section%n%n * Test")));
92+
document.addSection((writer) -> writer.println("# My test section%n%n * Test".formatted()));
9393
assertHelpDocument(document).containsExactly("# My test section", "", " * Test");
9494
}
9595

@@ -98,7 +98,7 @@ void helpDocumentWithLinksAndSimpleSection() throws IOException {
9898
HelpDocument document = new HelpDocument(this.templateRenderer);
9999
document.gettingStarted()
100100
.addGuideLink("https://test.example.com", "test")
101-
.addSection((writer) -> writer.println(String.format("# My test section%n%n * Test")));
101+
.addSection((writer) -> writer.println("# My test section%n%n * Test".formatted()));
102102
assertHelpDocument(document).containsExactly("# Getting Started", "", "### Guides",
103103
"The following guides illustrate how to use some features concretely:", "",
104104
"* [test](https://test.example.com)", "", "# My test section", "", " * Test");

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/properties/ApplicationPropertiesComplianceTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static Stream<Arguments> parameters() {
5757
void applicationPropertiesGenerated(ConfigurationFileFormat format, String fileName) {
5858
ProjectStructure project = generateProject(java, maven, "2.4.1",
5959
(description) -> description.setConfigurationFileFormat(format));
60-
assertThat(project).filePaths().contains(String.format("src/main/resources/%s", fileName));
60+
assertThat(project).filePaths().contains("src/main/resources/%s".formatted(fileName));
6161
}
6262

6363
@ParameterizedTest
@@ -69,7 +69,7 @@ void applicationPropertiesWithCustomProperties(ConfigurationFileFormat format, S
6969
ApplicationPropertiesCustomizer.class,
7070
() -> (properties) -> properties.add("spring.application.name", "app-name")));
7171
String path = "project/properties/" + format + "/" + getAssertFileName(fileName);
72-
assertThat(project).textFile(String.format("src/main/resources/%s", fileName))
72+
assertThat(project).textFile("src/main/resources/%s".formatted(fileName))
7373
.as("Resource " + path)
7474
.hasSameContentAs(new ClassPathResource(path));
7575
}

0 commit comments

Comments
 (0)