Merge "Reorder modifiers"

[so.git] / bpmn / MSOCommonBPMN / src / main / java / org / openecomp / mso / client / adapter / vnf / AdapterRestClient.java

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java
index 3e315a5..16fd351 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/adapter/vnf/AdapterRestClient.java
@@ -21,7 +21,6 @@
 package org.openecomp.mso.client.adapter.vnf;
 
 import java.net.URI;
-import java.security.GeneralSecurityException;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -29,8 +28,6 @@ import java.util.UUID;
 import javax.ws.rs.client.ClientResponseFilter;
 import javax.ws.rs.ext.ContextResolver;
 
-import org.apache.commons.codec.binary.Base64;
-import org.openecomp.mso.bpmn.common.util.CryptoUtils;
 import org.openecomp.mso.client.ResponseExceptionMapperImpl;
 import org.openecomp.mso.client.policy.JettisonStyleMapperProvider;
 import org.openecomp.mso.client.policy.RestClient;
@@ -52,8 +49,7 @@ public class AdapterRestClient extends RestClient {
 
        @Override
        protected void initializeHeaderMap(Map<String, String> headerMap) {
-               headerMap.put("Authorization",
-                               this.getBasicAuth(props.getAuth(), props.getKey()));
+               addBasicAuthHeader(props.getAuth(), props.getKey());
        }
 
        @Override
@@ -70,20 +66,4 @@ public class AdapterRestClient extends RestClient {
        protected ContextResolver<ObjectMapper> getMapper() {
                return new JettisonStyleMapperProvider();
        }
-       
-       private String getBasicAuth(String encryptedAuth, String msoKey) {
-               if ((encryptedAuth == null || encryptedAuth.isEmpty()) || (msoKey == null || msoKey.isEmpty())) {
-                       return null;
-               }
-               try {
-                       String auth = CryptoUtils.decrypt(encryptedAuth, msoKey);
-                       byte[] encoded = Base64.encodeBase64(auth.getBytes());
-                       String encodedString = new String(encoded);
-                       encodedString = "Basic " + encodedString;
-                       return encodedString;
-               } catch (GeneralSecurityException e) {
-                       this.logger.warn(e.getMessage(), e);
-                       return null;
-               }
-       }
 }