Windows support (spring-projects-experimental#79)

sanagaraj-pivotal · fabapp2 · ravigkant · commit 3488216159bd · 2022-05-09T21:41:27.000+05:30
* Fix paths to use os path separator
* Fix tests in `core` module when building with Windows
* Removing event publisher call in Catch statement
* Fixing parser reset() error on duplicated fully qualified names

Co-authored-by: Fabian Krüger &lt;fkrueger@vmware.com&gt;
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/common/filter/PathMatchingProjectResourceFilter.java b/components/sbm-core/src/main/java/org/springframework/sbm/common/filter/PathMatchingProjectResourceFilter.java
@@ -20,6 +20,7 @@
 import org.springframework.sbm.project.resource.filter.ProjectResourceFinder;
 import org.springframework.util.AntPathMatcher;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -31,7 +32,7 @@ public class PathMatchingProjectResourceFilter implements ProjectResourceFinder<
      */
     private final List<String> matchingPatterns;
 
-    private final AntPathMatcher matcher = new AntPathMatcher();
+    private final AntPathMatcher matcher = new AntPathMatcher(File.separator);
 
     public PathMatchingProjectResourceFilter(List<String> matchingPatterns) {
         this.matchingPatterns = matchingPatterns;
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/engine/precondition/JavaSourceDirExistsPreconditionCheck.java b/components/sbm-core/src/main/java/org/springframework/sbm/engine/precondition/JavaSourceDirExistsPreconditionCheck.java
@@ -26,14 +26,15 @@
 @Component
 class JavaSourceDirExistsPreconditionCheck extends PreconditionCheck {
 
-	private static final String PATTERN = "/**/src/main/java/**";
+	private static final String PATTERN = "**" + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator + "**";
 	private final String JAVA_SRC_DIR = "src/main/java";
 	private AntPathMatcher antPathMatcher = new AntPathMatcher(File.separator);
 
 	@Override
 	public PreconditionCheckResult verify(Path projectRoot, List<Resource> projectResources) {
+		String pattern = projectRoot.resolve(PATTERN).toAbsolutePath().normalize().toString();
 		if (projectResources.stream()
-				.noneMatch(r -> antPathMatcher.match(projectRoot.resolve(PATTERN).normalize().toString(), getPath(r).toAbsolutePath().toString()))) {
+				.noneMatch(r -> antPathMatcher.match(pattern, getPath(r).toAbsolutePath().toString()))) {
 			return new PreconditionCheckResult(ResultState.FAILED, "PreconditionCheck check could not find a '" + JAVA_SRC_DIR + "' dir. This dir is required.");
 		}
 		return new PreconditionCheckResult(ResultState.PASSED, "Found required source dir 'src/main/java'.");
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/Action.java b/components/sbm-core/src/main/java/org/springframework/sbm/engine/recipe/Action.java
@@ -36,7 +36,6 @@ default void applyWithStatusEvent(ProjectContext context) {
         try {
             apply(context);
         } catch(Exception e) {
-            eventPublisher.publishEvent(new ActionFailedEvent(getDescription()));
             throw new ActionFailedException("'"+this.getDescription()+"' failed: " + e.getMessage(), e);
         }
         if (eventPublisher != null) {
diff --git a/components/sbm-core/src/main/java/org/springframework/sbm/java/impl/DependenciesChangedEventHandler.java b/components/sbm-core/src/main/java/org/springframework/sbm/java/impl/DependenciesChangedEventHandler.java
@@ -29,7 +29,9 @@
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Component
@@ -42,10 +44,11 @@ public class DependenciesChangedEventHandler {
     public void onDependenciesChanged(DependenciesChangedEvent event) {
         if (projectContextHolder.getProjectContext() != null) {
             JavaParser currentJavaParser = JavaParserFactory.getCurrentJavaParser();
-            List<Parser.Input> compilationUnits = projectContextHolder.getProjectContext().getProjectJavaSources().asStream()
+            Set<Parser.Input> compilationUnitsSet = projectContextHolder.getProjectContext().getProjectJavaSources().asStream()
                     .map(js -> js.getResource().getSourceFile())
                     .map(js -> new Parser.Input(js.getSourcePath(), () -> new ByteArrayInputStream(js.printAll().getBytes(StandardCharsets.UTF_8))))
-                    .collect(Collectors.toList());
+                    .collect(Collectors.toSet());
+            List<Parser.Input> compilationUnits = new ArrayList<>(compilationUnitsSet);
 
             Path projectRootDirectory = projectContextHolder.getProjectContext().getProjectRootDirectory();
             List<J.CompilationUnit> parsedCompilationUnits = currentJavaParser.parseInputs(compilationUnits, projectRootDirectory, new RewriteExecutionContext(applicationEventPublisher));
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/common/migration/actions/MoveFilesActionTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/common/migration/actions/MoveFilesActionTest.java
@@ -15,16 +15,15 @@
  */
 package org.springframework.sbm.common.migration.actions;
 
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.sbm.common.filter.PathMatchingProjectResourceFilter;
 import org.springframework.sbm.engine.context.ProjectContext;
 import org.springframework.sbm.project.resource.InternalProjectResource;
 import org.springframework.sbm.project.resource.ProjectResource;
 import org.springframework.sbm.project.resource.TestProjectContext;
-import org.springframework.sbm.common.filter.PathMatchingProjectResourceFilter;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
 
 import java.nio.file.Path;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -40,11 +39,11 @@ void moveFile() {
         Path projectRoot = TestProjectContext.getDefaultProjectRoot();
 
         // file 1
-        String someFilePath = "src/main/resources/a/SomeFile.foo";
+        String someFilePath = Path.of("src/main/resources/a/SomeFile.foo").toString();
         String fileContent1 = "file content";
 
         // file 2
-        String anotherFilePath = "src/main/resources/b/AnotherFile.foo";
+        String anotherFilePath = Path.of("src/main/resources/b/AnotherFile.foo").toString();
         String fileContent2 = "file content 2";
 
         // target dir
@@ -56,8 +55,8 @@ void moveFile() {
                 .addProjectResource(anotherFilePath, fileContent2)
                 .build();
 
-        ProjectResource someFile = projectContext.search(new PathMatchingProjectResourceFilter(List.of("/**/SomeFile.foo"))).get(0);
-        ProjectResource anotherFile = projectContext.search(new PathMatchingProjectResourceFilter(List.of("/**/AnotherFile.foo"))).get(0);
+        ProjectResource someFile = projectContext.search(new PathMatchingProjectResourceFilter("/**/SomeFile.foo")).get(0);
+        ProjectResource anotherFile = projectContext.search(new PathMatchingProjectResourceFilter("/**/AnotherFile.foo")).get(0);
 
         verifyPrecondition(someFile, projectRoot.resolve(someFilePath), fileContent1);
         verifyPrecondition(anotherFile, projectRoot.resolve(anotherFilePath), fileContent2);
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/java/impl/RewriteJavaParserTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/java/impl/RewriteJavaParserTest.java
@@ -43,7 +43,7 @@ void shouldDelegateParsingErrorsToExceptionHandler() throws ClassNotFoundExcepti
         String out = sysOutBuffer.toString();
         System.setOut(realSysOut);
         assertThat(out).containsPattern(
-                ".*org.openrewrite.java.Java11Parser.*compile error\n");
+                ".*org.openrewrite.java.Java11Parser.*compile error.*");
 //        System.out.println(out);
     }
 
diff --git a/components/sbm-core/src/test/java/org/springframework/sbm/project/ApplicationModules_getTopmostApplicationModulesTest.java b/components/sbm-core/src/test/java/org/springframework/sbm/project/ApplicationModules_getTopmostApplicationModulesTest.java
@@ -15,13 +15,14 @@
  */
 package org.springframework.sbm.project;
 
-import org.springframework.sbm.build.api.ApplicationModule;
-import org.springframework.sbm.engine.context.ProjectContext;
-import org.springframework.sbm.project.resource.TestProjectContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.springframework.sbm.build.api.ApplicationModule;
+import org.springframework.sbm.engine.context.ProjectContext;
+import org.springframework.sbm.project.resource.TestProjectContext;
 
+import java.nio.file.Path;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -111,7 +112,7 @@ void beforeEach() {
         void whenGetTopmostApplicationModulesThenChildModuleShouldBeReturned() {
             List<ApplicationModule> topmostApplicationModules = projectContext.getApplicationModules().getTopmostApplicationModules();
             assertThat(topmostApplicationModules).hasSize(1);
-            assertThat(topmostApplicationModules.get(0).getBuildFile().getSourcePath().toString()).isEqualTo("module1/pom.xml");
+            assertThat(topmostApplicationModules.get(0).getBuildFile().getSourcePath()).isEqualTo(Path.of("module1/pom.xml"));
         }
     }
 
@@ -185,7 +186,7 @@ void beforeEach() {
         void whenGetTopmostApplicationModulesThenChildPom1ShouldBeReturned() {
             List<ApplicationModule> topmostApplicationModules = projectContext.getApplicationModules().getTopmostApplicationModules();
             assertThat(topmostApplicationModules).hasSize(1);
-            assertThat(topmostApplicationModules.get(0).getBuildFile().getSourcePath().toString()).isEqualTo("module1/pom.xml");
+            assertThat(topmostApplicationModules.get(0).getBuildFile().getSourcePath().toString()).isEqualTo(Path.of("module1/pom.xml").toString());
         }
     }
 
@@ -283,7 +284,7 @@ void whenGetTopmostApplicationModulesThenPom1AndPom3ShouldBeReturned() {
             List<ApplicationModule> topmostApplicationModules = projectContext.getApplicationModules().getTopmostApplicationModules();
             assertThat(topmostApplicationModules).hasSize(2);
             List<String> topmostApplicationModulePaths = topmostApplicationModules.stream().map(m -> m.getBuildFile().getSourcePath().toString()).collect(Collectors.toList());
-            assertThat(topmostApplicationModulePaths).contains("module1/pom.xml", "module3/pom.xml");
+            assertThat(topmostApplicationModulePaths).contains(Path.of("module1/pom.xml").toString(), Path.of("module3/pom.xml").toString());
         }
     }
 }
diff --git a/components/sbm-support-weblogic/src/main/java/org/springframework/sbm/jee/wls/actions/MigrateWlsEjbDeploymentDescriptor.java b/components/sbm-support-weblogic/src/main/java/org/springframework/sbm/jee/wls/actions/MigrateWlsEjbDeploymentDescriptor.java
@@ -62,12 +62,17 @@ private boolean incorporateIntoSourceFile(BuildFile buildFile, JavaSourceWithEjb
             if (transactionTimeoutSeconds != null) {
                 int timeoutInMillis = calclateTimeoutForSpringBoot(transactionTimeoutSeconds);
                 if (!javaSourceWithEjb.getType().hasAnnotation("org.springframework.transaction.annotation.Transactional")) {
-                    // TODO: provide some means to print this information on CLI as it takes a while, see #175
+
+                    this.startProcess("Annotate " + javaSourceWithEjb.getType().getFullyQualifiedName() + " with @Transactional");
+
                     // FIXME: #466
                     if (!buildFile.hasDeclaredDependencyMatchingRegex("org\\.springframework\\:spring-tx\\:.*")) {
                         addDataJpaDependency = true;
                     }
                     javaSourceWithEjb.getType().addAnnotation("@Transactional(timeout=" + timeoutInMillis + ")", "org.springframework.transaction.annotation.Transactional");
+
+                    this.endProcess();
+
                 } else {
                     Annotation annotation = javaSourceWithEjb.getType().getAnnotation("org.springframework.transaction.annotation.Transactional");
                     annotation.setAttribute("timeout", timeoutInMillis, Integer.class);

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ default void applyWithStatusEvent(ProjectContext context) {`
`36`	`36`	`try {`
`37`	`37`	`apply(context);`
`38`	`38`	`} catch(Exception e) {`
`39`		`- eventPublisher.publishEvent(new ActionFailedEvent(getDescription()));`
`40`	`39`	`throw new ActionFailedException("'"+this.getDescription()+"' failed: " + e.getMessage(), e);`
`41`	`40`	`}`
`42`	`41`	`if (eventPublisher != null) {`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ void shouldDelegateParsingErrorsToExceptionHandler() throws ClassNotFoundExcepti`
`43`	`43`	`String out = sysOutBuffer.toString();`
`44`	`44`	`System.setOut(realSysOut);`
`45`	`45`	`assertThat(out).containsPattern(`
`46`		`- ".org.openrewrite.java.Java11Parser.compile error\n");`
	`46`	`+ ".org.openrewrite.java.Java11Parser.compile error.*");`
`47`	`47`	`// System.out.println(out);`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,14 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.springframework.sbm.project;`
`17`	`17`
`18`		`-import org.springframework.sbm.build.api.ApplicationModule;`
`19`		`-import org.springframework.sbm.engine.context.ProjectContext;`
`20`		`-import org.springframework.sbm.project.resource.TestProjectContext;`
`21`	`18`	`import org.junit.jupiter.api.BeforeEach;`
`22`	`19`	`import org.junit.jupiter.api.Nested;`
`23`	`20`	`import org.junit.jupiter.api.Test;`
	`21`	`+import org.springframework.sbm.build.api.ApplicationModule;`
	`22`	`+import org.springframework.sbm.engine.context.ProjectContext;`
	`23`	`+import org.springframework.sbm.project.resource.TestProjectContext;`
`24`	`24`
	`25`	`+import java.nio.file.Path;`
`25`	`26`	`import java.util.List;`
`26`	`27`	`import java.util.stream.Collectors;`
`27`	`28`
`@@ -111,7 +112,7 @@ void beforeEach() {`
`111`	`112`	`void whenGetTopmostApplicationModulesThenChildModuleShouldBeReturned() {`
`112`	`113`	`List<ApplicationModule> topmostApplicationModules = projectContext.getApplicationModules().getTopmostApplicationModules();`
`113`	`114`	`assertThat(topmostApplicationModules).hasSize(1);`
`114`		`- assertThat(topmostApplicationModules.get(0).getBuildFile().getSourcePath().toString()).isEqualTo("module1/pom.xml");`
	`115`	`+ assertThat(topmostApplicationModules.get(0).getBuildFile().getSourcePath()).isEqualTo(Path.of("module1/pom.xml"));`
`115`	`116`	`}`
`116`	`117`	`}`
`117`	`118`
`@@ -185,7 +186,7 @@ void beforeEach() {`
`185`	`186`	`void whenGetTopmostApplicationModulesThenChildPom1ShouldBeReturned() {`
`186`	`187`	`List<ApplicationModule> topmostApplicationModules = projectContext.getApplicationModules().getTopmostApplicationModules();`
`187`	`188`	`assertThat(topmostApplicationModules).hasSize(1);`
`188`		`- assertThat(topmostApplicationModules.get(0).getBuildFile().getSourcePath().toString()).isEqualTo("module1/pom.xml");`
	`189`	`+ assertThat(topmostApplicationModules.get(0).getBuildFile().getSourcePath().toString()).isEqualTo(Path.of("module1/pom.xml").toString());`
`189`	`190`	`}`
`190`	`191`	`}`
`191`	`192`
`@@ -283,7 +284,7 @@ void whenGetTopmostApplicationModulesThenPom1AndPom3ShouldBeReturned() {`
`283`	`284`	`List<ApplicationModule> topmostApplicationModules = projectContext.getApplicationModules().getTopmostApplicationModules();`
`284`	`285`	`assertThat(topmostApplicationModules).hasSize(2);`
`285`	`286`	`List<String> topmostApplicationModulePaths = topmostApplicationModules.stream().map(m -> m.getBuildFile().getSourcePath().toString()).collect(Collectors.toList());`
`286`		`- assertThat(topmostApplicationModulePaths).contains("module1/pom.xml", "module3/pom.xml");`
	`287`	`+ assertThat(topmostApplicationModulePaths).contains(Path.of("module1/pom.xml").toString(), Path.of("module3/pom.xml").toString());`
`287`	`288`	`}`
`288`	`289`	`}`
`289`	`290`	`}`