Update to "6.0.0-rc.7"

jmini · jmini · commit 8a5c1c468b13 · 2024-11-29T14:39:52.000+01:00
diff --git a/gitlab4j-test/AccessTokenScript.java b/gitlab4j-test/AccessTokenScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS https://github.com/gitlab4j/gitlab4j-api/commit/5805b41bae64b6c287abdbd51f63ce84d1ec8b90
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
@@ -10,18 +10,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
-import org.gitlab4j.api.Constants.ProjectAccessTokenScope;
 import org.gitlab4j.api.GitLabApi;
-import org.gitlab4j.api.GitLabApiException;
-import org.gitlab4j.api.models.AccessLevel;
-import org.gitlab4j.api.models.ProjectAccessToken;
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
diff --git a/gitlab4j-test/EpicScript.java b/gitlab4j-test/EpicScript.java
@@ -1,19 +1,19 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS https://github.com/jmini/gitlab4j-api/commit/632279d454d90469be99d8f6059285e1a7524931
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.concurrent.Callable;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.Callable;
 
 import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.models.*;
diff --git a/gitlab4j-test/FileUploadScript.java b/gitlab4j-test/FileUploadScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS https://github.com/gitlab4j/gitlab4j-api/commit/5805b41bae64b6c287abdbd51f63ce84d1ec8b90
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
@@ -70,18 +70,16 @@ public Integer call() throws Exception {
                 filename = fileToUpload.getFileName()
                         .toString();
             }
-            if(project == null && group == null) {
+            if (project == null && group == null) {
                 throw new IllegalStateException("Project or group is mandatory");
-            } else if(project != null && group != null) {
+            } else if (project != null && group != null) {
                 throw new IllegalStateException("Project and group can't be set at the same time");
-            } else if(project != null) {
+            } else if (project != null) {
                 FileUpload uplaodedFile = gitLabApi.getProjectApi()
                         .uploadFile(idOrPath(project), Files.newInputStream(fileToUpload), filename, null);
                 System.out.println(uplaodedFile);
-            } else if(group != null) {
-                FileUpload uplaodedFile = gitLabApi.getGroupApi()
-                        .uploadFile(idOrPath(group), Files.newInputStream(fileToUpload), filename, null);
-                System.out.println(uplaodedFile);
+            } else if (group != null) {
+                throw new IllegalStateException("Upload on goup is not available, see: https://gitlab.com/gitlab-org/gitlab/-/issues/329615");
             }
         }
         return 0;
