Design Services updates

[appc.git] / appc-inbound / appc-design-services / provider / src / main / java / org / onap / appc / design / services / util / ArtifactHandlerClient.java

diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/services/util/ArtifactHandlerClient.java b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/services/util/ArtifactHandlerClient.java
index 8cd7ebb..0d7357a 100644 (file)
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/services/util/ArtifactHandlerClient.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/onap/appc/design/services/util/ArtifactHandlerClient.java
@@ -109,12 +109,13 @@ public class ArtifactHandlerClient  {
         return String.format("{\"input\": %s}", json.toString());
     }
 
-    public HashMap<String, String> execute(String payload, String rpc) throws Exception{    
+    public HashMap<String, String> execute(String payload, String rpc) throws Exception{
         log.info("Configuring Rest Operation for Payload " + payload + " RPC : " + rpc );
         HashMap<String, String> outputMessage = new HashMap<String, String>();
         Client client = null;
         WebResource webResource = null;
         ClientResponse clientResponse = null;
+        EncryptionTool et = EncryptionTool.getInstance();
         String responseDataType=MediaType.APPLICATION_JSON;
         String requestDataType=MediaType.APPLICATION_JSON;
 
@@ -129,10 +130,10 @@ public class ArtifactHandlerClient  {
                     com.sun.jersey.client.urlconnection.HTTPSProperties.PROPERTY_HTTPS_PROPERTIES,
                     new com.sun.jersey.client.urlconnection.HTTPSProperties(getHostnameVerifier(), sslContext));
             client = Client.create(defaultClientConfig);
-            client.addFilter(new HTTPBasicAuthFilter(props.getProperty("appc.upload.user"), props.getProperty("appc.upload.pass")));
+        String password = et.decrypt(props.getProperty("appc.upload.pass"));
+        client.addFilter(new HTTPBasicAuthFilter(props.getProperty("appc.upload.user"),password));
             webResource = client.resource(new URI(props.getProperty("appc.upload.provider.url")));
             webResource.setProperty("Content-Type", "application/json;charset=UTF-8");
-            
             log.info("Starting Rest Operation.....");
             if(HttpMethod.GET.equalsIgnoreCase(rpc)){
                 clientResponse = webResource.accept(responseDataType).get(ClientResponse.class);