summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/onap/aai/sa/searchdbabstraction/entity
diff options
context:
space:
mode:
authorrenealr <reneal.rogers@amdocs.com>2018-03-19 10:50:27 -0400
committerrenealr <reneal.rogers@amdocs.com>2018-03-19 14:50:39 -0400
commit06d31abe3065205c87447687ad87c05e602c97d7 (patch)
tree4e92430a3b6265b293629a6b57c036224179dd5a /src/main/java/org/onap/aai/sa/searchdbabstraction/entity
parent1d1fbefced829fed4f3d6bb4123f9df8c9cb8d3c (diff)
add endpoint to query suggestion via ES
Added logic to ensure that search data service is able to handle suggests type request Issue-ID: AAI-896 Change-Id: I11b3e8dadc5f7023017f01055c24e9c014813eb5 Signed-off-by: renealr <reneal.rogers@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/aai/sa/searchdbabstraction/entity')
-rw-r--r--src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java13
-rw-r--r--src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java57
-rw-r--r--src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java50
3 files changed, 118 insertions, 2 deletions
diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java
index b48f94d..31482c4 100644
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SearchOperationResult.java
@@ -24,11 +24,16 @@ public class SearchOperationResult extends OperationResult {
private SearchHits searchResult;
private AggregationResults aggregationResult;
+ private SuggestHits suggestResult;
public SearchHits getSearchResult() {
return searchResult;
}
+ public SuggestHits getSuggestResult() {
+ return suggestResult;
+ }
+
public AggregationResults getAggregationResult() {
return aggregationResult;
}
@@ -41,10 +46,14 @@ public class SearchOperationResult extends OperationResult {
this.searchResult = hits;
}
+ public void setSuggestResult(SuggestHits hits) {
+ this.suggestResult = hits;
+ }
+
@Override
public String toString() {
- return "SearchOperationResult [searchResult=" + searchResult
- + ", aggregationResult=" + aggregationResult;
+ return "SearchOperationResult [searchResult=" + searchResult + ", aggregationResult="
+ + aggregationResult + ", suggestResult=" + suggestResult;
}
}
diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java
new file mode 100644
index 0000000..f1c69a9
--- /dev/null
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHit.java
@@ -0,0 +1,57 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.sa.searchdbabstraction.entity;
+
+public class SuggestHit {
+
+ private String score;
+ private String text;
+ Document document;
+
+ public String getScore() {
+ return score;
+ }
+
+ public void setScore(String score) {
+ this.score = score;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ public Document getDocument() {
+ return document;
+ }
+
+ public void setDocument(Document document) {
+ this.document = document;
+ }
+
+ @Override
+ public String toString() {
+ return "SearchHit [text=" + text + ",score=" + score + ", document=" + document + "]";
+ }
+}
diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java
new file mode 100644
index 0000000..6c65465
--- /dev/null
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/entity/SuggestHits.java
@@ -0,0 +1,50 @@
+/**
+ * ============LICENSE_START=======================================================
+ * org.onap.aai
+ * ================================================================================
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.aai.sa.searchdbabstraction.entity;
+
+import java.util.Arrays;
+
+public class SuggestHits {
+
+ private String totalHits;
+ private SuggestHit[] hits;
+
+ public String getTotalHits() {
+ return totalHits;
+ }
+
+ public void setTotalHits(String totalHits) {
+ this.totalHits = totalHits;
+ }
+
+ public SuggestHit[] getHits() {
+ return hits;
+ }
+
+ public void setHits(SuggestHit[] hits) {
+ this.hits = hits;
+ }
+
+ @Override
+ public String toString() {
+ return "SuggestHit [totalHits=" + totalHits + ", hits=" + Arrays.toString(hits) + "]";
+ }
+}