Fixes and example

Author: jmini

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

@@ -1,6 +1,6 @@
 package org.gitlab4j.api;
 
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.core.Response;
 import org.gitlab4j.api.models.PersonalAccessToken;
 import org.gitlab4j.api.utils.ISO8601;
 
@@ -17,12 +17,13 @@ public PersonalAccessTokenApi(GitLabApi gitLabApi) {
         super(gitLabApi);
     }
 
-
     /**
      * Rotates the given personal access token.
      * The token is revoked and a new one which will expire in one week is created to replace it.
      * Only working with GitLab 16.0 and above.
      *
+     * <pre><code>GitLab Endpoint: POST /personal_access_tokens/self/rotate</code></pre>
+     *
      * @return the newly created PersonalAccessToken.
      * @throws GitLabApiException if any exception occurs
      */
@@ -34,16 +35,33 @@ public PersonalAccessToken rotatePersonalAccessToken() throws GitLabApiException
      * Rotates the given personal access token.
      * The token is revoked and a new one which will expire in one week is created to replace it.
      * Only working with GitLab 16.0 and above.
+     * 
+     * <pre><code>GitLab Endpoint: POST /personal_access_tokens/self/rotate</code></pre>
      *
      * @param expiresAt Expiration date of the access token
      * @return the newly created PersonalAccessToken.
      * @throws GitLabApiException if any exception occurs
      */
     public PersonalAccessToken rotatePersonalAccessToken(Date expiresAt) throws GitLabApiException {
-        GitLabApiForm formData = new GitLabApiForm()
-            .withParam("expires_at", ISO8601.dateOnly(expiresAt));
+        return rotatePersonalAccessToken("self", expiresAt);
+    }
 
-        Response response = post(Response.Status.OK, formData, "personal_access_tokens", "self", "rotate");
+    /**
+     * Rotates the given personal access token.
+     * The token is revoked and a new one which will expire in one week is created to replace it.
+     * Only working with GitLab 16.0 and above.
+     *
+     * <pre><code>GitLab Endpoint: POST /personal_access_tokens/:id/rotate</code></pre>
+     *
+     * @param expiresAt Expiration date of the access token
+     * @return the newly created PersonalAccessToken.
+     * @throws GitLabApiException if any exception occurs
+     */
+    public PersonalAccessToken rotatePersonalAccessToken(String id, Date expiresAt) throws GitLabApiException {
+        GitLabApiForm formData = new GitLabApiForm()
+                .withParam("expires_at", ISO8601.dateOnly(expiresAt));
+        
+        Response response = post(Response.Status.OK, formData, "personal_access_tokens", id, "rotate");
         return (response.readEntity(PersonalAccessToken.class));
     }
 }

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

@@ -3,6 +3,8 @@
 import org.gitlab4j.api.Constants;
 import org.gitlab4j.api.utils.JacksonJson;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -13,6 +15,7 @@ public class PersonalAccessToken implements Serializable {
     private Long userId;
     private List<Constants.ProjectAccessTokenScope> scopes;
     private String name;
+    @JsonSerialize(using = JacksonJson.DateOnlySerializer.class)
     private Date expiresAt;
     private Long id;
     private Boolean active;

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

@@ -99,6 +99,7 @@
 import org.gitlab4j.api.models.OauthTokenResponse;
 import org.gitlab4j.api.models.Package;
 import org.gitlab4j.api.models.PackageFile;
+import org.gitlab4j.api.models.PersonalAccessToken;
 import org.gitlab4j.api.models.Pipeline;
 import org.gitlab4j.api.models.PipelineSchedule;
 import org.gitlab4j.api.models.Project;
@@ -721,6 +722,12 @@ public void testNotificationSettings() throws Exception {
         assertTrue(compareJson(settings, "notification-settings.json"));
     }
 
+    @Test
+    public void testPersonalAccessToken() throws Exception {
+        PersonalAccessToken project = unmarshalResource(PersonalAccessToken.class, "personal-access-token.json");
+        assertTrue(compareJson(project, "personal-access-token.json"));
+    }
+    
     @Test
     public void testProject() throws Exception {
         Project project = unmarshalResource(Project.class, "project.json");

src/test/resources/org/gitlab4j/api/personal-access-token.json

@@ -0,0 +1,12 @@
+{
+    "id": 42,
+    "name": "Rotated Token",
+    "revoked": false,
+    "created_at": "2023-08-01T15:00:00Z",
+    "scopes": ["api"],
+    "user_id": 1337,
+	"last_used_at": "2021-10-06T17:58:37Z",
+    "active": true,
+    "expires_at": "2023-08-15",
+    "token": "s3cr3t"
+}