Fix javadoc crawler review feedback

Author: opensourcevk

javadoc-crawler/src/main/java/io/opentelemetry/javadocs/JavaDocsCrawler.java

@@ -33,11 +33,11 @@ public final class JavaDocsCrawler {
   // latest periodically to avoid crawling artifacts that stopped being published.
   private static final Map<String, String> GROUPS_AND_MIN_VERSION =
       Map.of(
-          "io.opentelemetry", "1.49.0",
-          "io.opentelemetry.instrumentation", "2.15.0",
-          "io.opentelemetry.contrib", "1.46.0",
-          "io.opentelemetry.semconv", "1.32.0",
-          "io.opentelemetry.proto", "1.3.2");
+          "io.opentelemetry", "1.60.1",
+          "io.opentelemetry.instrumentation", "2.25.0",
+          "io.opentelemetry.contrib", "1.54.0",
+          "io.opentelemetry.semconv", "1.40.0",
+          "io.opentelemetry.proto", "1.10.0");
 
   private static final String MAVEN_CENTRAL_BASE_URL =
       "https://search.maven.org/solrsearch/select?q=g:";
@@ -160,9 +160,10 @@ static List<Artifact> crawlJavaDocs(
       HttpClient client, String minVersion, List<Artifact> artifacts)
       throws IOException, InterruptedException {
     List<Artifact> updatedArtifacts = new ArrayList<>();
+    SemanticVersion minSemanticVersion = SemanticVersion.parse(minVersion);
 
     for (Artifact artifact : artifacts) {
-      if (compareVersions(artifact.getVersion(), minVersion) < 0) {
+      if (SemanticVersion.parse(artifact.getVersion()).compareTo(minSemanticVersion) < 0) {
         logger.info(
             String.format(
                 "Skipping crawling %s due to version %s being less than minVersion %s",
@@ -210,13 +211,7 @@ static List<Artifact> crawlJavaDocs(
     return updatedArtifacts;
   }
 
-  static int compareVersions(String version, String otherVersion) {
-    SemanticVersion semanticVersion = SemanticVersion.parse(version);
-    SemanticVersion otherSemanticVersion = SemanticVersion.parse(otherVersion);
-    return semanticVersion.compareTo(otherSemanticVersion);
-  }
-
-  private static final class SemanticVersion implements Comparable<SemanticVersion> {
+  static final class SemanticVersion implements Comparable<SemanticVersion> {
     private static final Comparator<List<Integer>> CORE_VERSION_COMPARATOR =
         (left, right) -> {
           for (int i = 0; i < Math.max(left.size(), right.size()); i++) {
@@ -238,7 +233,7 @@ private SemanticVersion(List<Integer> coreVersionParts, String qualifier) {
       this.qualifier = qualifier;
     }
 
-    private static SemanticVersion parse(String version) {
+    static SemanticVersion parse(String version) {
       String[] versionParts = version.split("-", 2);
       List<Integer> coreVersionParts = new ArrayList<>();
       for (String part : versionParts[0].split("\\.")) {
@@ -264,7 +259,53 @@ public int compareTo(SemanticVersion other) {
       if (other.qualifier.isEmpty()) {
         return -1;
       }
-      return qualifier.compareTo(other.qualifier);
+      return compareQualifier(qualifier, other.qualifier);
+    }
+
+    private static int compareQualifier(String leftQualifier, String rightQualifier) {
+      String[] leftParts = leftQualifier.split("\\.");
+      String[] rightParts = rightQualifier.split("\\.");
+
+      for (int i = 0; i < Math.max(leftParts.length, rightParts.length); i++) {
+        if (i >= leftParts.length) {
+          return -1;
+        }
+        if (i >= rightParts.length) {
+          return 1;
+        }
+
+        String leftIdentifier = leftParts[i];
+        String rightIdentifier = rightParts[i];
+        if (leftIdentifier.equals(rightIdentifier)) {
+          continue;
+        }
+
+        boolean leftNumeric = isNumericIdentifier(leftIdentifier);
+        boolean rightNumeric = isNumericIdentifier(rightIdentifier);
+        if (leftNumeric && rightNumeric) {
+          if (leftIdentifier.length() != rightIdentifier.length()) {
+            return Integer.compare(leftIdentifier.length(), rightIdentifier.length());
+          }
+          return leftIdentifier.compareTo(rightIdentifier);
+        }
+        if (leftNumeric != rightNumeric) {
+          return leftNumeric ? -1 : 1;
+        }
+        return leftIdentifier.compareTo(rightIdentifier);
+      }
+      return 0;
+    }
+
+    private static boolean isNumericIdentifier(String identifier) {
+      if (identifier.isEmpty()) {
+        return false;
+      }
+      for (int i = 0; i < identifier.length(); i++) {
+        if (!Character.isDigit(identifier.charAt(i))) {
+          return false;
+        }
+      }
+      return true;
     }
   }
 

javadoc-crawler/src/test/java/io/opentelemetry/javadocs/JavaDocsCrawlerTest.java

@@ -8,7 +8,6 @@
 import static io.opentelemetry.javadocs.JavaDocsCrawler.JAVA_DOC_DOWNLOADED_TEXT;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -96,9 +95,12 @@ void testCrawler() throws IOException, InterruptedException {
 
   @Test
   void compareVersionsUsesSemanticOrdering() {
-    assertThat(JavaDocsCrawler.compareVersions("1.9.0", "1.49.0")).isLessThan(0);
-    assertThat(JavaDocsCrawler.compareVersions("1.60.0", "1.49.0")).isGreaterThan(0);
-    assertThat(JavaDocsCrawler.compareVersions("1.60.0-alpha", "1.60.0")).isLessThan(0);
+    assertThat(compareVersions("1.9.0", "1.49.0")).isLessThan(0);
+    assertThat(compareVersions("1.49.0", "1.49.0")).isZero();
+    assertThat(compareVersions("1.60.0", "1.49.0")).isGreaterThan(0);
+    assertThat(compareVersions("1.60.0-alpha", "1.60.0")).isLessThan(0);
+    assertThat(compareVersions("1.0.0-rc.2", "1.0.0-rc.10")).isLessThan(0);
+    assertThat(compareVersions("1.0.0-rc.10", "1.0.0")).isLessThan(0);
   }
 
   @Test
@@ -109,7 +111,12 @@ void crawlSkipsArtifactsBelowMinVersionUsingSemanticComparison()
     List<Artifact> updated =
         JavaDocsCrawler.crawlJavaDocs(mockClient, "1.49.0", List.of(oldArtifact));
 
-    verify(mockClient, never()).send(argThat(request -> request != null), any());
+    verify(mockClient, never()).send(any(HttpRequest.class), any());
     assertThat(updated).isEmpty();
   }
+
+  private static int compareVersions(String left, String right) {
+    return JavaDocsCrawler.SemanticVersion.parse(left)
+        .compareTo(JavaDocsCrawler.SemanticVersion.parse(right));
+  }
 }