Skip to content

Commit 58276fd

Browse files
authored
Merge pull request #22 from calvernaz/fix-set-include-external-ids
Fix set include external ids
2 parents e2d26c7 + cb2e602 commit 58276fd

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/main/java/com/currencyfair/onesignal/OneSignal.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@
5050
*/
5151
public final class OneSignal {
5252

53+
private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
54+
static {
55+
OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
56+
OBJECT_MAPPER.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
57+
OBJECT_MAPPER.setSerializationInclusion(Include.NON_EMPTY);
58+
}
59+
5360
private OneSignal() {
5461
}
5562

@@ -313,13 +320,9 @@ public static void csvExportFileDownload(URL url, File location) throws IOExcept
313320
}
314321

315322
private static OneSignalComms oneSignal() {
316-
ObjectMapper objectMapper = new ObjectMapper();
317-
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
318-
objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
319-
objectMapper.setSerializationInclusion(Include.NON_EMPTY);
320-
JacksonDecoder decoder = new JacksonDecoder(objectMapper);
323+
JacksonDecoder decoder = new JacksonDecoder(OBJECT_MAPPER);
321324
return Feign.builder()
322-
.encoder(new JacksonEncoder(objectMapper))
325+
.encoder(new JacksonEncoder(OBJECT_MAPPER))
323326
.decoder(decoder)
324327
.decode404()
325328
.errorDecoder(new OneSignalErrorDecoder(decoder))

src/main/java/com/currencyfair/onesignal/model/notification/Notification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ public List<String> getIncludeExternalUserIds() {
738738
}
739739

740740
public void setIncludeExternalUserIds(List<String> externalUserIds) {
741-
this.includeExternalUserIds = includeExternalUserIds;
741+
this.includeExternalUserIds = externalUserIds;
742742
}
743743

744744
public String getAppId() {

0 commit comments

Comments
 (0)