[NCL-5391] understand dot and comma characters in nonOSGi qualifiers

Author: janinko

common/src/main/java/org/jboss/da/common/version/VersionParser.java

@@ -56,7 +56,8 @@ private SuffixedVersion parseVersion(Matcher versionMatcher, String version, Str
         int major = parseNumberString(majorString);
         int minor = parseNumberString(minorString);
         int micro = parseNumberString(microString);
-        String qualifier = qualifierString == null ? "" : qualifierString;
+        String qualifier = qualifierString == null ? "" : qualifierString.replace('.', '-')
+                .replace(',', '-');
         if (suffixVersionString == null) {
             return new SuffixedVersion(major, minor, micro, qualifier, version);
         } else {

common/src/test/java/org/jboss/da/common/version/VersionAnalyzerTest.java

@@ -55,16 +55,26 @@ public class VersionAnalyzerTest {
 
     private static final String NON_OSGI_VERSION_2_RHT = "1.3.0.Final-redhat-7";
 
+    private static final String NON_OSGI_VERSION_3 = "1.2.3.foo.bar.baz";
+
+    private static final String NON_OSGI_VERSION_3_RHT = "1.2.3.foo-bar-baz-redhat-5";
+
+    private static final String NON_OSGI_VERSION_4 = "1.5.9.foo,bar,baz";
+
+    private static final String NON_OSGI_VERSION_4_RHT = "1.5.9.foo-bar-baz-redhat-8";
+
     private static final List<String> All_VERSIONS = Arrays.asList(OTHER_RH_VERSION_1,
             OTHER_RH_VERSION_2, NO_BUILT_VERSION_2, NO_BUILT_VERSION, OTHER_RH_VERSION_3,
             MULTI_BUILT_VERSION_RH2, BUILT_VERSION_RH, MULTI_BUILT_VERSION_RH1, BUILT_VERSION_2_RH,
             MULTI_BUILT_VERSION_RH_BEST, MULTI_BUILT_VERSION_RH4, NON_OSGI_VERSION,
-            NON_OSGI_VERSION_RHT, BUILT_VERSION_2, NON_OSGI_VERSION_2, NON_OSGI_VERSION_2_RHT);
+            NON_OSGI_VERSION_RHT, BUILT_VERSION_2, NON_OSGI_VERSION_2, NON_OSGI_VERSION_2_RHT,
+            NON_OSGI_VERSION_3, NON_OSGI_VERSION_3_RHT, NON_OSGI_VERSION_4, NON_OSGI_VERSION_4_RHT);
 
     private static final List<String> BUILT_VERSIONS = Arrays.asList(OTHER_RH_VERSION_1,
             OTHER_RH_VERSION_2, OTHER_RH_VERSION_3, MULTI_BUILT_VERSION_RH2, BUILT_VERSION_RH,
             MULTI_BUILT_VERSION_RH1, BUILT_VERSION_2_RH, MULTI_BUILT_VERSION_RH_BEST,
-            MULTI_BUILT_VERSION_RH4, NON_OSGI_VERSION_RHT, NON_OSGI_VERSION_2_RHT);
+            MULTI_BUILT_VERSION_RH4, NON_OSGI_VERSION_RHT, NON_OSGI_VERSION_2_RHT,
+            NON_OSGI_VERSION_3_RHT, NON_OSGI_VERSION_4_RHT);
 
     @Test
     public void getBestMatchVersionForNonExistingGAV() throws CommunicationException {
@@ -102,6 +112,10 @@ public void getBestMatchVersionForNoOSGIGAV() throws CommunicationException {
                 All_VERSIONS.toArray(new String[All_VERSIONS.size()]));
         checkBMV(NON_OSGI_VERSION_2_RHT, NON_OSGI_VERSION_2,
                 All_VERSIONS.toArray(new String[All_VERSIONS.size()]));
+        checkBMV(NON_OSGI_VERSION_3_RHT, NON_OSGI_VERSION_3,
+                All_VERSIONS.toArray(new String[All_VERSIONS.size()]));
+        checkBMV(NON_OSGI_VERSION_4_RHT, NON_OSGI_VERSION_4,
+                All_VERSIONS.toArray(new String[All_VERSIONS.size()]));
     }
 
     @Test

testsuite/src/test/java/org/jboss/da/test/client/rest/reports/BugReporoducerRemoteTest.java

@@ -45,4 +45,15 @@ public void testDA179() throws Exception {
 
         assertEquals(200, response.getStatus());
     }
+
+    @Test
+    public void testNCL5377() throws Exception {
+        String nonOSGiDependency = "NCL5377";
+        File jsonRequestFile = getJsonRequestFile(PATH_SCM, nonOSGiDependency);
+
+        Response response = createClientRequest(PATH_SCM).post(
+                Entity.json(FileUtils.readFileToString(jsonRequestFile, ENCODING)));
+
+        assertEquals(200, response.getStatus());
+    }
 }

testsuite/src/test/resources/wiremock/__files/body-jansi-maven-metadata.xml-2ADql.xml

@@ -14,6 +14,7 @@
       <version>1.9.0.redhat-5</version>
       <version>1.11</version>
       <version>1.11.0.redhat-1</version>
+      <version>3.0.0.fuse-jdk11-800011-temporary-redhat-00001</version>
     </versions>
     <lastUpdated>20170512214659</lastUpdated>
   </versioning>

testsuite/src/test/rest/v-1/expectedResponse/reports/lookup/gavs/ncl5035_1.json

@@ -0,0 +1,13 @@
+[
+    {
+        "bestMatchVersion": "3.0.0.fuse-jdk11-800011-temporary-redhat-00001",
+        "availableVersions": ["3.0.0.fuse-jdk11-800011-temporary-redhat-00001",
+            "1.11.0.redhat-1", "1.9.0.redhat-5", "1.9.redhat-4", "1.9.redhat-3",
+            "1.9-redhat-1"],
+        "blacklisted": false,
+        "whitelisted": [],
+        "groupId": "org.fusesource.jansi",
+        "artifactId": "jansi",
+        "version": "3.3.5.fuse.jdk11-800013"
+    }
+]

testsuite/src/test/rest/v-1/request/reports/lookup/gavs/NCL5377.json

@@ -0,0 +1,10 @@
+{
+  "versionSuffix": "temporary-redhat",
+  "gavs": [
+    {
+      "groupId": "org.fusesource.jansi",
+      "artifactId": "jansi",
+      "version": "3.3.5.fuse.jdk11-800013"
+    }
+  ]
+}