rewrite maven parser cleanup and refactorings (#850)

Author: fabapp2

.github/workflows/build-sbm-support-rewrite.yml

@@ -0,0 +1,24 @@
+name: Build sbm-utils
+on:
+  push:
+    branches:
+      - "**"
+    paths:
+      - "sbm-support-rewrite/**"
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: sbm-support-rewrite
+    steps:
+      - name: build-sbm-support-rewrite
+        uses: actions/checkout@v3
+      - name: setup-java
+        uses: actions/setup-java@v2
+        with:
+          distribution: zulu
+          java-version: 17
+          cache: maven
+      - name: build-project
+        run: mvn --batch-mode clean install

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

@@ -22,6 +22,7 @@
 import org.openrewrite.maven.tree.Dependency;
 import org.openrewrite.maven.tree.MavenResolutionResult;
 import org.openrewrite.xml.tree.Xml;
+import org.springframework.sbm.helpers.DependencyVersionHelper;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -126,7 +127,8 @@ private void verifyJohnzonCoreDependencyIsUpgraded() {
 
         assertThat(johnzonDependency.getClassifier()).isEqualTo("jakarta");
         assertThat(johnzonDependency.getArtifactId()).isEqualTo("johnzon-core");
-        assertThat(johnzonDependency.getVersion()).isEqualTo("1.2.20");
+        Optional<String> expectedJohnzonVersion = DependencyVersionHelper.getLatestReleaseVersion(johnzonDependency.getGroupId(), johnzonDependency.getArtifactId());
+        assertThat(johnzonDependency.getVersion()).isEqualTo(expectedJohnzonVersion.get());
     }
 
     @NotNull

components/sbm-core/src/main/java/org/springframework/sbm/common/util/OsAgnosticPathMatcher.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.sbm.common.util;
 
+import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
 

components/sbm-core/src/main/java/org/springframework/sbm/engine/precondition/JavaSourceDirExistsPreconditionCheck.java

@@ -16,7 +16,7 @@
 package org.springframework.sbm.engine.precondition;
 
 import org.springframework.core.io.Resource;
-import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
+import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 import org.springframework.sbm.common.util.OsAgnosticPathMatcher;
 import org.springframework.stereotype.Component;
 import org.springframework.util.PathMatcher;

components/sbm-core/src/main/java/org/springframework/sbm/engine/precondition/MavenBuildFileExistsPreconditionCheck.java

@@ -17,7 +17,6 @@
 
 import org.springframework.core.annotation.Order;
 import org.springframework.core.io.Resource;
-import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
 import org.springframework.stereotype.Component;
 
 import java.nio.file.Path;

components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/OpenRewriteRecipeAdapterAction.java

@@ -17,6 +17,8 @@
 package org.springframework.sbm.engine.recipe;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.AllArgsConstructor;
+import lombok.experimental.SuperBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.openrewrite.Recipe;
 import org.openrewrite.Result;
@@ -27,6 +29,8 @@
 import java.util.List;
 
 @Slf4j
+@AllArgsConstructor
+@SuperBuilder
 public class OpenRewriteRecipeAdapterAction extends AbstractAction {
 
     private final Recipe recipe;

components/sbm-core/src/main/java/org/springframework/sbm/java/migration/conditions/HasAnyTypeReference.java

@@ -15,15 +15,17 @@
  */
 package org.springframework.sbm.java.migration.conditions;
 
+import lombok.*;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.engine.recipe.Condition;
-import lombok.Getter;
-import lombok.Setter;
 
 import java.util.List;
 
 @Getter
 @Setter
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class HasAnyTypeReference implements Condition {
 
     private List<String> fqTypeNames;

components/sbm-core/src/main/java/org/springframework/sbm/project/parser/MavenProjectParser.java

@@ -73,8 +73,10 @@ public List<SourceFile> parse(Path projectDirectory, List<Resource> resources) {
         projectMetadata.setMavenSettings(mavenSettings);
         MavenExecutionContextView mavenExecutionContext = MavenExecutionContextView.view(executionContext);
         mavenExecutionContext.setMavenSettings(mavenSettings);
-
-
+//        if(mavenExecutionContext.getLocalRepository() == null) {
+        MavenExecutionContextView.view(executionContext).setLocalRepository(new MavenRepository("local", "file://" + Path.of(System.getProperty("user.home")).resolve(".m2/repository"), null, null, false, null, null, null));
+//        }
+        // default local repo provided by MavenExecutionContextView misses two '/' in the path
         mavenConfigHandler.injectMavenConfigIntoSystemProperties(resources);
 
         @Nullable BuildEnvironment buildEnvironment = null;

components/sbm-core/src/main/java/org/springframework/sbm/project/parser/PathScanner.java

@@ -17,7 +17,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.io.Resource;
-import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
+import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 import org.springframework.sbm.common.util.OsAgnosticPathMatcher;
 import org.springframework.sbm.project.resource.SbmApplicationProperties;
 import org.springframework.sbm.project.resource.ResourceHelper;

components/sbm-recipes-spring-framework/src/main/java/org/springframework/sbm/actions/spring/xml/include/ImportSpringXmlConfigAction.java

@@ -16,7 +16,7 @@
 package org.springframework.sbm.actions.spring.xml.include;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
+import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 import org.springframework.sbm.engine.recipe.AbstractAction;
 import org.springframework.sbm.build.MultiModuleApplicationNotSupportedException;
 import org.springframework.sbm.engine.context.ProjectContext;

components/sbm-support-boot/src/main/java/org/springframework/sbm/boot/properties/SpringApplicationPropertiesPathMatcher.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.sbm.boot.properties;
 
-import org.springframework.sbm.common.util.LinuxWindowsPathUnifier;
+import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 import org.springframework.stereotype.Component;
 
 import java.util.regex.Matcher;

components/sbm-utils/src/main/java/org/springframework/sbm/common/util/LinuxWindowsPathUnifier.java renamed to components/sbm-utils/src/main/java/org/springframework/sbm/utils/LinuxWindowsPathUnifier.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.sbm.common.util;
+package org.springframework.sbm.utils;
 
 import org.springframework.util.StringUtils;
 

components/sbm-openrewrite/src/test/java/org/springframework/sbm/helpers/DependencyVersionHelper.java renamed to components/test-helper/src/main/java/org/springframework/sbm/helpers/DependencyVersionHelper.java

@@ -88,16 +88,16 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-http</artifactId>
-                <version>3.5.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.maven.resolver</groupId>
-                <artifactId>maven-resolver-transport-wagon</artifactId>
-                <version>${resolverVersion}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>org.apache.maven.wagon</groupId>-->
+<!--                <artifactId>wagon-http</artifactId>-->
+<!--                <version>3.5.3</version>-->
+<!--            </dependency>-->
+<!--            <dependency>-->
+<!--                <groupId>org.apache.maven.resolver</groupId>-->
+<!--                <artifactId>maven-resolver-transport-wagon</artifactId>-->
+<!--                <version>${resolverVersion}</version>-->
+<!--            </dependency>-->
             <dependency>
                 <groupId>org.springframework.sbm</groupId>
                 <artifactId>test-helper</artifactId>

pom.xml

@@ -15,6 +15,8 @@
         <spring-boot.version>3.1.1</spring-boot.version>
         <rewrite.version>8.1.6</rewrite.version>
         <rewrite-maven-plugin.version>5.3.2</rewrite-maven-plugin.version>
+        <rewrite-spring.version>5.0.5</rewrite-spring.version>
+        <sbm.version>0.15.0-SNAPSHOT</sbm.version>
         <maven.version>3.9.1</maven.version>
         <maven-resolver.version>1.9.7</maven-resolver.version>
         <maven-wagon-http.version>3.5.3</maven-wagon-http.version>
@@ -51,11 +53,6 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.sbm</groupId>
-            <artifactId>sbm-utils</artifactId>
-            <version>0.14.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
@@ -93,7 +90,7 @@
         <dependency>
             <groupId>org.openrewrite.recipe</groupId>
             <artifactId>rewrite-spring</artifactId>
-            <version>5.0.5</version>
+            <version>${rewrite-spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrewrite</groupId>
@@ -109,11 +106,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -187,6 +179,17 @@
             <artifactId>jaxb-api</artifactId>
             <version>2.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <version>2.0.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>