Merge remote-tracking branch 'origin/main' into 6.x

gitlab4j · Feb 6, 2024 · f988d28 · f988d28
2 parents b0603d1 + d321fe5
commit f988d28
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/main/java/org/gitlab4j/api/AbstractApi.java b/src/main/java/org/gitlab4j/api/AbstractApi.java
@@ -43,6 +43,9 @@ public Object getProjectIdOrPath(Object obj) throws GitLabApiException {
             throw (new RuntimeException("Cannot determine ID or path from null object"));
         } else if (obj instanceof Long) {
             return (obj);
+        } else if (obj instanceof Integer) {
+            //Compatibility with older version of gitlab4j-api:
+            return Long.valueOf(((Integer) obj).longValue());
         } else if (obj instanceof String) {
             return (urlEncode(((String) obj).trim()));
         } else if (obj instanceof Project) {
@@ -78,6 +81,9 @@ public Object getGroupIdOrPath(Object obj) throws GitLabApiException {
             throw (new RuntimeException("Cannot determine ID or path from null object"));
         } else if (obj instanceof Long) {
             return (obj);
+        } else if (obj instanceof Integer) {
+            //Compatibility with older version of gitlab4j-api:
+            return Long.valueOf(((Integer) obj).longValue());
         } else if (obj instanceof String) {
             return (urlEncode(((String) obj).trim()));
         } else if (obj instanceof Group) {
@@ -113,6 +119,9 @@ public Object getUserIdOrUsername(Object obj) throws GitLabApiException {
             throw (new RuntimeException("Cannot determine ID or username from null object"));
         } else if (obj instanceof Long) {
             return (obj);
+        } else if (obj instanceof Integer) {
+            //Compatibility with older version of gitlab4j-api:
+            return Long.valueOf(((Integer) obj).longValue());
         } else if (obj instanceof String) {
             return (urlEncode(((String) obj).trim()));
         } else if (obj instanceof User) {
@@ -148,6 +157,9 @@ public Object getLabelIdOrName(Object obj) throws GitLabApiException {
             throw (new RuntimeException("Cannot determine ID or name from null object"));
         } else if (obj instanceof Long) {
             return (obj);
+        } else if (obj instanceof Integer) {
+            //Compatibility with older version of gitlab4j-api:
+            return Long.valueOf(((Integer) obj).longValue());
         } else if (obj instanceof String) {
             return (urlEncode(((String) obj).trim()));
         } else if (obj instanceof Label) {
@@ -176,6 +188,9 @@ public Object getNamespaceIdOrPath(Object obj) throws GitLabApiException {
             throw (new RuntimeException("Cannot determine ID or path from null object"));
         } else if (obj instanceof Long) {
             return (obj);
+        } else if (obj instanceof Integer) {
+            //Compatibility with older version of gitlab4j-api:
+            return Long.valueOf(((Integer) obj).longValue());
         } else if (obj instanceof String) {
             return (urlEncode(((String) obj).trim()));
         } else if (obj instanceof Namespace) {