align router code with 1.2.1 version of rest

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

diff --git a/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java b/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
index bbdb4c8..4baa81a 100644 (file)
--- a/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
+++ b/src/main/java/org/onap/aai/datarouter/util/SearchServiceAgent.java
@@ -96,14 +96,14 @@ public class SearchServiceAgent {
                           String documentEndpoint, \r
                           Logger logger) {\r
     \r
+    String deobfuscatedCertPassword = keystorePwd.startsWith("OBF:")?Password.deobfuscate(keystorePwd):keystorePwd;\r
     // Create REST client for search service\r
     searchClient = new RestClient()\r
                     .authenticationMode(RestAuthenticationMode.SSL_CERT)\r
                     .validateServerHostname(false)\r
-                    .validateServerCertChain(true)\r
+                    .validateServerCertChain(false)\r
                     .clientCertFile(DataRouterConstants.DR_HOME_AUTH + certName)\r
-                    .clientCertPassword(Password.deobfuscate(keystorePwd))\r
-                    .trustStore(DataRouterConstants.DR_HOME_AUTH + keystore);\r
+                    .clientCertPassword(deobfuscatedCertPassword);                    \r
     \r
     this.searchUrl        = searchUrl;\r
     this.documentEndpoint = documentEndpoint;\r