address review comments

finos · Jul 22, 2022 · 8a12bd1 · 8a12bd1
1 parent 6ed1e23
commit 8a12bd1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/legend-sdlc-server/pom.xml b/legend-sdlc-server/pom.xml
@@ -253,7 +253,7 @@
 
         <!--
             NOTE: we must include this runtime dependency as it is required by
-            gitlab4j-api >=14.16.0, in particular, gitlab4j-api starts to use
+            gitlab4j-api >=4.16.0, in particular, gitlab4j-api starts to use
             JacksonJaxbJsonProvider (this comes from Jersey >= 2.26); that's a
             breaking change from Jersey. If we want to use Jersey 2.26 though
             we would need to also upgrade to DropWizard > 2

diff --git a/legend-sdlc-server/src/main/java/org/finos/legend/sdlc/server/gitlab/GitLabProjectId.java b/legend-sdlc-server/src/main/java/org/finos/legend/sdlc/server/gitlab/GitLabProjectId.java
@@ -54,7 +54,7 @@ public boolean equals(Object other)
     @Override
     public int hashCode()
     {
-        return Objects.hashCode(this.prefix) ^ Objects.hashCode(this.gitLabId);
+        return Objects.hashCode(this.prefix) ^ Long.hashCode(this.gitLabId);
     }
 
     @Override

diff --git a/legend-sdlc-server/src/main/java/org/finos/legend/sdlc/server/gitlab/api/BaseGitLabApi.java b/legend-sdlc-server/src/main/java/org/finos/legend/sdlc/server/gitlab/api/BaseGitLabApi.java
@@ -511,7 +511,7 @@ protected static long parseNumericId(String id, Status errorStatus)
     {
         try
         {
-            return Integer.parseInt(id);
+            return Long.parseLong(id);
         }
         catch (NumberFormatException e)
         {

diff --git a/...nd-sdlc-server/src/test/java/org/finos/legend/sdlc/server/gitlab/TestGitLabProjectId.java b/...nd-sdlc-server/src/test/java/org/finos/legend/sdlc/server/gitlab/TestGitLabProjectId.java
@@ -54,9 +54,9 @@ public void testEquality()
     public void testGetProjectIdString()
     {
         String prefix = "SOMEPREFIX";
-        for (int i = 0; i < 1024; i++)
+        for (long i = 0; i < 1024; i++)
         {
-            Project project = new Project().withId((long) i);
+            Project project = new Project().withId(i);
             Assert.assertEquals(prefix + "-" + i, GitLabProjectId.getProjectIdString(prefix, project));
             Assert.assertEquals("" + i, GitLabProjectId.getProjectIdString(null, project));
         }

diff --git a/legend-sdlc-test-reports/pom.xml b/legend-sdlc-test-reports/pom.xml
@@ -219,6 +219,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.finos.legend.sdlc</groupId>-->
+<!--            <artifactId>legend-sdlc-version-package-maven-plugin</artifactId>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>*</groupId>-->
+<!--                    <artifactId>*</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.finos.legend.sdlc</groupId>
             <artifactId>legend-sdlc-test-utils</artifactId>