From a929b4bde8ed96a612f154b94ae89918fa929a78 Mon Sep 17 00:00:00 2001
From: NThakur4 <nthakur4@slb.com>
Date: Wed, 8 Sep 2021 14:43:55 -0500
Subject: [PATCH 1/3] include null in query response

---
 pom.xml                                                        | 2 +-
 .../opengroup/osdu/core/common/model/search/QueryResponse.java | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8d72ee0..047f421 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>os-core-common</artifactId>
-  <version>0.12.0-SNAPSHOT</version>
+  <version>0.12.0-SNAPSHOT-INCLUDE-NULL</version>
   <packaging>jar</packaging>
 
 
diff --git a/src/main/java/org/opengroup/osdu/core/common/model/search/QueryResponse.java b/src/main/java/org/opengroup/osdu/core/common/model/search/QueryResponse.java
index 15bfdd1..8c77a6a 100644
--- a/src/main/java/org/opengroup/osdu/core/common/model/search/QueryResponse.java
+++ b/src/main/java/org/opengroup/osdu/core/common/model/search/QueryResponse.java
@@ -14,6 +14,7 @@
 
 package org.opengroup.osdu.core.common.model.search;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
 import com.google.gson.Gson;
@@ -32,8 +33,10 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@JsonInclude(JsonInclude.Include.ALWAYS)
 public class QueryResponse {
 
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private List<Map<String, Object>> results = new ArrayList<>();
     private List<AggregationResponse> aggregations = new ArrayList<>();
     private long totalCount;
-- 
GitLab


From b0011d1eb1445bf0df6c27ce3421888db3e6c488 Mon Sep 17 00:00:00 2001
From: NThakur4 <nthakur4@slb.com>
Date: Wed, 8 Sep 2021 15:00:34 -0500
Subject: [PATCH 2/3] include null in query response

---
 .../osdu/core/common/model/search/CursorQueryResponse.java      | 2 ++
 .../opengroup/osdu/core/common/model/search/QueryResponse.java  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opengroup/osdu/core/common/model/search/CursorQueryResponse.java b/src/main/java/org/opengroup/osdu/core/common/model/search/CursorQueryResponse.java
index 2551bbd..95924dc 100644
--- a/src/main/java/org/opengroup/osdu/core/common/model/search/CursorQueryResponse.java
+++ b/src/main/java/org/opengroup/osdu/core/common/model/search/CursorQueryResponse.java
@@ -14,6 +14,7 @@
 
 package org.opengroup.osdu.core.common.model.search;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,6 +31,7 @@ import java.util.Map;
 public class CursorQueryResponse {
 
     private String cursor;
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private List<Map<String, Object>> results;
     private long totalCount;
 
diff --git a/src/main/java/org/opengroup/osdu/core/common/model/search/QueryResponse.java b/src/main/java/org/opengroup/osdu/core/common/model/search/QueryResponse.java
index 8c77a6a..2d7fe10 100644
--- a/src/main/java/org/opengroup/osdu/core/common/model/search/QueryResponse.java
+++ b/src/main/java/org/opengroup/osdu/core/common/model/search/QueryResponse.java
@@ -33,7 +33,6 @@ import java.util.Map;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-@JsonInclude(JsonInclude.Include.ALWAYS)
 public class QueryResponse {
 
     @JsonInclude(JsonInclude.Include.ALWAYS)
-- 
GitLab


From be64b0a7ad94005de696660741cd1398bc4d3e84 Mon Sep 17 00:00:00 2001
From: NThakur4 <nthakur4@slb.com>
Date: Wed, 8 Sep 2021 15:13:30 -0500
Subject: [PATCH 3/3] finalize changes

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 047f421..8d72ee0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 
   <groupId>org.opengroup.osdu</groupId>
   <artifactId>os-core-common</artifactId>
-  <version>0.12.0-SNAPSHOT-INCLUDE-NULL</version>
+  <version>0.12.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
 
-- 
GitLab