Merge "Not logged or rethrow this exception."

[aai/data-router.git] / src / main / java / org / openecomp / datarouter / util / SearchServiceAgent.java

diff --git a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java b/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
index 3d27425..de31597 100644 (file)
--- a/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
+++ b/src/main/java/org/openecomp/datarouter/util/SearchServiceAgent.java
@@ -1,16 +1,15 @@
 /**\r
  * ============LICENSE_START=======================================================\r
- * DataRouter\r
+ * org.onap.aai\r
  * ================================================================================\r
- * Copyright © 2017 AT&T Intellectual Property.\r
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.\r
  * Copyright © 2017 Amdocs\r
- * All rights reserved.\r
  * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
  *\r
- *    http://www.apache.org/licenses/LICENSE-2.0\r
+ *       http://www.apache.org/licenses/LICENSE-2.0\r
  *\r
  * Unless required by applicable law or agreed to in writing, software\r
  * distributed under the License is distributed on an "AS IS" BASIS,\r
@@ -19,8 +18,7 @@
  * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  *\r
- * ECOMP and OpenECOMP are trademarks\r
- * and service marks of AT&T Intellectual Property.\r
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
  */\r
 package org.openecomp.datarouter.util;\r
 \r
@@ -38,15 +36,15 @@ import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response.Status;\r
 \r
 import org.eclipse.jetty.util.security.Password;\r
-import org.openecomp.cl.api.Logger;\r
-import org.openecomp.cl.mdc.MdcContext;\r
+import org.onap.aai.cl.api.Logger;\r
+import org.onap.aai.cl.mdc.MdcContext;\r
 import org.openecomp.datarouter.logging.DataRouterMsgs;\r
 import org.openecomp.datarouter.policy.EntityEventPolicy;\r
-import org.openecomp.restclient.client.Headers;\r
-import org.openecomp.restclient.client.OperationResult;\r
-import org.openecomp.restclient.client.RestClient;\r
-import org.openecomp.restclient.enums.RestAuthenticationMode;\r
-import org.openecomp.restclient.rest.HttpUtil;\r
+import org.onap.aai.restclient.client.Headers;\r
+import org.onap.aai.restclient.client.OperationResult;\r
+import org.onap.aai.restclient.client.RestClient;\r
+import org.onap.aai.restclient.enums.RestAuthenticationMode;\r
+import org.onap.aai.restclient.rest.HttpUtil;\r
 import org.slf4j.MDC;\r
 \r
 import com.sun.jersey.core.util.MultivaluedMapImpl;\r
@@ -56,7 +54,7 @@ public class SearchServiceAgent {
   private Logger logger;\r
   \r
   private RestClient searchClient = null;\r
-  private Map<String, String> indexSchemaMapping = new HashMap<String, String>();\r
+  private Map<String, String> indexSchemaMapping = new HashMap<>();\r
   \r
   private String searchUrl = null;\r
   private String documentEndpoint = null;\r