Merge branch 'gitlab4j:main' into bugfix/MergeRequestEvent_object_attributes

Author: katrinSaleschus

.gitignore

@@ -52,8 +52,7 @@ build/
 !/gradle/wrapper/gradle-wrapper.jar
 
 # Test properties file for gitlab4j
-test-gitlab4j.properties
-!src/test/resources/test-gitlab4j.properties
+gitlab4j-mock-config-*.properties
 
 # git-changelog plugin #
 .okhttpcache

README.md

@@ -11,8 +11,9 @@ dependencies {
     testImplementation 'org.mockito:mockito-junit-jupiter:5.2.0'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.0.2'
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.4"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.4"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.13.4"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.13.4"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
 }
 
 publishing {

gitlab4j-api/build.gradle

@@ -436,9 +436,28 @@ public AwardEmoji addNoteAwardEmoji(Object projectIdOrPath, Long issueIid, Long
      * @param name the name of the award emoji to add
      * @return an AwardEmoji instance for the added award emoji
      * @throws GitLabApiException if any exception occurs
+     * @deprecated use {@link #addMergeRequestAwardEmoji(Object, Long, Long, String)} instead
      */
+    @Deprecated
     public AwardEmoji addMergeRequestAwardEmoji(
             Object projectIdOrPath, Integer mergeRequestIid, Integer noteId, String name) throws GitLabApiException {
+        return addMergeRequestAwardEmoji(projectIdOrPath, mergeRequestIid.longValue(), noteId.longValue(), name);
+    }
+
+    /**
+     * Add an award emoji for the specified merge request note.
+     *
+     * <pre><code>GitLab Endpoint: POST /projects/:id/merge_requests/:merge_request_iid/notes/:noteId/award_emoji</code></pre>
+     *
+     * @param projectIdOrPath id, path of the project, or a Project instance holding the project ID or path
+     * @param mergeRequestIid the merge request IID of the merge request that owns the note
+     * @param noteId the note ID to add the award emoji to
+     * @param name the name of the award emoji to add
+     * @return an AwardEmoji instance for the added award emoji
+     * @throws GitLabApiException if any exception occurs
+     */
+    public AwardEmoji addMergeRequestAwardEmoji(Object projectIdOrPath, Long mergeRequestIid, Long noteId, String name)
+            throws GitLabApiException {
         GitLabApiForm form = new GitLabApiForm().withParam("name", name, true);
         Response response = post(
                 Response.Status.CREATED,

gitlab4j-api/src/main/java/org/gitlab4j/api/AwardEmojiApi.java

@@ -1074,6 +1074,7 @@ public Project createProject(Project project) throws GitLabApiException {
      * ciConfigPath (optional) - Set path to CI configuration file
      * autoDevopsEnabled (optional) - Enable Auto DevOps for this project
      * squashOption (optional) - set squash option for merge requests
+     * ciDeletePipelinesInSeconds (optional) - set the automatic pipeline cleanup time in seconds
      *
      * @param project the Project instance with the configuration for the new project
      * @param importUrl the URL to import the repository from
@@ -1125,6 +1126,7 @@ public Project createProject(Project project, String importUrl) throws GitLabApi
                 .withParam("build_git_strategy", project.getBuildGitStrategy())
                 .withParam("build_coverage_regex", project.getBuildCoverageRegex())
                 .withParam("ci_config_path", project.getCiConfigPath())
+                .withParam("ci_delete_pipelines_in_seconds", project.getCiDeletePipelinesInSeconds())
                 .withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
                 .withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge())
                 .withParam("auto_devops_enabled", project.getAutoDevopsEnabled())
@@ -1445,6 +1447,7 @@ public Project createProjectFromTemplate(
      * ciConfigPath (optional) - Set path to CI configuration file
      * ciForwardDeploymentEnabled (optional) - When a new deployment job starts, skip older deployment jobs that are still pending
      * squashOption (optional) - set squash option for merge requests
+     * ciDeletePipelinesInSeconds (optional) - set the automatic pipeline cleanup time in seconds
      *
      * NOTE: The following parameters specified by the GitLab API edit project are not supported:
      *     import_url
@@ -1494,6 +1497,7 @@ public Project updateProject(Project project) throws GitLabApiException {
                 .withParam("build_coverage_regex", project.getBuildCoverageRegex())
                 .withParam("ci_config_path", project.getCiConfigPath())
                 .withParam("ci_forward_deployment_enabled", project.getCiForwardDeploymentEnabled())
+                .withParam("ci_delete_pipelines_in_seconds", project.getCiDeletePipelinesInSeconds())
                 .withParam("merge_method", project.getMergeMethod())
                 .withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
                 .withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge())
@@ -3972,6 +3976,44 @@ public List<Badge> getBadges(Object projectIdOrPath, String bagdeName) throws Gi
         return (response.readEntity(new GenericType<List<Badge>>() {}));
     }
 
+    /**
+     * Gets a pager of a project’s badges and its group badges.
+     *
+     * <pre><code>GitLab Endpoint: GET /projects/:id/badges</code></pre>
+     *
+     * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance
+     * @param itemsPerPage the number of Badge instances that will be fetched per page
+     * @return a pager of Badge instances for the specified project
+     * @throws GitLabApiException if any exception occurs
+     */
+    public Pager<Badge> getBadges(Object projectIdOrPath, int itemsPerPage) throws GitLabApiException {
+        return getBadges(projectIdOrPath, null, itemsPerPage);
+    }
+
+    /**
+     * Gets a pager of a project’s badges and its group badges, case-sensitively filtered on bagdeName if non-null.
+     *
+     * <pre><code>GitLab Endpoint: GET /projects/:id/badges?name=:name</code></pre>
+     *
+     * @param projectIdOrPath the project in the form of a Long(ID), String(path), or Project instance
+     * @param bagdeName The name to filter on (case-sensitive), ignored if null.
+     * @param itemsPerPage the number of Badge instances that will be fetched per page
+     * @return a pager of the GitLab item, case insensitively filtered on name.
+     * @throws GitLabApiException If any problem is encountered
+     */
+    public Pager<Badge> getBadges(Object projectIdOrPath, String bagdeName, int itemsPerPage)
+            throws GitLabApiException {
+        Form queryParam = new GitLabApiForm().withParam("name", bagdeName);
+        return new Pager<Badge>(
+                this,
+                Badge.class,
+                itemsPerPage,
+                queryParam.asMap(),
+                "projects",
+                getProjectIdOrPath(projectIdOrPath),
+                "badges");
+    }
+
     /**
      * Gets a badge of a project.
      *

gitlab4j-api/src/main/java/org/gitlab4j/api/ProjectApi.java

@@ -274,7 +274,8 @@ public void testUpdate() throws GitLabApiException {
                 .withTagList(Arrays.asList("tag1", "tag2"))
                 .withMergeMethod(Project.MergeMethod.MERGE)
                 .withSuggestionCommitMessage("SuggestionCommitMessageOriginal")
-                .withRemoveSourceBranchAfterMerge(false);
+                .withRemoveSourceBranchAfterMerge(false)
+                .withCiDeletePipelineInSeconds(3600);
 
         Project newProject = gitLabApi.getProjectApi().createProject(project);
         assertNotNull(newProject);
@@ -289,6 +290,7 @@ public void testUpdate() throws GitLabApiException {
         assertEquals(Project.MergeMethod.MERGE, newProject.getMergeMethod());
         assertEquals(project.getSuggestionCommitMessage(), newProject.getSuggestionCommitMessage());
         assertEquals(project.getRemoveSourceBranchAfterMerge(), newProject.getRemoveSourceBranchAfterMerge());
+        assertEquals(project.getCiDeletePipelinesInSeconds(), newProject.getCiDeletePipelinesInSeconds());
 
         project = new Project()
                 .withId(newProject.getId())

gitlab4j-api/src/test/java/org/gitlab4j/api/TestProjectApi.java

@@ -5,8 +5,9 @@ dependencies {
     testImplementation 'org.mockito:mockito-junit-jupiter:5.2.0'
     testImplementation 'org.hamcrest:hamcrest-all:1.3'
     testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.0.2'
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.4"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.4"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:5.13.4"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.13.4"
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
 }
 
 publishing {

gitlab4j-models/build.gradle

@@ -302,6 +302,7 @@ public String toString() {
     private String ciRestrictPipelineCancellationRole;
     private String ciPipelineVariablesMinimumOverrideRole;
     private Boolean ciPushRepositoryForJobTokenAllowed;
+    private Integer ciDeletePipelinesInSeconds;
     private Boolean allowPipelineTriggerApproveDeployment;
     private Boolean restrictUserDefinedVariables;
     private Boolean enforceAuthChecksOnUploads;
@@ -1531,6 +1532,19 @@ public void setCiPushRepositoryForJobTokenAllowed(Boolean ciPushRepositoryForJob
         this.ciPushRepositoryForJobTokenAllowed = ciPushRepositoryForJobTokenAllowed;
     }
 
+    public Integer getCiDeletePipelinesInSeconds() {
+        return ciDeletePipelinesInSeconds;
+    }
+
+    public void setCiDeletePipelinesInSeconds(Integer ciDeletePipelinesInSeconds) {
+        this.ciDeletePipelinesInSeconds = ciDeletePipelinesInSeconds;
+    }
+
+    public Project withCiDeletePipelineInSeconds(Integer ciDeletePipelineInSeconds) {
+        this.ciDeletePipelinesInSeconds = ciDeletePipelineInSeconds;
+        return this;
+    }
+
     public Boolean getAllowPipelineTriggerApproveDeployment() {
         return allowPipelineTriggerApproveDeployment;
     }

gitlab4j-models/src/main/java/org/gitlab4j/api/models/Project.java

@@ -194,5 +194,6 @@
   "requirements_access_level" : "enabled",
   "security_and_compliance_access_level" : "private",
   "snippets_access_level" : "enabled",
-  "wiki_access_level" : "enabled"
+  "wiki_access_level" : "enabled",
+  "ci_delete_pipelines_in_seconds": 604800
 }