cleanup

- Remove learning test
- Remove JavaParser frm BuildFile constructor
- remove comment
- remove unused code

Author: fabapp2

applications/spring-shell/src/test/java/org/springframework/sbm/BootifyAnnotatedServletsIntegrationTest.java

@@ -106,7 +106,6 @@ void happyPath() {
         assertThat(content).contains("@ServletComponentScan").withFailMessage(() -> "@ServletComponentScan annotation not found");
 
         executeMavenGoals(getTestDir(), "package");
-//        int port = springBootStart();
 
         executeMavenGoals(getTestDir(), "package", "spring-boot:build-image");
 
@@ -117,7 +116,6 @@ void happyPath() {
 
         assertThat(response).isEqualTo("Hello World!");
 
-//        springBootStop();
     }
 
 }

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/OpenRewriteMavenBuildFile.java

@@ -48,8 +48,6 @@
 public class OpenRewriteMavenBuildFile extends RewriteSourceFileHolder<Xml.Document> implements BuildFile {
 
     private final ApplicationEventPublisher eventPublisher;
-    private final RewriteMavenParser mavenParser = new RewriteMavenParser();
-    private final JavaParser javaParser;
 
     // TODO: #7 clarify if RefreshPomModel is still required?
     // Execute separately since RefreshPomModel caches the refreshed maven files after the first visit
@@ -115,10 +113,9 @@ public String getDisplayName() {
 
     private final RewriteExecutionContext executionContext;
 
-    public OpenRewriteMavenBuildFile(Path absoluteProjectPath, Xml.Document sourceFile, ApplicationEventPublisher eventPublisher, JavaParser javaParser, RewriteExecutionContext executionContext) {
+    public OpenRewriteMavenBuildFile(Path absoluteProjectPath, Xml.Document sourceFile, ApplicationEventPublisher eventPublisher, RewriteExecutionContext executionContext) {
         super(absoluteProjectPath, sourceFile);
         this.eventPublisher = eventPublisher;
-        this.javaParser = javaParser;
         this.executionContext = executionContext;
     }
 

components/sbm-core/src/main/java/org/springframework/sbm/build/impl/OpenRewriteMavenBuildFilesFactory.java

@@ -51,7 +51,7 @@ public List<OpenRewriteMavenBuildFile> applyProjections(Path absoluteProjectDir,
             if (projectResource.getAbsolutePath().endsWith(BUILD_FILE)) {
                 List<Xml.Document> mavenPoms = parser.parse(List.of(projectResource.getAbsolutePath()), null, executionContext);
                 Xml.Document mavenPom = mavenPoms.get(0);
-                OpenRewriteMavenBuildFile buildFile = new OpenRewriteMavenBuildFile(absoluteProjectDir, mavenPom, eventPublisher, javaParser, executionContext);
+                OpenRewriteMavenBuildFile buildFile = new OpenRewriteMavenBuildFile(absoluteProjectDir, mavenPom, eventPublisher, executionContext);
                 projectResources.replace(i, buildFile);
                 result.add(buildFile);
             }

components/sbm-core/src/main/java/org/springframework/sbm/build/migration/actions/AddMinimalPomXml.java

@@ -71,7 +71,7 @@ public void apply(ProjectContext context) {
         Parser.Input input = new Parser.Input(Path.of("pom.xml"), () -> new ByteArrayInputStream(src.getBytes(StandardCharsets.UTF_8)));
         Xml.Document maven = rewriteMavenParser.parseInputs(List.of(input), null, new RewriteExecutionContext(getEventPublisher())).get(0);
 //        Maven document = (Maven) maven.withSourcePath(Path.of("pom.xml"));
-        OpenRewriteMavenBuildFile rewriteMavenBuildFile = new OpenRewriteMavenBuildFile(context.getProjectRootDirectory(), maven, getEventPublisher(), javaParser, new RewriteExecutionContext(getEventPublisher()));
+        OpenRewriteMavenBuildFile rewriteMavenBuildFile = new OpenRewriteMavenBuildFile(context.getProjectRootDirectory(), maven, getEventPublisher(), new RewriteExecutionContext(getEventPublisher()));
         context.getProjectResources().add(rewriteMavenBuildFile);
     }
 }

components/sbm-core/src/main/java/org/springframework/sbm/build/resource/BuildFileResourceWrapper.java

@@ -43,7 +43,7 @@ public boolean shouldHandle(RewriteSourceFileHolder<? extends SourceFile> rewrit
     @Override
     public OpenRewriteMavenBuildFile wrapRewriteSourceFileHolder(RewriteSourceFileHolder<? extends SourceFile> rewriteSourceFileHolder) {
         Xml.Document maven = (Xml.Document) rewriteSourceFileHolder.getSourceFile();
-        return new OpenRewriteMavenBuildFile(rewriteSourceFileHolder.getAbsoluteProjectDir(), maven, eventPublisher, javaParser, new RewriteExecutionContext(eventPublisher));
+        return new OpenRewriteMavenBuildFile(rewriteSourceFileHolder.getAbsoluteProjectDir(), maven, eventPublisher, new RewriteExecutionContext(eventPublisher));
     }
 
 }

components/sbm-core/src/main/java/org/springframework/sbm/java/impl/OpenRewriteRecipeJavaSearch.java

@@ -50,7 +50,6 @@ public void commentFindings(List<? extends JavaSource> javaSources, String comme
                     OpenRewriteJavaSource affectedJavaSource = javaSources.stream()
                             .filter(js -> js.getClass().isAssignableFrom(OpenRewriteJavaSource.class))
                             .map(OpenRewriteJavaSource.class::cast)
-                            // FIXME: id of rewrite internals exposed through getId()
                             .filter(js -> result.getBefore().getId().equals(js.getResource().getId()))
                             .findFirst()
                             .get();

components/sbm-core/src/test/java/org/springframework/sbm/java/impl/OpenRewriteMethodTest.java

@@ -16,6 +16,7 @@
 package org.springframework.sbm.java.impl;
 
 import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.sbm.java.api.*;
 import org.springframework.sbm.project.resource.TestProjectContext;

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_24_25/filter/SpringDataJpaAnalyzer.java

@@ -45,10 +45,10 @@ private List<MatchingMethod> findRepositoriesDeclaring(List<JavaSourceAndType> j
     }
 
     @Value
-    public static class MatchingMethod {
-        JavaSourceAndType jat;
-        String methodPattern;
-        Method method;
+    public class MatchingMethod {
+        private final JavaSourceAndType jat;
+        private final String methodPattern;
+        private final Method method;
 
         public MatchingMethod(JavaSourceAndType jat, String methodPattern, Method method) {
             this.jat = jat;

components/sbm-recipes-boot-upgrade/src/test/resources/expected-report.html

@@ -1,19 +1,3 @@
-<!--
-  ~ Copyright 2021 - 2022 the original author or authors.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <!DOCTYPE html>
 <html lang="en">
 <head>