#813 - explicitly ignore unknown properties in glific

avniproject · Nov 6, 2024 · 794426c · 794426c
1 parent 7740a98
commit 794426c
Show file tree

Hide file tree

Showing 24 changed files with 76 additions and 11 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GetAllMessagesData.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GetAllMessagesData.java
@@ -1,5 +1,6 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -11,20 +12,21 @@
 @JsonPropertyOrder({
     "messages"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GetAllMessagesData {
 
     @JsonProperty("messages")
     private List<Message> messages = new ArrayList<Message>();
 
     /**
      * No args constructor for use in serialization
-     * 
+     *
      */
     public GetAllMessagesData() {
     }
 
     /**
-     * 
+     *
      * @param messages
      */
     public GetAllMessagesData(List<Message> messages) {
@@ -42,4 +44,4 @@ public void setMessages(List<Message> messages) {
         this.messages = messages;
     }
 
-}
+}
diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificAuth.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificAuth.java
@@ -1,7 +1,9 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificAuth {
     @JsonProperty("access_token")
     private String accessToken;

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificAuthRequest.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificAuthRequest.java
@@ -1,5 +1,8 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificAuthRequest {
     private final GlificUser user;
 

diff --git a/.../main/java/org/avni/messaging/contract/glific/GlificContactGroupContactCountResponse.java b/.../main/java/org/avni/messaging/contract/glific/GlificContactGroupContactCountResponse.java
@@ -1,5 +1,8 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificContactGroupContactCountResponse {
     private int countContacts;
 

diff --git a/.../src/main/java/org/avni/messaging/contract/glific/GlificContactGroupContactsResponse.java b/.../src/main/java/org/avni/messaging/contract/glific/GlificContactGroupContactsResponse.java
@@ -1,7 +1,10 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificContactGroupContactsResponse {
     private List<GlificContactGroupContacts> contacts;
 

diff --git a/...api/src/main/java/org/avni/messaging/contract/glific/GlificContactGroupCountResponse.java b/...api/src/main/java/org/avni/messaging/contract/glific/GlificContactGroupCountResponse.java
@@ -1,5 +1,8 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificContactGroupCountResponse {
     private int countGroups;
 

diff --git a/...ver-api/src/main/java/org/avni/messaging/contract/glific/GlificContactGroupsResponse.java b/...ver-api/src/main/java/org/avni/messaging/contract/glific/GlificContactGroupsResponse.java
@@ -1,8 +1,11 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.io.Serializable;
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificContactGroupsResponse {
     private List<ContactGroup> groups;
 

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificContactResponse.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificContactResponse.java
@@ -1,5 +1,8 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificContactResponse {
     private String id;
     private String name;

diff --git a/...pi/src/main/java/org/avni/messaging/contract/glific/GlificCreateContactGroupResponse.java b/...pi/src/main/java/org/avni/messaging/contract/glific/GlificCreateContactGroupResponse.java
@@ -1,7 +1,10 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificCreateContactGroupResponse {
     private CreateGroupErrors createGroup;
 

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificError.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificError.java
@@ -1,7 +1,10 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificError {
     private List<GlificErrorLocation> locations;
     private String message;

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificErrorLocation.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificErrorLocation.java
@@ -1,5 +1,8 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificErrorLocation {
     private int column;
     private int row;

diff --git a/...erver-api/src/main/java/org/avni/messaging/contract/glific/GlificGetContactsResponse.java b/...erver-api/src/main/java/org/avni/messaging/contract/glific/GlificGetContactsResponse.java
@@ -1,7 +1,10 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificGetContactsResponse {
     private List<GlificContactResponse> contacts;
 

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificGetGroupResponse.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificGetGroupResponse.java
@@ -1,5 +1,8 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificGetGroupResponse {
     private GlificGroupGroup group;
 

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificMessageResponse.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificMessageResponse.java
@@ -1,4 +1,7 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificMessageResponse {
 }
diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificMessageTemplate.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificMessageTemplate.java
@@ -1,7 +1,10 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.io.Serializable;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificMessageTemplate implements Serializable {
     private String body;
     private String id;

diff --git a/...r-api/src/main/java/org/avni/messaging/contract/glific/GlificMessageTemplateResponse.java b/...r-api/src/main/java/org/avni/messaging/contract/glific/GlificMessageTemplateResponse.java
@@ -1,7 +1,10 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificMessageTemplateResponse {
     private List<GlificMessageTemplate> sessionTemplates;
 

diff --git a/...rver-api/src/main/java/org/avni/messaging/contract/glific/GlificOptinContactResponse.java b/...rver-api/src/main/java/org/avni/messaging/contract/glific/GlificOptinContactResponse.java
@@ -1,5 +1,8 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificOptinContactResponse {
     private GlificOptinContactWithErrorsResponse optinContact;
 

diff --git a/...rc/main/java/org/avni/messaging/contract/glific/GlificOptinContactWithErrorsResponse.java b/...rc/main/java/org/avni/messaging/contract/glific/GlificOptinContactWithErrorsResponse.java
@@ -1,5 +1,8 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificOptinContactWithErrorsResponse {
 
     private GlificContactResponse contact;

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificResponse.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificResponse.java
@@ -1,7 +1,10 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import java.util.List;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificResponse<T> {
     private T data;
     private List<GlificError> errors;

diff --git a/...server-api/src/main/java/org/avni/messaging/contract/glific/GlificSearchDataResponse.java b/...server-api/src/main/java/org/avni/messaging/contract/glific/GlificSearchDataResponse.java
@@ -1,5 +1,6 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -11,20 +12,21 @@
 @JsonPropertyOrder({
     "search"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificSearchDataResponse {
 
     @JsonProperty("search")
     private List<Search> search = new ArrayList<Search>();
 
     /**
      * No args constructor for use in serialization
-     * 
+     *
      */
     public GlificSearchDataResponse() {
     }
 
     /**
-     * 
+     *
      * @param search
      */
     public GlificSearchDataResponse(List<Search> search) {
@@ -42,4 +44,4 @@ public void setSearch(List<Search> search) {
         this.search = search;
     }
 
-}
+}
diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificUser.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/GlificUser.java
@@ -1,10 +1,12 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.avni.messaging.domain.GlificSystemConfig;
 import org.springframework.util.Assert;
 
 import java.io.Serializable;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GlificUser implements Serializable {
     private final String phone;
     private final String password;

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/Message.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/Message.java
@@ -1,5 +1,6 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -14,6 +15,7 @@
     "receiver",
     "type"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Message {
 
     @JsonProperty("body")
@@ -33,13 +35,13 @@ public class Message {
 
     /**
      * No args constructor for use in serialization
-     * 
+     *
      */
     public Message() {
     }
 
     /**
-     * 
+     *
      * @param receiver
      * @param insertedAt
      * @param sender

diff --git a/avni-server-api/src/main/java/org/avni/messaging/contract/glific/Search.java b/avni-server-api/src/main/java/org/avni/messaging/contract/glific/Search.java
@@ -1,5 +1,6 @@
 package org.avni.messaging.contract.glific;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
@@ -12,6 +13,7 @@
     "contact",
     "messages"
 })
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Search {
 
     @JsonProperty("contact")
@@ -21,13 +23,13 @@ public class Search {
 
     /**
      * No args constructor for use in serialization
-     * 
+     *
      */
     public Search() {
     }
 
     /**
-     * 
+     *
      * @param contact
      * @param messages
      */
@@ -57,4 +59,4 @@ public void setMessages(List<Message> messages) {
         this.messages = messages;
     }
 
-}
+}
diff --git a/avni-server-api/src/test/java/org/avni/messaging/repository/GlificRestClientTest.java b/avni-server-api/src/test/java/org/avni/messaging/repository/GlificRestClientTest.java
@@ -23,7 +23,9 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
+@Sql(value = {"/tear-down.sql"}, executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
 @Sql(scripts = {"/test-data.sql"})
+@Sql(value = {"/tear-down.sql"}, executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
 public class GlificRestClientTest extends AbstractControllerIntegrationTest {
     private String SAMPLE_AUTH_RESPONSE = "{\"data\":{\"access_token\":\"SFMyNTY.YjQ2M2MzMmMtNGZlOC00OTEyLWIzYTEtZmRhZTRkOGQ1ZTIx.3TjKqpElrD5N2ffGHEAFX91cyp7zwoTztYR8p1jwwgA\",\"renewal_token\":\"SFMyNTY.MjYxODllMTgtNDM1OC00YjJjLTlmN2MtOTA5MzMwYzM3ZjA2.dDigSwftcGFGHu4o9MwkASp2KqH6eitp1aRmeYSgi5M\",\"token_expiry_time\":\"2022-10-13T21:42:33.342529Z\"}}";