Skip to content

Commit 945b59e

Browse files
Add NON_ABSENT to MergeParams (#17)
* Add NON_ABSENT to MergeParams * update header
1 parent bcb0de6 commit 945b59e

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

src/main/java/com/spotify/github/v3/prs/MergeParameters.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.spotify.github.v3.prs;
2222

23+
import com.fasterxml.jackson.annotation.JsonInclude;
2324
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
2425
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
2526
import com.spotify.github.GithubStyle;
@@ -35,6 +36,7 @@
3536
@GithubStyle
3637
@JsonSerialize(as = ImmutableMergeParameters.class)
3738
@JsonDeserialize(as = ImmutableMergeParameters.class)
39+
@JsonInclude(JsonInclude.Include.NON_ABSENT)
3840
public abstract class MergeParameters {
3941
/**
4042
* SHA that pull request head must match to allow merge.

src/test/java/com/spotify/github/v3/prs/PullRequestTest.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,20 @@ public void testSerializationMergeParams() throws IOException {
6262
assertThat(params.sha(), is(fixtureParams.sha()));
6363
assertThat(params.mergeMethod(), is(MergeMethod.merge));
6464
}
65+
66+
@Test
67+
public void testDeserializationMergeParamsOmitsFields() throws IOException {
68+
final MergeParameters params = ImmutableMergeParameters.builder()
69+
.commitMessage("a message")
70+
.sha("6dcb09b5b57875f334f61aebed695e2e4193db5e")
71+
.build();
72+
final String json = Json.create().toJson(params);
73+
74+
assertThat(
75+
json,
76+
is(
77+
"{\"sha\":\"6dcb09b5b57875f334f61aebed695e2e4193db5e\",\"commit_message\":\"a message\",\"merge_method\":\"merge\"}"));
78+
79+
System.out.println(json);
80+
}
6581
}

0 commit comments

Comments
 (0)