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

# Conflicts:
#	src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java

Author: jmini

src/main/java/org/gitlab4j/api/GroupApi.java

@@ -2438,4 +2438,84 @@ public GroupHook addWebhook(Object groupIdOrPath, GroupHookParams groupHookParam
                 Response.Status.CREATED, groupHookParams.getForm(), "groups", getGroupIdOrPath(groupIdOrPath), "hooks");
         return (response.readEntity(GroupHook.class));
     }
+
+    /**
+     * Get all uploads of the group sorted by created_at in descending order.
+     *
+     * You must have at least the Maintainer role to use this endpoint.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/uploads</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance, required
+     * @return list of uploaded files
+     * @throws GitLabApiException if any exception occurs
+     */
+    public List<UploadedFile> getUploadFiles(Object groupIdOrPath) throws GitLabApiException {
+        Response response = get(Response.Status.OK, null, "projects", getGroupIdOrPath(groupIdOrPath), "uploads");
+        return (response.readEntity(new GenericType<List<UploadedFile>>() {}));
+    }
+
+    /**
+     * Uploads a file to the specified group to be used in an issue or merge request description, or a comment.
+     *
+     * <pre><code>GitLab Endpoint: POST /groups/:id/uploads</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance, required
+     * @param fileToUpload the File instance of the file to upload, required
+     * @return a FileUpload instance with information on the just uploaded file
+     * @throws GitLabApiException if any exception occurs
+     */
+    public FileUpload uploadFile(Object groupIdOrPath, File fileToUpload) throws GitLabApiException {
+        return (uploadFile(groupIdOrPath, fileToUpload, null));
+    }
+
+    /**
+     * Uploads a file to the specified group to be used in an issue or merge request description, or a comment.
+     *
+     * <pre><code>GitLab Endpoint: POST /groups/:id/uploads</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Long(ID), String(path), or Group instance, required
+     * @param fileToUpload the File instance of the file to upload, required
+     * @param mediaType unused; will be removed in the next major version
+     * @return a FileUpload instance with information on the just uploaded file
+     * @throws GitLabApiException if any exception occurs
+     */
+    public FileUpload uploadFile(Object groupIdOrPath, File fileToUpload, String mediaType) throws GitLabApiException {
+        Response response = upload(
+                Response.Status.CREATED,
+                "file",
+                fileToUpload,
+                mediaType,
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "uploads");
+        return (response.readEntity(FileUpload.class));
+    }
+
+    /**
+     * Uploads some data in an {@link InputStream} to the specified group,
+     * to be used in an issue or merge request description, or a comment.
+     *
+     * <pre><code>GitLab Endpoint: POST /groups/:id/uploads</code></pre>
+     *
+     * @param groupIdOrPath the group in the form of an Integer(ID), String(path), or Group instance, required
+     * @param inputStream the data to upload, required
+     * @param filename The filename of the file to upload
+     * @param mediaType unused; will be removed in the next major version
+     * @return a FileUpload instance with information on the just uploaded file
+     * @throws GitLabApiException if any exception occurs
+     */
+    public FileUpload uploadFile(Object groupIdOrPath, InputStream inputStream, String filename, String mediaType)
+            throws GitLabApiException {
+        Response response = upload(
+                Response.Status.CREATED,
+                "file",
+                inputStream,
+                filename,
+                mediaType,
+                "groups",
+                getGroupIdOrPath(groupIdOrPath),
+                "uploads");
+        return (response.readEntity(FileUpload.class));
+    }
 }

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

@@ -67,6 +67,7 @@
 import org.gitlab4j.api.models.PushRules;
 import org.gitlab4j.api.models.RemoteMirror;
 import org.gitlab4j.api.models.Snippet;
+import org.gitlab4j.api.models.UploadedFile;
 import org.gitlab4j.api.models.Variable;
 import org.gitlab4j.api.models.Visibility;
 import org.gitlab4j.api.utils.ISO8601;
@@ -3040,6 +3041,22 @@ public Project unarchiveProject(Object projectIdOrPath) throws GitLabApiExceptio
         return (response.readEntity(Project.class));
     }
 
+    /**
+     * Get all uploads of the project sorted by created_at in descending order.
+     *
+     * You must have at least the Maintainer role to use this endpoint.
+     *
+     * <pre><code>GitLab Endpoint: GET /groups/:id/uploads</code></pre>
+     *
+     * @param projectIdOrPath the project in the form of an Long(ID), String(path), or Project instance, required
+     * @return list of uploaded files
+     * @throws GitLabApiException if any exception occurs
+     */
+    public List<UploadedFile> getUploadFiles(Object projectIdOrPath) throws GitLabApiException {
+        Response response = get(Response.Status.OK, null, "projects", getProjectIdOrPath(projectIdOrPath), "uploads");
+        return (response.readEntity(new GenericType<List<UploadedFile>>() {}));
+    }
+
     /**
      * Uploads a file to the specified project to be used in an issue or merge request description, or a comment.
      *

src/main/java/org/gitlab4j/api/models/UploadedByUser.java

@@ -0,0 +1,42 @@
+package org.gitlab4j.api.models;
+
+import java.io.Serializable;
+
+import org.gitlab4j.api.utils.JacksonJson;
+
+public class UploadedByUser implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+    private String username;
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return (JacksonJson.toJsonString(this));
+    }
+}

src/main/java/org/gitlab4j/api/models/UploadedFile.java

@@ -0,0 +1,61 @@
+package org.gitlab4j.api.models;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import org.gitlab4j.api.utils.JacksonJson;
+
+public class UploadedFile implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+    private Long size;
+    private String filename;
+    private Date createdAt;
+    private UploadedByUser uploadedBy;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSize() {
+        return size;
+    }
+
+    public void setSize(Long size) {
+        this.size = size;
+    }
+
+    public String getFilename() {
+        return filename;
+    }
+
+    public void setFilename(String filename) {
+        this.filename = filename;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public UploadedByUser getUploadedBy() {
+        return uploadedBy;
+    }
+
+    public void setUploadedBy(UploadedByUser uploadedBy) {
+        this.uploadedBy = uploadedBy;
+    }
+
+    @Override
+    public String toString() {
+        return (JacksonJson.toJsonString(this));
+    }
+}

src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java

@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.gitlab4j.api.models.*;
 import org.gitlab4j.api.models.AccessRequest;
 import org.gitlab4j.api.models.Application;
 import org.gitlab4j.api.models.ApplicationSettings;
@@ -810,6 +811,12 @@ public void testUser() throws Exception {
         assertTrue(compareJson(user, "user.json"));
     }
 
+    @Test
+    public void testUploadedFile() throws Exception {
+        UploadedFile uploadedFile = unmarshalResource(UploadedFile.class, "uploaded-file.json");
+        assertTrue(compareJson(uploadedFile, "uploaded-file.json"));
+    }
+
     @Test
     public void testImpersonationToken() throws Exception {
         ImpersonationToken token = unmarshalResource(ImpersonationToken.class, "impersonation-token.json");

src/test/resources/org/gitlab4j/api/uploaded-file.json

@@ -0,0 +1,11 @@
+{
+    "id": 1623,
+    "size": 435,
+    "filename": "some-feature.png",
+    "created_at": "2024-09-23T13:52:15Z",
+    "uploaded_by": {
+        "id": 54,
+        "username": "john.smith",
+        "name": "John Smith"
+    }
+}