Remove UserListSerializer and UserListDeserializer from approvedBy fi…

…eld in ApprovalRule (fixes gitlab4j#589) (gitlab4j#590)
yisiqi · Jul 26, 2020 · c209b56 · c209b56
1 parent 6207403
commit c209b56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/org/gitlab4j/api/models/ApprovalRule.java b/src/main/java/org/gitlab4j/api/models/ApprovalRule.java
@@ -1,11 +1,8 @@
 package org.gitlab4j.api.models;
 
-import java.util.List;
-
 import org.gitlab4j.api.utils.JacksonJson;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.util.List;
 
 public class ApprovalRule {
 
@@ -18,9 +15,6 @@ public class ApprovalRule {
     private List<User> users;
     private List<Group> groups;
     private Boolean containsHiddenGroups;
-
-    @JsonSerialize(using = JacksonJson.UserListSerializer.class)
-    @JsonDeserialize(using = JacksonJson.UserListDeserializer.class)
     private List<User> approvedBy;
     private Boolean approved;
 

diff --git a/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java b/src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java
@@ -37,6 +37,7 @@
 import org.gitlab4j.api.models.Application;
 import org.gitlab4j.api.models.ApplicationSettings;
 import org.gitlab4j.api.models.ApprovalRule;
+import org.gitlab4j.api.models.ApprovalState;
 import org.gitlab4j.api.models.ArtifactsFile;
 import org.gitlab4j.api.models.AuditEvent;
 import org.gitlab4j.api.models.AwardEmoji;
@@ -541,6 +542,12 @@ public void testMergeRequestApprovals() throws Exception {
         assertTrue(compareJson(mergeRequestApprovals, "approvals.json"));
     }
 
+    @Test
+    public void testMergeRequestApprovalState() throws Exception {
+        ApprovalState approvalState = unmarshalResource(ApprovalState.class, "approval-state.json");
+        assertTrue(compareJson(approvalState, "approval-state.json"));
+    }
+
     @Test
     public void testMergeRequestApprovalRule() throws Exception {
 	ApprovalRule approvalRule = unmarshalResource(ApprovalRule.class, "approval-rule.json");