[sling-org-apache-sling-feature] branch master updated: SLING-9231 : Parsing of mvn urls for ArtifactId fails

[cz...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git


The following commit(s) were added to refs/heads/master by this push:
     new 8def1b0  SLING-9231 : Parsing of mvn urls for ArtifactId fails
8def1b0 is described below

commit 8def1b07a18d49358fc005e5f7cc1aecea168883
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Mar 22 14:50:31 2020 +0100

    SLING-9231 : Parsing of mvn urls for ArtifactId fails
---
 src/main/java/org/apache/sling/feature/ArtifactId.java     | 6 +++---
 src/test/java/org/apache/sling/feature/ArtifactIdTest.java | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/sling/feature/ArtifactId.java b/src/main/java/org/apache/sling/feature/ArtifactId.java
index 1408838..855e785 100644
--- a/src/main/java/org/apache/sling/feature/ArtifactId.java
+++ b/src/main/java/org/apache/sling/feature/ArtifactId.java
@@ -95,10 +95,10 @@ public class ArtifactId implements Comparable<ArtifactId> {
      * @throws IllegalArgumentException if the string can't be parsed to a valid artifact id.
      */
     public static ArtifactId parse(final String s) {
-        if ( s.contains(":") ) {
-            return ArtifactId.fromMvnId(s);
-        } else if ( s.contains("/") ) {
+        if ( s.contains("/") ) {
             return ArtifactId.fromMvnUrl(s);
+        } else if ( s.contains(":") ) {
+            return ArtifactId.fromMvnId(s);
         }
         throw new IllegalArgumentException("Unable to parse mvn coordinates/url: " + s);
     }
diff --git a/src/test/java/org/apache/sling/feature/ArtifactIdTest.java b/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
index cd6b528..81fd1e3 100644
--- a/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
+++ b/src/test/java/org/apache/sling/feature/ArtifactIdTest.java
@@ -266,4 +266,11 @@ public class ArtifactIdTest {
             assertEquals(id, newId);
         }
     }
+
+    @Test
+    public void testParse() {
+        final ArtifactId a1 = new ArtifactId("group.a", "artifact", "1.0", "foo", "zip");
+        assertEquals(a1, ArtifactId.parse(a1.toMvnId()));
+        assertEquals(a1, ArtifactId.parse(a1.toMvnUrl()));
+    }
 }