Skip to content

Commit 9a62652

Browse files
fabapp2fabapp2
committed
Format Java
1 parent 414c94e commit 9a62652

File tree

8 files changed

+606
-517
lines changed

8 files changed

+606
-517
lines changed

‎spring-rewrite-commons-launcher/src/main/java/org/springframework/rewrite/RewriteProjectParser.java

+9-6
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,11 @@ public RewriteProjectParsingResult parse(Path givenBaseDir, List<Resource> resou
160160
private List<SourceFile> runInMavenSession(ExecutionEvent onSuccess, Path baseDir, List<Resource> resources) {
161161
List<NamedStyles> styles = List.of();
162162
List<MavenProject> sortedProjects = onSuccess.getSession()
163-
.getProjectDependencyGraph()
164-
.getSortedProjects()
165-
.stream()
166-
.map(p -> this.mavenProjectToMavenProject(p, artifactDownloader, resources))
167-
.toList();
163+
.getProjectDependencyGraph()
164+
.getSortedProjects()
165+
.stream()
166+
.map(p -> this.mavenProjectToMavenProject(p, artifactDownloader, resources))
167+
.toList();
168168

169169
ParserContext parserContext = new ParserContext(baseDir, resources, sortedProjects);
170170

@@ -203,7 +203,10 @@ private MavenProject mavenProjectToMavenProject(org.apache.maven.project.MavenPr
203203
File file = mavenProject.getExecutionProject().getFile();
204204
Resource rootPom = new FileSystemResource(file);
205205
MavenProject newMavenProject = new MavenProject(baseDir, rootPom, artifactDownloader, resources);
206-
List<MavenProject> mavenProjects = mavenProject.getCollectedProjects().stream().map(p -> this.mavenProjectToMavenProject(p, artifactDownloader, resources)).toList();
206+
List<MavenProject> mavenProjects = mavenProject.getCollectedProjects()
207+
.stream()
208+
.map(p -> this.mavenProjectToMavenProject(p, artifactDownloader, resources))
209+
.toList();
207210
newMavenProject.setReactorProjects(mavenProjects);
208211
return newMavenProject;
209212
}

‎spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/RewriteProjectParserIntegrationTest.java

+54-23
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,28 @@ void testFailingProject() {
8989
@DisplayName("parseResources")
9090
void parseResources() {
9191
Path baseDir = TestProjectHelper.getMavenProject("resources");
92-
ParserParityTestHelper.scanProjectDir(baseDir).parseSequentially().verifyParity((comparingParsingResult, testedParsingResult) -> {
93-
assertThat(comparingParsingResult.sourceFiles()).hasSize(5);
94-
});
92+
ParserParityTestHelper.scanProjectDir(baseDir)
93+
.parseSequentially()
94+
.verifyParity((comparingParsingResult, testedParsingResult) -> {
95+
assertThat(comparingParsingResult.sourceFiles()).hasSize(5);
96+
});
9597
}
9698

9799
@Test
98100
@DisplayName("parseResources")
99101
void parseResourcesRewriteOnly() {
100102
Path baseDir = TestProjectHelper.getMavenProject("resources");
101-
RewriteProjectParsingResult parsingResult = new ParserExecutionHelper().parseWithComparingParser(baseDir, new SpringRewriteProperties(), new RewriteExecutionContext());
102-
List<String> list = parsingResult.sourceFiles().get(3).getMarkers().findFirst(JavaSourceSet.class).get().getClasspath().stream().map(fqn -> fqn.getFullyQualifiedName()).toList();
103+
RewriteProjectParsingResult parsingResult = new ParserExecutionHelper().parseWithComparingParser(baseDir,
104+
new SpringRewriteProperties(), new RewriteExecutionContext());
105+
List<String> list = parsingResult.sourceFiles()
106+
.get(3)
107+
.getMarkers()
108+
.findFirst(JavaSourceSet.class)
109+
.get()
110+
.getClasspath()
111+
.stream()
112+
.map(fqn -> fqn.getFullyQualifiedName())
113+
.toList();
103114
assertThat(list).contains("javax.validation.BootstrapConfiguration");
104115
}
105116

@@ -111,22 +122,32 @@ void parseResourcesMavenExecutor() {
111122
AtomicReference<List<String>> cpRef = new AtomicReference<>();
112123
new MavenExecutor(event -> {
113124
MavenSession mavenSession = event.getSession();
114-
MavenProject application = mavenSession.getProjects().stream().filter(p -> p.getArtifactId().equals("application")).findFirst().get();
125+
MavenProject application = mavenSession.getProjects()
126+
.stream()
127+
.filter(p -> p.getArtifactId().equals("application"))
128+
.findFirst()
129+
.get();
115130
List<Dependency> compileDependencies = application.getCompileDependencies();
116131
try {
117132
List<String> compileClasspathElements = application.getCompileClasspathElements();
118133
cpRef.set(compileClasspathElements);
119-
} catch (DependencyResolutionRequiredException e) {
134+
}
135+
catch (DependencyResolutionRequiredException e) {
120136
throw new RuntimeException(e);
121137
}
122138

123-
})
124-
.execute(List.of("clean", "package"), baseDir);
139+
}).execute(List.of("clean", "package"), baseDir);
125140

126141
assertThat(cpRef.get()).contains(
127-
Path.of(System.getProperty("user.home")).resolve(".m2/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar").toString(),
128-
Path.of(".").resolve("testcode/maven-projects/resources/application/target/classes").toAbsolutePath().normalize().toString()
129-
);
142+
Path.of(System.getProperty("user.home"))
143+
.resolve(
144+
".m2/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar")
145+
.toString(),
146+
Path.of(".")
147+
.resolve("testcode/maven-projects/resources/application/target/classes")
148+
.toAbsolutePath()
149+
.normalize()
150+
.toString());
130151
}
131152