@@ -90,12 +88,11 @@ public Integer call() throws Exception {
     private GitLabApi createGitLabApi(String gitLabUrl, String gitLabAuthValue) {
         if (logHttp != null && logHttp) {
             return new GitLabApi(gitLabUrl, gitLabAuthValue)
-                .withRequestResponseLogging(java.util.logging.Level.INFO) ;
+                    .withRequestResponseLogging(java.util.logging.Level.INFO);
         }
         return new GitLabApi(gitLabUrl, gitLabAuthValue);
     }
 
-
     private void filePathMandatory() {
         if (filePath == null) {
             throw new IllegalStateException("File is mandatory");
diff --git a/gitlab4j-test/GitLabCiYamlScript.java b/gitlab4j-test/GitLabCiYamlScript.java
@@ -1,10 +1,9 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/gitlab4j-test/GitLabScript.java b/gitlab4j-test/GitLabScript.java
@@ -1,6 +1,6 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.util.logging.Level;
diff --git a/gitlab4j-test/GroupAccessTokenScript.java b/gitlab4j-test/GroupAccessTokenScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS https://github.com/jmini/gitlab4j-api/commit/0cca2d8adef178b25fd6b53afe489c7f5ccc2394
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
diff --git a/gitlab4j-test/GroupScript.java b/gitlab4j-test/GroupScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS https://github.com/gitlab4j/gitlab4j-api/commit/5805b41bae64b6c287abdbd51f63ce84d1ec8b90
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
@@ -15,7 +15,6 @@
 
 import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.models.*;
-import org.gitlab4j.api.models.ImpersonationToken.Scope;
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
diff --git a/gitlab4j-test/IssueScript.java b/gitlab4j-test/IssueScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS https://github.com/jmini/gitlab4j-api/commit/436fb4edadb6b72641dbf836ee4fdb792ac0ab32
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
diff --git a/gitlab4j-test/IterationScript.java b/gitlab4j-test/IterationScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
@@ -10,14 +10,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Callable;
-import java.util.stream.Collectors;
 
-import org.gitlab4j.api.Constants.*;
 import org.gitlab4j.api.*;
 import org.gitlab4j.api.models.*;
 
diff --git a/gitlab4j-test/JobScript.java b/gitlab4j-test/JobScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.*;
diff --git a/gitlab4j-test/LabelScript.java b/gitlab4j-test/LabelScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
diff --git a/gitlab4j-test/MetadataScript.java b/gitlab4j-test/MetadataScript.java
@@ -1,17 +1,15 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
@@ -21,7 +19,6 @@
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
 
 @Command(name = "MetadataScript", mixinStandardHelpOptions = true, version = "MetadataScript 0.1", description = "Tests for GitLab4J")
 class MetadataScript implements Callable<Integer> {
diff --git a/gitlab4j-test/NoteScript.java b/gitlab4j-test/NoteScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
diff --git a/gitlab4j-test/ProjectAccessTokenScript.java b/gitlab4j-test/ProjectAccessTokenScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS https://github.com/jmini/gitlab4j-api/commit/0cca2d8adef178b25fd6b53afe489c7f5ccc2394
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
@@ -17,11 +17,11 @@
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
-import org.gitlab4j.api.Constants.ProjectAccessTokenScope;
 import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.GitLabApiException;
 import org.gitlab4j.api.models.AccessLevel;
 import org.gitlab4j.api.models.ProjectAccessToken;
+import org.gitlab4j.models.Constants.ProjectAccessTokenScope;
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
diff --git a/gitlab4j-test/ProjectsScript.java b/gitlab4j-test/ProjectsScript.java
@@ -1,10 +1,9 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
-import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,7 +13,6 @@
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Callable;
-import java.util.logging.Level;
 
 import org.gitlab4j.api.*;
 import org.gitlab4j.api.models.*;
diff --git a/gitlab4j-test/ProtectedBranchesScript.java b/gitlab4j-test/ProtectedBranchesScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS https://github.com/dpalic/gitlab4j-api/commit/7ad47ca0769bc88867208a1e2756d5e8d266e5fa
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 //Example usage:
@@ -13,7 +13,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Callable;
 
diff --git a/gitlab4j-test/ReleaseScript.java b/gitlab4j-test/ReleaseScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
diff --git a/gitlab4j-test/SearchScript.java b/gitlab4j-test/SearchScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.FileInputStream;
@@ -10,17 +10,15 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Callable;
-import java.util.stream.Collectors;
 
-import org.gitlab4j.api.Constants.GroupSearchScope;
-import org.gitlab4j.api.Constants.ProjectSearchScope;
-import org.gitlab4j.api.Constants.SearchScope;
 import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.SearchApi;
+import org.gitlab4j.models.Constants.GroupSearchScope;
+import org.gitlab4j.models.Constants.ProjectSearchScope;
+import org.gitlab4j.models.Constants.SearchScope;
 
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
@@ -69,27 +67,32 @@ public Integer call() throws Exception {
         try (GitLabApi gitLabApi = new GitLabApi(gitLabUrl, gitLabAuthValue)) {
             final SearchApi searchApi = gitLabApi.getSearchApi();
             List<?> result;
+            ensureExists(scope, "scope");
             if (project == null && group == null) {
                 System.out.println("Global search...");
-                SearchScope globalScope = parseScope(SearchScope.class);
-                if (globalScope == null) {
+                SearchScope<Object> globalSearchScope = SearchScope.forValue(scope);
+                if (globalSearchScope == null) {
+                    System.out.println("Value '" + scope + "' is not expected for '--scope'");
                     return 1;
                 }
-                result = searchApi.globalSearch(globalScope, query);
+
+                result = searchApi.globalSearch(globalSearchScope, query);
             } else if (project != null) {
                 System.out.println("Project search...");
-                ProjectSearchScope projectScope = parseScope(ProjectSearchScope.class);
-                if (projectScope == null) {
+                ProjectSearchScope<Object> projectSearchScope = ProjectSearchScope.forValue(scope);
+                if (projectSearchScope == null) {
+                    System.out.println("Value '" + scope + "' is not expected for '--scope'");
                     return 1;
                 }
-                result = searchApi.projectSearch(idOrPath(project), projectScope, query);
+                result = searchApi.projectSearch(idOrPath(project), projectSearchScope, query);
             } else if (group != null) {
                 System.out.println("Group search...");
-                GroupSearchScope groupScope = parseScope(GroupSearchScope.class);
-                if (groupScope == null) {
+                GroupSearchScope<Object> groupSearchScope = GroupSearchScope.forValue(scope);
+                if (groupSearchScope == null) {
+                    System.out.println("Value '" + scope + "' is not expected for '--scope'");
                     return 1;
                 }
-                result = searchApi.groupSearch(idOrPath(group), groupScope, query);
+                result = searchApi.groupSearch(idOrPath(group), groupSearchScope, query);
             } else {
                 throw new IllegalArgumentException("Unexpected state (input parameters might be wrong)");
             }
@@ -105,15 +108,9 @@ private Object idOrPath(String value) {
         return value;
     }
 
-    private <T extends Enum<T>> T parseScope(Class<T> cls) {
-        try {
-            return Enum.valueOf(cls, scope);
-        } catch (IllegalArgumentException ex) {
-            String possibleValues = Arrays.stream(cls.getEnumConstants())
-                    .map(e -> e.name())
-                    .collect(Collectors.joining(", ", "[", "]"));
-            System.out.println("Value '" + scope + "' is not expected for '--scope', possible values: " + possibleValues);
-            return null;
+    private void ensureExists(Object value, String optionName) {
+        if (value == null) {
+            throw new IllegalStateException("--" + optionName + " must be set");
         }
     }
 
diff --git a/gitlab4j-test/TopicsScript.java b/gitlab4j-test/TopicsScript.java
@@ -1,7 +1,7 @@
 ///usr/bin/env jbang "$0" "$@" ; exit $?
 
 //DEPS info.picocli:picocli:4.6.3
-//DEPS org.gitlab4j:gitlab4j-api:5.6.0
+//DEPS org.gitlab4j:gitlab4j-api:6.0.0-rc.7
 //JAVA 17
 
 import java.io.File;
diff --git a/gitlab4j-test/UserExistsScript.java b/gitlab4j-test/UserExistsScript.java
