Merge pull request #185 from o19s/fixing-query-attributes-null

Fixing query attributes null

Dockerfile

@@ -1,5 +1,5 @@
 FROM opensearchproject/opensearch:2.14.0
 
-COPY ./build/distributions/opensearch-ubi-0.0.11-os2.14.0.zip /tmp/
+COPY ./build/distributions/opensearch-ubi-0.0.12.1-os2.14.0.zip /tmp/
 
-RUN /usr/share/opensearch/bin/opensearch-plugin install file:/tmp/opensearch-ubi-0.0.11-os2.14.0.zip
+RUN /usr/share/opensearch/bin/opensearch-plugin install file:/tmp/opensearch-ubi-0.0.12.1-os2.14.0.zip

gradle.properties

@@ -1,2 +1,2 @@
 opensearchVersion = 2.14.0
-ubiVersion = 0.0.12
+ubiVersion = 0.0.12.1

src/main/java/org/opensearch/ubi/ext/UbiParameters.java

@@ -21,6 +21,7 @@
 import org.opensearch.search.SearchExtBuilder;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -239,6 +240,9 @@ public void setUserQuery(String userQuery) {
      * @return A map of attributes.
      */
     public Map<String, String> getQueryAttributes() {
+        if(queryAttributes == null) {
+            queryAttributes = new HashMap<>();
+        }
         return queryAttributes;
     }
 

src/yamlRestTest/resources/rest-api-spec/test/_plugins.ubi/20_queries_with_ubi.yml

@@ -39,6 +39,30 @@
 
   - gte: { hits.total: 1 }
 
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: ecommerce
+        body: "{\"query\": {\"match\": {\"category\": \"notebook\"}}, \"ext\": {\"ubi\": {\"query_id\": \"abcdef\", \"client_id\": \"abcabc\", \"user_query\": \"notebook\"}}}"
+
+  - gte: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: ecommerce
+        body: "{\"query\": {\"match\": {\"category\": \"notebook\"}}, \"ext\": {\"ubi\": {}}}"
+
+  - gte: { hits.total: 1 }
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: ecommerce
+        body: "{\"query\": {\"match\": {\"category\": \"notebook\"}}}"
+
+  - gte: { hits.total: 1 }
+
   - do:
       cluster.health:
         index: [ubi_queries]
@@ -59,4 +83,4 @@
         index: ubi_queries
         body: {}
 
-  - match: {count : 1}
+  - match: {count : 4}