Unverified Commit c209b560 authored by tyates-indeed's avatar tyates-indeed Committed by GitHub
Browse files

Remove UserListSerializer and UserListDeserializer from approvedBy field in...

Remove UserListSerializer and UserListDeserializer from approvedBy field in ApprovalRule (fixes #589) (#590)
parent 6207403c
package org.gitlab4j.api.models; package org.gitlab4j.api.models;
import java.util.List;
import org.gitlab4j.api.utils.JacksonJson; import org.gitlab4j.api.utils.JacksonJson;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.util.List;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
public class ApprovalRule { public class ApprovalRule {
...@@ -18,9 +15,6 @@ public class ApprovalRule { ...@@ -18,9 +15,6 @@ public class ApprovalRule {
private List<User> users; private List<User> users;
private List<Group> groups; private List<Group> groups;
private Boolean containsHiddenGroups; private Boolean containsHiddenGroups;
@JsonSerialize(using = JacksonJson.UserListSerializer.class)
@JsonDeserialize(using = JacksonJson.UserListDeserializer.class)
private List<User> approvedBy; private List<User> approvedBy;
private Boolean approved; private Boolean approved;
......
...@@ -37,6 +37,7 @@ import org.gitlab4j.api.models.AccessRequest; ...@@ -37,6 +37,7 @@ import org.gitlab4j.api.models.AccessRequest;
import org.gitlab4j.api.models.Application; import org.gitlab4j.api.models.Application;
import org.gitlab4j.api.models.ApplicationSettings; import org.gitlab4j.api.models.ApplicationSettings;
import org.gitlab4j.api.models.ApprovalRule; import org.gitlab4j.api.models.ApprovalRule;
import org.gitlab4j.api.models.ApprovalState;
import org.gitlab4j.api.models.ArtifactsFile; import org.gitlab4j.api.models.ArtifactsFile;
import org.gitlab4j.api.models.AuditEvent; import org.gitlab4j.api.models.AuditEvent;
import org.gitlab4j.api.models.AwardEmoji; import org.gitlab4j.api.models.AwardEmoji;
...@@ -541,6 +542,12 @@ public class TestGitLabApiBeans { ...@@ -541,6 +542,12 @@ public class TestGitLabApiBeans {
assertTrue(compareJson(mergeRequestApprovals, "approvals.json")); 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 @Test
public void testMergeRequestApprovalRule() throws Exception { public void testMergeRequestApprovalRule() throws Exception {
ApprovalRule approvalRule = unmarshalResource(ApprovalRule.class, "approval-rule.json"); ApprovalRule approvalRule = unmarshalResource(ApprovalRule.class, "approval-rule.json");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment