diff options
author | Shwetank Dave <shwetank.dave@amdocs.com> | 2018-04-05 10:13:31 -0400 |
---|---|---|
committer | Shwetank Dave <shwetank.dave@amdocs.com> | 2018-04-06 08:31:09 -0400 |
commit | 3c702a13da91564f65fbc2a002b7737325daaf56 (patch) | |
tree | 9140f9964de7a0093a833811147890af98a1962e /src/test/java/org | |
parent | f9be5d8fc3070659a302d34a9c027569aa807c0f (diff) |
Rename Path search-db to search-data-service.
Fix mixtakes in processGet
Remove requestBody from where it's not needed.
Remove elastic-search dependency
Issue-ID: AAI-598
Change-Id: Ib9693297230daba43ed604013c9cf4d32355da92
Signed-off-by: Shwetank Dave <shwetank.dave@amdocs.com>
Diffstat (limited to 'src/test/java/org')
-rw-r--r-- | src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java b/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java index 3990b27..f7a281a 100644 --- a/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java +++ b/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java @@ -49,9 +49,6 @@ public class SearchServiceApiHarness extends SearchServiceApi { documentStore = new StubEsController(); } -// @PUT -// @Path("/indexes/dynamic/{index}") -// @Consumes({MediaType.APPLICATION_JSON}) @Override @RequestMapping (value="/indexes/dynamic/{index}", method = RequestMethod.PUT, @@ -81,12 +78,11 @@ public class SearchServiceApiHarness extends SearchServiceApi { @RequestMapping (value="/indexes/{index}", method = RequestMethod.DELETE, consumes = { "application/json"}) - public ResponseEntity<String> processDeleteIndex(@RequestBody String requestBody, - HttpServletRequest request, + public ResponseEntity<String> processDeleteIndex(HttpServletRequest request, @RequestHeader HttpHeaders headers, @PathVariable("index") String index) { - return super.processDeleteIndex(requestBody, request, headers, index); + return super.processDeleteIndex(request, headers, index); } @Override @@ -95,14 +91,13 @@ public class SearchServiceApiHarness extends SearchServiceApi { produces = { "application/json"}, consumes = { "application/json", "application/xml" }) public ResponseEntity<String> processGetDocument( - @RequestBody String requestBody, HttpServletRequest request, HttpServletResponse httpResponse, @RequestHeader HttpHeaders headers, @PathVariable("index") String index, @PathVariable("id") String id) { - return super.processGetDocument(requestBody, request, httpResponse, headers, index, id); + return super.processGetDocument(request, httpResponse, headers, index, id); } @Override @@ -136,27 +131,25 @@ public class SearchServiceApiHarness extends SearchServiceApi { @RequestMapping(value = "/indexes/{index}/documents/{id}", method = RequestMethod.DELETE, consumes = { "application/json"}) - public ResponseEntity<String> processDeleteDoc(@RequestBody String requestBody, - HttpServletRequest request, + public ResponseEntity<String> processDeleteDoc(HttpServletRequest request, HttpServletResponse httpResponse, @RequestHeader HttpHeaders headers, @PathVariable("index") String index, @PathVariable("id") String id) { - return super.processDeleteDoc(requestBody, request, httpResponse, headers, index, id); + return super.processDeleteDoc(request, httpResponse, headers, index, id); } @Override @RequestMapping(value = "/indexes/{index}/query/{queryText}", method = RequestMethod.GET, consumes = { "application/json"}) - public ResponseEntity<String> processInlineQuery(String requestBody, - HttpServletRequest request, + public ResponseEntity<String> processInlineQuery(HttpServletRequest request, @RequestHeader HttpHeaders headers, @PathVariable("index") String index, @PathVariable("queryText") String queryText) { - return super.processInlineQuery(requestBody, request, headers, index, queryText); + return super.processInlineQuery(request, headers, index, queryText); } @Override @@ -175,7 +168,7 @@ public class SearchServiceApiHarness extends SearchServiceApi { @RequestMapping(value = "/indexes/{index}/query", method = RequestMethod.POST, consumes = { "application/json"}) - public ResponseEntity<String> processQuery(String requestBody, + public ResponseEntity<String> processQuery(@RequestBody String requestBody, HttpServletRequest request, @RequestHeader HttpHeaders headers, @PathVariable("index") String index) { @@ -189,7 +182,7 @@ public class SearchServiceApiHarness extends SearchServiceApi { consumes = { "application/json", "application/xml" }) public ResponseEntity<String> processBulkRequest(@RequestBody String requestBody, HttpServletRequest request, - @RequestHeader HttpHeaders headers) { + @RequestHeader HttpHeaders headers) { // If the operations string contains a special keyword, set the // harness to fail the authentication validation. |