Add get..PathString() methods to ProjectResource

spring-projects-experimental · Nov 12, 2023 · ae7a1a5 · ae7a1a5
1 parent be28378
commit ae7a1a5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/...ents/sbm-core/src/main/java/org/springframework/sbm/project/resource/ProjectResource.java b/...ents/sbm-core/src/main/java/org/springframework/sbm/project/resource/ProjectResource.java
@@ -29,11 +29,22 @@ public interface ProjectResource {
      */
     Path getSourcePath();
 
+    /**
+     * @return the OS agnostic path representation of {@link #getSourcePath()}.
+     */
+    String getSourcePathString();
+
     Path getAbsolutePath();
 
+    /**
+     * @return the OS agnostic path representation of {@link #getAbsolutePath()}.
+     */
+    String getAbsolutePathString();
+
     void delete();
 
     boolean isDeleted();
 
     void moveTo(Path newPath);
+
 }
diff --git a/...-core/src/main/java/org/springframework/sbm/project/resource/RewriteSourceFileHolder.java b/...-core/src/main/java/org/springframework/sbm/project/resource/RewriteSourceFileHolder.java
@@ -53,11 +53,27 @@ public Path getSourcePath() {
         return LinuxWindowsPathUnifier.unify(sourceFile.getSourcePath());
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getSourcePathString() {
+        return LinuxWindowsPathUnifier.unifyPath(getSourcePath());
+    }
+
     @Override
     public Path getAbsolutePath() {
         return LinuxWindowsPathUnifier.unify(absoluteProjectDir.resolve(getSourcePath()).normalize().toAbsolutePath());
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public String getAbsolutePathString() {
+        return LinuxWindowsPathUnifier.unifyPath(getAbsolutePath());
+    }
+
     /**
      * Move the represented resource to another location.
      * <p>

diff --git a/.../sbm-core/src/test/java/org/springframework/sbm/build/api/Module_searchMainJava_Test.java b/.../sbm-core/src/test/java/org/springframework/sbm/build/api/Module_searchMainJava_Test.java
@@ -26,7 +26,6 @@
 import org.springframework.sbm.project.resource.RewriteSourceFileHolder;
 import org.springframework.sbm.project.resource.TestProjectContext;
 import org.springframework.sbm.project.resource.filter.ProjectResourceFinder;
-import org.springframework.sbm.utils.LinuxWindowsPathUnifier;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -84,7 +83,7 @@ void withClassesInSrcMainJavaProvidesProjectResourcesWithMainClasses() {
 
             verifySearchMain(context, projectResourceSet -> {
                 assertThat(projectResourceSet.list()).hasSize(1);
-                assertThat(LinuxWindowsPathUnifier.unifyPath(projectResourceSet.get(0).getSourcePath())).isEqualTo("src/main/java/SomeClass.java");
+                assertThat(projectResourceSet.get(0).getSourcePathString()).isEqualTo("src/main/java/SomeClass.java");
                 assertThat(projectResourceSet.get(0).print()).isEqualTo("public class SomeClass{}");
             }, "");
         }
@@ -99,7 +98,7 @@ void withClassesInTestAndMain_providesClassesFromMain() {
 
             verifySearchMain(context, projectResourceSet -> {
                 assertThat(projectResourceSet.list()).hasSize(1);
-                assertThat(LinuxWindowsPathUnifier.unifyPath(projectResourceSet.get(0).getSourcePath())).isEqualTo("src/main/java/SomeClass.java");
+                assertThat(projectResourceSet.get(0).getSourcePathString()).isEqualTo("src/main/java/SomeClass.java");
                 assertThat(projectResourceSet.get(0).print()).isEqualTo("public class SomeClass{}");
             }, "");
         }
@@ -221,7 +220,7 @@ void withClassesInMainAndTest_providesClassesFromSrcMainJava() {
             verifySearchMain(context,
                              (projectResourceSet) -> {
                                 assertThat(projectResourceSet.list()).hasSize(1);
-                                assertThat(LinuxWindowsPathUnifier.unifyPath(projectResourceSet.list().get(0).getSourcePath())).isEqualTo("application/src/main/java/SomeClass.java");
+                                assertThat(projectResourceSet.list().get(0).getSourcePathString()).isEqualTo("application/src/main/java/SomeClass.java");
                                 assertThat(projectResourceSet.list().get(0).print()).isEqualTo("public class SomeClass{}");
                             },
                              "application");
@@ -238,7 +237,7 @@ void withClassesInMain_providesClassesFromSrcMainJava() {
             verifySearchMain(context,
                              projectResourceSet -> {
                                 assertThat(projectResourceSet.list()).hasSize(1);
-                                assertThat(LinuxWindowsPathUnifier.unifyPath(projectResourceSet.list().get(0).getSourcePath())).isEqualTo("application/src/main/java/SomeClass.java");
+                                assertThat(projectResourceSet.list().get(0).getSourcePathString()).isEqualTo("application/src/main/java/SomeClass.java");
                                 assertThat(projectResourceSet.list().get(0).print()).isEqualTo("public class SomeClass{}");
                             },
                              "application");

diff --git a/...m-core/src/test/java/org/springframework/sbm/build/impl/MavenSettingsInitializerTest.java b/...m-core/src/test/java/org/springframework/sbm/build/impl/MavenSettingsInitializerTest.java
@@ -15,12 +15,13 @@
  */
 package org.springframework.sbm.build.impl;
 
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.openrewrite.maven.MavenExecutionContextView;
 import org.openrewrite.maven.tree.MavenRepository;
 import org.springframework.sbm.openrewrite.RewriteExecutionContext;
 
-import java.net.URISyntaxException;
 import java.nio.file.Path;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -63,7 +64,7 @@ void mavenParserMustAdhereToSettingsXmlTest() {
         assertThat(mavenRepository.getId()).isEqualTo("central");
         assertThat(mavenRepository.getUri()).isEqualTo("https://jcenter.bintray.com");
         assertThat(mavenRepository.getReleases()).isNull();
-        assertThat(mavenRepository.getSnapshots()).isEqualToIgnoringCase("false");
+        assertThat(mavenRepository.getSnapshots()).isEqualTo("false");
 
         MavenRepository localRepository = mavenExecutionContextView.getLocalRepository();
         assertThat(localRepository.getSnapshots()).isNull();