Merge pull request #238 from tkalmar/spotbugs

Use file api for reading parsing artifact names, Fix #34
spotbugs · Jul 8, 2020 · 2e71189 · 2e71189
2 parents bf0fbab + 1090999
commit 2e71189
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
@@ -25,6 +25,8 @@ import org.codehaus.plexus.resource.loader.FileResourceLoader
 import org.codehaus.plexus.resource.ResourceManager
 import org.codehaus.plexus.util.FileUtils
 
+import java.nio.file.Paths
+
 final class ResourceHelper {
 
     Log log
@@ -53,12 +55,11 @@ final class ResourceHelper {
         String location = null
         String artifact = resource
 
-        if (resource.indexOf(SpotBugsInfo.FORWARD_SLASH) != -1) {
-            artifact = resource.substring(resource.lastIndexOf(SpotBugsInfo.FORWARD_SLASH) + 1)
-        }
+        def file = new File(resource)
 
-        if (resource.indexOf(SpotBugsInfo.FORWARD_SLASH) != -1) {
-            location = resource.substring(0, resource.lastIndexOf(SpotBugsInfo.FORWARD_SLASH))
+        if (file.exists()) {
+            artifact = file.getName()
+            location = file.getAbsolutePath()
         }
 
         // replace all occurrences of the following characters:  ? : & =

diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
@@ -77,8 +77,6 @@ interface SpotBugsInfo {
 
     static final String COMMA = ","
 
-    static final String FORWARD_SLASH = '/'
-
     /**
      * The character to separate URL tokens.
      *
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,8 +77,6 @@ interface SpotBugsInfo { @@
         static final String COMMA = ","
-        static final String FORWARD_SLASH = '/'
         /**
          * The character to separate URL tokens.
          *
@@ Expand Down @@