Add additional logging statements

[aai/schema-service.git] / aai-schema-service / src / test / java / org / onap / aai / schemaservice / SchemaServiceTestConfiguration.java

diff --git a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTestConfiguration.java b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTestConfiguration.java
index 5d4c187..1e2de5e 100644 (file)
--- a/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTestConfiguration.java
+++ b/aai-schema-service/src/test/java/org/onap/aai/schemaservice/SchemaServiceTestConfiguration.java
@@ -58,30 +58,38 @@ public class SchemaServiceTestConfiguration {
     @Bean
     RestTemplate restTemplate(RestTemplateBuilder builder) throws Exception {
 
-        char[] trustStorePassword = env.getProperty("server.ssl.trust-store-password").toCharArray();
-        char[] keyStorePassword   = env.getProperty("server.ssl.key-store-password").toCharArray();
 
-        String keyStore = env.getProperty("server.ssl.key-store");
-        String trustStore = env.getProperty("server.ssl.trust-store");
 
-        SSLContextBuilder sslContextBuilder = SSLContextBuilder.create();
+        RestTemplate restTemplate = null;
 
-        if(env.acceptsProfiles("two-way-ssl")){
-            sslContextBuilder = sslContextBuilder.loadKeyMaterial(loadPfx(keyStore, keyStorePassword), keyStorePassword);
-        }
+        if(env.acceptsProfiles("one-way-ssl", "two-way-ssl")) {
+            char[] trustStorePassword = env.getProperty("server.ssl.trust-store-password").toCharArray();
+            char[] keyStorePassword = env.getProperty("server.ssl.key-store-password").toCharArray();
+
+            String keyStore = env.getProperty("server.ssl.key-store");
+            String trustStore = env.getProperty("server.ssl.trust-store");
+            SSLContextBuilder sslContextBuilder = SSLContextBuilder.create();
+
+            if (env.acceptsProfiles("two-way-ssl")) {
+                sslContextBuilder = sslContextBuilder.loadKeyMaterial(loadPfx(keyStore, keyStorePassword), keyStorePassword);
+            }
 
-        SSLContext sslContext = sslContextBuilder
+            SSLContext sslContext = sslContextBuilder
                 .loadTrustMaterial(ResourceUtils.getFile(trustStore), trustStorePassword)
                 .build();
 
-        HttpClient client = HttpClients.custom()
+            HttpClient client = HttpClients.custom()
                 .setSSLContext(sslContext)
                 .setSSLHostnameVerifier((s, sslSession) -> true)
                 .build();
 
-        RestTemplate restTemplate =  builder
+            restTemplate = builder
                 .requestFactory(new HttpComponentsClientHttpRequestFactory(client))
                 .build();
+        }else {
+            restTemplate = builder.build();
+        }
+
 
         restTemplate.setErrorHandler(new ResponseErrorHandler() {
             @Override