Convert Sparky to Spring-Boot

[aai/sparky-be.git] / sparkybe-onap-service / src / main / java / org / onap / aai / sparky / dal / rest / RestClientFactory.java

diff --git a/src/main/java/org/onap/aai/sparky/dal/rest/RestClientFactory.java b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/rest/RestClientFactory.java
similarity index 82%
rename from src/main/java/org/onap/aai/sparky/dal/rest/RestClientFactory.java
rename to sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/rest/RestClientFactory.java
index 8b7e881..30e48b7 100644 (file)
--- a/src/main/java/org/onap/aai/sparky/dal/rest/RestClientFactory.java
+++ b/sparkybe-onap-service/src/main/java/org/onap/aai/sparky/dal/rest/RestClientFactory.java
@@ -1,29 +1,33 @@
 /**
- * ============LICENSE_START=======================================================
- * org.onap.aai
- * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ================================================================================
+ * ============LICENSE_START===================================================
+ * SPARKY (AAI UI service)
+ * ============================================================================
+ * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 Amdocs
+ * All rights reserved.
+ * ============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============LICENSE_END=========================================================
+ * ============LICENSE_END=====================================================
+ *
+ * ECOMP and OpenECOMP are trademarks
+ * and service marks of AT&T Intellectual Property.
  */
 package org.onap.aai.sparky.dal.rest;
 
 import org.onap.aai.restclient.client.RestClient;
+import org.onap.aai.sparky.config.SparkyResourceLoader;
 import org.onap.aai.sparky.dal.rest.config.RestEndpointConfig;
 import org.onap.aai.sparky.util.Encryptor;
-import org.onap.aai.sparky.viewandinspect.config.SparkyConstants;
 
 public class RestClientFactory {
 
@@ -40,16 +44,17 @@ public class RestClientFactory {
           "Failed to build RestClient because RestAuthenticationMode is null.");
     }
 
+    SparkyResourceLoader resourceLoader = restEndpointConfig.getResourceLoader();
+    
     switch (restEndpointConfig.getRestAuthenticationMode()) {
 
       case SSL_CERT: {
 
         Encryptor enc = new Encryptor();
-        String certFileNameFullPath =
-            SparkyConstants.CONFIG_AUTH_LOCATION + restEndpointConfig.getCertFileName();
+        String certFileNameFullPath = resourceLoader.getAbsolutePath(restEndpointConfig.getCertFileName());
         String decryptedCertPassword = enc.decryptValue(restEndpointConfig.getCertPassword());
         String truststoreFileNameFullPath =
-            SparkyConstants.CONFIG_AUTH_LOCATION + restEndpointConfig.getTruststoreFileName();
+            resourceLoader.getAbsolutePath(restEndpointConfig.getTruststoreFileName());
 
         return new RestClient() //
             .authenticationMode(restEndpointConfig.getRestAuthenticationMode()) //