Fix/958 fix build with windows (#969)

- Build runs under Windows
- All tests green
- Shell application works
- Spring Boot 3 Upgrade Report app works 

Changes
- Change line endings to sue `\n` and adjust string comparisons in tests
- Fix GH action
- Add new method `get...Path()` to `ProjectResource`

closes #958

---------

Co-authored-by: Adriano Machado <[email protected]>
Co-authored-by: Adriano Machado <[email protected]>
Co-authored-by: Adriano Machado <[email protected]>

Author: fabapp2

.github/workflows/build-sbm-legacy.yml

@@ -1,5 +1,8 @@
 name: Build
 on:
+  pull_request:
+    branches-ignore:
+      - "**revamp**"
   push:
     branches:
       - "**"

.gitignore

@@ -21,3 +21,4 @@ pom.xml.versionsBackup
 **/src/generated/java/META-INF
 **.java-version
 .rewrite-cache
+.vscode/

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

@@ -47,7 +47,7 @@ void migrateJpaApplication() {
         assertThat(super.loadJavaFile("org.superbiz.injection.h3jpa", "SpringBootApp")).isNotEmpty();
         assertThat(super.loadTestJavaFile("org.superbiz.injection.h3jpa", "SpringBootAppTest")).isNotEmpty();
         String movies = loadJavaFile("org.superbiz.injection.h3jpa", "Movies");
-        assertThat(movies).contains(
+        assertThat(movies.replace("\r\n", "\n").replace("\r", "\n")).contains(
                 """
                 package org.superbiz.injection.h3jpa;
                  

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

@@ -139,11 +139,11 @@ void happyPath() {
         String javaFile = super.loadJavaFile("com.example.jee.app", "PersonController");
         assertThat(javaFile)
                 .as(TestDiff.of(javaFile, expectedJavaSource))
-                .isEqualTo(expectedJavaSource);
+                .isEqualToNormalizingNewlines(expectedJavaSource);
 
         String pomSource = super.loadFile(Path.of("pom.xml"));
         assertThat(pomSource)
                 .as(TestDiff.of(pomSource, expectedPomSource))
-                .isEqualTo(expectedPomSource);
+                .isEqualToNormalizingNewlines(expectedPomSource);
     }
 }

components/sbm-core/src/main/java/org/springframework/sbm/SbmConstants.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021 - 2023 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.
+ */
+package org.springframework.sbm;
+
+public interface SbmConstants {
+
+    /**
+     * Line separator to use
+     */
+    String LS = "\n";
+}

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

@@ -15,36 +15,27 @@
  */
 package org.springframework.sbm.build.migration;
 
+import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
-import org.openrewrite.maven.cache.InMemoryMavenPomCache;
 import org.openrewrite.maven.cache.MavenPomCache;
 import org.openrewrite.maven.cache.RocksdbMavenPomCache;
 import org.springframework.sbm.engine.annotations.StatefulComponent;
 
-import javax.annotation.PostConstruct;
 import java.nio.file.Path;
+import java.util.Optional;
 
+@Getter
 @StatefulComponent
 public class MavenPomCacheProvider {
 
-	private MavenPomCache pomCache;
+	private final MavenPomCache pomCache;
 
-	@PostConstruct
-	void postConstruct() {
-		pomCache = rocksdb();
-	}
-
-	public MavenPomCache getPomCache() {
-		return pomCache == null ? inMemory() : pomCache;
-	}
-
-	private MavenPomCache inMemory() {
-		return new InMemoryMavenPomCache();
+	public MavenPomCacheProvider(Optional<MavenPomCache> mavenPomCacheProvider) {
+		this.pomCache = mavenPomCacheProvider.orElseGet(this::rocksdb);
 	}
 
 	@NotNull
 	private RocksdbMavenPomCache rocksdb() {
 		return new RocksdbMavenPomCache(Path.of(".").toAbsolutePath());
 	}
-
 }

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

@@ -58,8 +58,7 @@ public class AddMinimalPomXml extends AbstractAction {
 
     @Override
     public void apply(ProjectContext context) {
-        String projectDir = context.getProjectRootDirectory().toString();
-        String projectName = projectDir.replace(" ", "-").substring(projectDir.lastIndexOf("/") + 1);
+        String projectName = context.getProjectRootDirectory().getFileName().toString();
         Map<String, String> params = new HashMap<>();
         params.put("groupId", "com.example.change");
         params.put("artifactId", projectName);

components/sbm-core/src/main/java/org/springframework/sbm/common/filter/PathPatternMatchingProjectResourceFinder.java

@@ -44,8 +44,8 @@ public PathPatternMatchingProjectResourceFinder(String... matchingPatterns) {
     }
 
     private void validateMatchingPatterns(List<String> matchingPatterns) {
-        for(String pattern : matchingPatterns) {
-            if( ! matcher.isPattern(pattern)) {
+        for (String pattern : matchingPatterns) {
+            if (!matcher.isPattern(pattern)) {
                 throw new RuntimeException("The provided pattern '"+pattern+"' is invalid. Please check AntPathMatcher javadoc for examples of valid patterns.");
             }
         }

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

@@ -33,8 +33,7 @@
  */
 public class OsAgnosticPathMatcher implements PathMatcher {
 
-	private PathMatcher pathMatcher = new AntPathMatcher();
-	private LinuxWindowsPathUnifier pathUnifier = new LinuxWindowsPathUnifier();
+	private final PathMatcher pathMatcher = new AntPathMatcher();
 
 	@Override
 	public boolean isPattern(String s) {
@@ -43,42 +42,35 @@ public boolean isPattern(String s) {
 
 	@Override
 	public boolean match(String pattern, String path) {
-		path = unifyPath(path);
-		return pathMatcher.match(pattern, path);
+		return pathMatcher.match(pattern, unifyPath(path));
 	}
 
 	private String unifyPath(String path) {
-		return pathUnifier.unifyPath(path);
+		return LinuxWindowsPathUnifier.transformToLinuxPath(path);
 	}
 
 	@Override
 	public boolean matchStart(String pattern, String path) {
-		path = unifyPath(path);
-		return pathMatcher.matchStart(pattern, path);
+		return pathMatcher.matchStart(pattern, unifyPath(path));
 	}
 
 	@Override
 	public String extractPathWithinPattern(String pattern, String path) {
-		path = unifyPath(path);
-		return pathMatcher.extractPathWithinPattern(pattern, path);
+		return pathMatcher.extractPathWithinPattern(pattern, unifyPath(path));
 	}
 
 	@Override
 	public Map<String, String> extractUriTemplateVariables(String pattern, String path) {
-		path = unifyPath(path);
-		return pathMatcher.extractUriTemplateVariables(pattern, path);
+		return pathMatcher.extractUriTemplateVariables(pattern, unifyPath(path));
 	}
 
 	@Override
 	public Comparator<String> getPatternComparator(String path) {
-		path = unifyPath(path);
-		return pathMatcher.getPatternComparator(path);
+		return pathMatcher.getPatternComparator(unifyPath(path));
 	}
 
 	@Override
 	public String combine(String pattern1, String pattern2) {
 		return pathMatcher.combine(pattern1, pattern2);
 	}
-
-
 }

components/sbm-core/src/main/java/org/springframework/sbm/engine/context/ProjectContext.java

@@ -63,10 +63,6 @@ public ProjectContext(JavaRefactoringFactory javaRefactoringFactory, Path projec
         this.resultMerger = resultMerger;
     }
 
-    public ProjectResourceSet getProjectResources() {
-        return projectResources;
-    }
-
     /**
      * @deprecated
      * Use {@link #getApplicationModules()} instead.
@@ -89,7 +85,7 @@ private Module mapToModule(BuildFile buildFile) {
      * This is a legacy way of retrieving applications build file.
      * This function does not generalise for situations where application is under a multi-module maven structure
      * Use {@link #getApplicationModules()} instead of getBuildFile()
-     * If one would want to retrieve the root build file use:
+     * If one wants to retrieve the root build file use:
      * {@link #getApplicationModules()} and then call to get root module using: {@link ApplicationModules#getRootModule()}
      * */
     @Deprecated(forRemoval = true)