changed the header license to new license

[aai/sparky-be.git] / src / main / java / org / onap / aai / sparky / util / RestletUtils.java

diff --git a/src/main/java/org/onap/aai/sparky/util/RestletUtils.java b/src/main/java/org/onap/aai/sparky/util/RestletUtils.java
index 06c8c05..cd2d8fd 100644 (file)
--- a/src/main/java/org/onap/aai/sparky/util/RestletUtils.java
+++ b/src/main/java/org/onap/aai/sparky/util/RestletUtils.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,8 +17,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.sparky.util;
 
@@ -26,8 +24,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.restclient.client.OperationResult;
-import org.onap.aai.sparky.dal.elasticsearch.SearchAdapter;
 import org.onap.aai.sparky.logging.AaiUiMsgs;
+import org.onap.aai.sparky.search.SearchServiceAdapter;
 import org.restlet.Response;
 import org.restlet.data.MediaType;
 import org.restlet.data.Status;
@@ -42,7 +40,7 @@ public class RestletUtils {
   public HttpServletResponse convertRestletResponseToHttpServletResponse(Response restletResponse) {
     return org.restlet.ext.servlet.ServletUtils.getResponse(restletResponse);
   }
-
+  
   /**
    * Execute post query
    *
@@ -53,8 +51,8 @@ public class RestletUtils {
    * @param requestJsonPayload The request JSON payload
    * @return The operation result
    */
-  public OperationResult executePostQuery(Logger logger, SearchAdapter search, Response response,
-      String requestUrl, String requestJsonPayload) {
+  public OperationResult executePostQuery(Logger logger, SearchServiceAdapter search,
+      Response response, String requestUrl, String requestJsonPayload) {
 
     OperationResult opResult = search.doPost(requestUrl, requestJsonPayload, "application/json");
 
@@ -86,9 +84,8 @@ public class RestletUtils {
    * @param response The response
    */
   public void handleRestletErrors(Logger logger, String errorMsg, Exception exc,
-      Response response) {
-    String errorLogMsg =
-        (exc == null ? errorMsg : errorMsg + ". Error:" + exc.getLocalizedMessage());
+    Response response) {
+    String errorLogMsg = (exc == null ? errorMsg : errorMsg + ". Error:" + exc.getLocalizedMessage());
     logger.error(AaiUiMsgs.ERROR_GENERIC, errorLogMsg);
     response.setEntity(generateJsonErrorResponse(errorMsg), MediaType.APPLICATION_JSON);
   }