132153
@Test
@@ -137,22 +158,32 @@ void parseTest1MavenExecutor() {
137158
AtomicReference<List<String>> cpRef = new AtomicReference<>();
138159
new MavenExecutor(event -> {
139160
MavenSession mavenSession = event.getSession();
140-
MavenProject application = mavenSession.getProjects().stream().filter(p -> p.getArtifactId().equals("dummy-root")).findFirst().get();
161+
MavenProject application = mavenSession.getProjects()
162+
.stream()
163+
.filter(p -> p.getArtifactId().equals("dummy-root"))
164+
.findFirst()
165+
.get();
141166
List<Dependency> compileDependencies = application.getCompileDependencies();
142-
try {
143-
List<String> compileClasspathElements = application.getCompileClasspathElements();
167+
try {
168+
List<String> compileClasspathElements = application.getCompileClasspathElements();
144169
cpRef.set(compileClasspathElements);
145-
} catch (DependencyResolutionRequiredException e) {
146-
throw new RuntimeException(e);
147-
}
170+
}
171+
catch (DependencyResolutionRequiredException e) {
172+
throw new RuntimeException(e);
173+
}
148174

149-
})
150-
.execute(List.of("clean", "package"), baseDir);
175+
}).execute(List.of("clean", "package"), baseDir);
151176

152177
assertThat(cpRef.get()).contains(
153-
Path.of(System.getProperty("user.home")).resolve(".m2/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar").toString(),
154-
Path.of(".").resolve("testcode/maven-projects/test1/target/classes").toAbsolutePath().normalize().toString()
155-
);
178+
Path.of(System.getProperty("user.home"))
179+
.resolve(
180+
".m2/repository/javax/validation/validation-api/2.0.1.Final/validation-api-2.0.1.Final.jar")
181+
.toString(),
182+
Path.of(".")
183+
.resolve("testcode/maven-projects/test1/target/classes")
184+
.toAbsolutePath()
185+
.normalize()
186+
.toString());
156187
}
157188

158189
@Test

‎spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/ComparingParserFactory.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ public OpenRewriteProjectParser createComparingParser() {
3838
}
3939

4040
public OpenRewriteProjectParser createComparingParser(SpringRewriteProperties springRewriteProperties) {
41-
OpenRewriteProjectParser mavenProjectParser1 = new OpenRewriteProjectParser(springRewriteProperties, new RewriteExecutionContext());
41+
OpenRewriteProjectParser mavenProjectParser1 = new OpenRewriteProjectParser(springRewriteProperties,
42+
new RewriteExecutionContext());
4243
return mavenProjectParser1;
4344
}
4445

‎spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/parser/maven/RewriteMavenProjectParser.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ private RewriteProjectParsingResult parseInternal(Path baseDir, ExecutionContext
105105
MavenMojoProjectParser rewriteProjectParser = mavenMojoProjectParserFactory.create(baseDir, mavenProjects,
106106
plexusContainer, session);
107107
List<NamedStyles> styles = List.of();
108-
List<SourceFile> sourceFiles = parseSourceFiles(session.getTopLevelProject(), rewriteProjectParser, mavenProjects, styles,
109-
executionContext);
108+
List<SourceFile> sourceFiles = parseSourceFiles(session.getTopLevelProject(), rewriteProjectParser,
109+
mavenProjects, styles, executionContext);
110110
parsingResult.set(new RewriteProjectParsingResult(sourceFiles, executionContext));
111111
}).execute(List.of("clean", "package", "--fail-at-end"), baseDir);
112112

@@ -117,11 +117,11 @@ private void clearScanScopedBeans() {
117117
scanScope.clear(beanFactory);
118118
}
119119

120-
private List<SourceFile> parseSourceFiles(MavenProject rootMavenProject, MavenMojoProjectParser rewriteProjectParser,
121-
List<MavenProject> mavenProjects, List<NamedStyles> styles, ExecutionContext executionContext) {
120+
private List<SourceFile> parseSourceFiles(MavenProject rootMavenProject,
121+
MavenMojoProjectParser rewriteProjectParser, List<MavenProject> mavenProjects, List<NamedStyles> styles,
122+
ExecutionContext executionContext) {
122123
try {
123-
Stream<SourceFile> sourceFileStream = rewriteProjectParser.listSourceFiles(
124-
rootMavenProject,
124+
Stream<SourceFile> sourceFileStream = rewriteProjectParser.listSourceFiles(rootMavenProject,
125125
// access to root
126126
// module
127127
styles, executionContext);

‎spring-rewrite-commons-launcher/src/test/java/org/springframework/rewrite/test/util/ParserParityTestHelper.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,8 @@ else if (actual instanceof String) {
432432
}
433433

434434
static void compareMarker(SoftAssertions softAssertions, Marker expectedMarker, Marker actualMarker) {
435-
softAssertions.assertThat(actualMarker).usingRecursiveComparison()
435+
softAssertions.assertThat(actualMarker)
436+
.usingRecursiveComparison()
436437
.withStrictTypeChecking()
437438
.ignoringCollectionOrder()
438439
.withEqualsForFields(equalsClasspath(), "classpath")
@@ -458,7 +459,7 @@ static void compareMarker(SoftAssertions softAssertions, Marker expectedMarker,
458459
.sorted()
459460
.toList();
460461
boolean equals = c1Sorted.equals(c2Sorted);
461-
if(!equals) {
462+
if (!equals) {
462463
List<String> differences = new ArrayList<>(c1Sorted);
463464
differences.removeAll(c2Sorted);
464465
String diff = differences.stream().collect(Collectors.joining("\n"));

0 commit comments

Comments
 (0)