align router code with 1.2.1 version of rest

align router code with 1.2.1 version of rest client

Change-Id: Id5ad1f925aa9b12b960b5186d724cfa1413161d4
Issue-ID: AAI-2120
Signed-off-by: Bansal, Nitin (nb121v) <nitin.bansal@amdocs.com>

diff --git a/pom.xml b/pom.xml
index bf4e813..b3280ba 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,7 @@ limitations under the License.
       <dependency>
          <groupId>org.onap.aai</groupId>
          <artifactId>rest-client</artifactId>
       <dependency>
          <groupId>org.onap.aai</groupId>
          <artifactId>rest-client</artifactId>

-         <version>1.1.0</version>
+         <version>1.2.1</version>

       </dependency>
 
     <dependency>
       </dependency>
 
     <dependency>

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 612a40e..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
@@ -101,10 +101,9 @@ public class SearchServiceAgent {
     searchClient = new RestClient()\r
                     .authenticationMode(RestAuthenticationMode.SSL_CERT)\r
                     .validateServerHostname(false)\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
                     .clientCertFile(DataRouterConstants.DR_HOME_AUTH + certName)\r

-                    .clientCertPassword(deobfuscatedCertPassword)\r
-                    .trustStore(DataRouterConstants.DR_HOME_AUTH + keystore);\r
+                    .clientCertPassword(deobfuscatedCertPassword);                    \r

     \r
     this.searchUrl        = searchUrl;\r
     this.documentEndpoint = documentEndpoint;\r
     \r
     this.searchUrl        = searchUrl;\r
     this.documentEndpoint = documentEndpoint;\r