Organise imports to ONAP Java standards

[aai/search-data-service.git] / src / test / java / org / onap / aai / sa / rest / SearchServiceApiHarness.java

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..0621cd8 100644 (file)
--- a/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java
+++ b/src/test/java/org/onap/aai/sa/rest/SearchServiceApiHarness.java
@@ -20,13 +20,17 @@
  */
 package org.onap.aai.sa.rest;
 
- import org.springframework.http.HttpHeaders;
+ import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 @Component
 @RestController
@@ -49,9 +53,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,28 +82,24 @@ 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
   @RequestMapping (value="/indexes/{index}/documents/{id}",
-          method = RequestMethod.GET,
-          produces = { "application/json"},
-          consumes = { "application/json", "application/xml" })
+          method = RequestMethod.GET)
   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 +133,24 @@ 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,
+          method = RequestMethod.GET)
+  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 +169,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) {
@@ -186,10 +180,11 @@ public class SearchServiceApiHarness extends SearchServiceApi {
   @Override
   @RequestMapping(value = "/bulk",
                   method = RequestMethod.POST,
-                  consumes = { "application/json", "application/xml" })
+                  consumes = { "application/json"},
+                  produces = { "application/json"})
   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.