fixes for supporting non-gui application access provisioning

[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / portal / service / ApplicationsRestClientServiceImpl.java

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
index fd6610c..959e392 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
@@ -4,6 +4,8 @@
  * ===================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
+ *  Modifications Copyright (c) 2019 Samsung
+ * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
  * under the Apache License, Version 2.0 (the "License");
@@ -131,7 +133,7 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                logger.debug(EELFLoggerDelegate.debugLogger, "http response status=" + status);
                MDC.put(EPCommonSystemProperties.EXTERNAL_API_RESPONSE_CODE, Integer.toString(status));
                if (!isHttpSuccess(status)) {
-                       String errMsg = "Failed. Status=" + status + restPath +"; [" + ((ResponseImpl)response).getStatusInfo().getReasonPhrase().toString()
+                       String errMsg = "Failed. Status=" + status + restPath +"; [" + ((ResponseImpl)response).getStatusInfo().getReasonPhrase()
                                        + "]";
                        URL url = null;
                        try {
@@ -174,8 +176,8 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                
                if (externalApp != null) {
                        String appBaseUri = (type == SystemType.APPLICATION) ? externalApp.getAppRestEndpoint() : "";
-                       String username = (type == SystemType.APPLICATION) ? externalApp.getUsername(): "";
-                       String encriptedPwd = (type == SystemType.APPLICATION) ? externalApp.getAppPassword(): "";
+                       String username = (type == SystemType.APPLICATION) ? externalApp.getAppBasicAuthUsername(): "";
+                       String encriptedPwd = (type == SystemType.APPLICATION) ? externalApp.getAppBasicAuthPassword(): "";
 
                        String appName = (type == SystemType.APPLICATION) ? externalApp.getName(): "";
                        String decreptedAppPwd = StringUtils.EMPTY;
@@ -200,16 +202,16 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                        WebClient client = createClientForPath(appBaseUri, restPath);
                        
                        
-                       if(externalApp.getAppPassword().isEmpty() || externalApp.getAppPassword()==null){
+                       if(externalApp.getAppBasicAuthPassword().isEmpty() || externalApp.getAppBasicAuthPassword()==null){
                                logger.debug(EELFLoggerDelegate.debugLogger, "Entering in the externalApp get app password contains null : {}");
 
                                externalApp = appsCacheService.getApp(1L);
                                logger.debug(EELFLoggerDelegate.debugLogger, "external App Information : {}",externalApp);
 
-                               String mechidUsername=externalApp.getUsername();
+                               String mechidUsername=externalApp.getAppBasicAuthUsername();
                                logger.debug(EELFLoggerDelegate.debugLogger, "external App mechidUsername Information : {}",mechidUsername);
 
-                               String password=externalApp.getAppPassword();
+                               String password=externalApp.getAppBasicAuthPassword();
                                String decreptedexternalAppPwd = StringUtils.EMPTY;
                                try {
                                        decreptedexternalAppPwd = CipherUtil.decryptPKC(password,
@@ -253,7 +255,6 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                Response response = getResponse(appId, restPath);
 
                if (response != null) {
-                       //verifyResponse(response);
                        verifyResponse(response,restPath);
                        /* It is not recommendable to use the implementation class org.apache.cxf.jaxrs.impl.ResponseImpl in the code, 
                        but had to force this in-order to prevent conflict with the ResponseImpl class of Jersey Client which 
@@ -276,13 +277,11 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                Response response = getResponse(appId, restPath);
 
                if (response != null) {
-                       //verifyResponse(response);
                        verifyResponse(response,restPath);
                        /* It is not recommendable to use the implementation class org.apache.cxf.jaxrs.impl.ResponseImpl in the code, 
                        but had to force this in-order to prevent conflict with the ResponseImpl class of Jersey Client which 
                        doesn't work as expected. Created Portal-253 for tracking  */
-                       String incomingJson = ((ResponseImpl)response).readEntity(String.class);
-                       return incomingJson;
+                       return ((ResponseImpl)response).readEntity(String.class);
                }
                
                return "";
@@ -306,7 +305,6 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                Response response = getResponse(appId, restPath);
 
                if (response != null) {
-                       //verifyResponse(response);
                        verifyResponse(response,restPath);
                        String str = ((ResponseImpl)response).readEntity(String.class);
                        EcompPortalUtils.logAndSerializeObject(logger, restPath, "GET result =", str);
@@ -314,7 +312,6 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                        try {
                                t = mapper.readValue(str, clazz);
                        } catch (Exception e) {
-                               e.printStackTrace();
                                EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
                        }
                }
@@ -371,16 +368,12 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                }
 
                if (response != null) {
-                       //verifyResponse(response);
                        verifyResponse(response,restPath);
-                       // String contentType = response.getHeaderString("Content-Type");
                        if (clazz != null) {
                                String str = ((ResponseImpl)response).readEntity(String.class);
                                EcompPortalUtils.logAndSerializeObject(logger, restPath, "POST result =", str);
                                try {
-                                       t = (T) gson.fromJson(str, t.getClass());
-
-                                       //t = gson.fromJson(str, clazz);
+                                       t = (T) gson.fromJson(str, clazz);
                                } catch (Exception e) {
                                        EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, e);
                                }
@@ -428,7 +421,6 @@ public class ApplicationsRestClientServiceImpl implements ApplicationsRestClient
                }
 
                if (response != null) {
-                       //verifyResponse(response);
                        verifyResponse(response,restPath);
                        String str = ((ResponseImpl)response).readEntity(String.class);
                        EcompPortalUtils.logAndSerializeObject(logger, restPath, "PUT result =", str);