X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Futils%2FEcompPortalUtils.java;h=db984a67e5ce912b125827c75e28ef1eb83f5466;hb=8e3d0ff5ce27cd87a257a2a95430add3dd3596ce;hp=30eeac04baa9d0b705917e324ccc4a4499a79d11;hpb=3f56b9fdb4d2ec891344d6c9048363e1cac587d2;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/utils/EcompPortalUtils.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/utils/EcompPortalUtils.java
index 30eeac04..db984a67 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/utils/EcompPortalUtils.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/utils/EcompPortalUtils.java
@@ -376,6 +376,15 @@ public class EcompPortalUtils {
 	public static String widgetMsProtocol() {
 		return getPropertyOrDefault(EPCommonSystemProperties.WIDGET_MS_PROTOCOL, "https");
 	}
+	
+	/**
+	 * Answers the protocol to use.
+	 * 
+	 * @return Protocol name from property file; defaults to https.
+	 */
+	public static String widgetMLProtocol() {
+		return getPropertyOrDefault(EPCommonSystemProperties.WIDGET_ML_PROTOCOL, "https");
+	}
 
 	/**
 	 * Answers the host to use.
@@ -385,6 +394,15 @@ public class EcompPortalUtils {
 	public static String localOrDockerHost() {
 		return getPropertyOrDefault(EPCommonSystemProperties.WIDGET_MS_HOSTNAME, "localhost");
 	}
+	
+	/**
+	 * Answers the host to use.
+	 * 
+	 * @return Host name from property file; defaults to localhost.
+	 */
+	public static String mlLocalOrDockerHost() {
+		return getPropertyOrDefault(EPCommonSystemProperties.WIDGET_ML_HOSTNAME, "localhost");
+	}
 
 	/**
 	 * It returns headers where username and password of external central auth is
@@ -402,7 +420,13 @@ public class EcompPortalUtils {
 			decryptedPass = SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_AUTH_PASSWORD);
 			userName = SystemProperties.getProperty(EPCommonSystemProperties.EXTERNAL_CENTRAL_AUTH_USER_NAME);
 		}
-		String decPass = decrypted(decryptedPass);
+		String decPass;
+		try {
+			decPass = decrypted(decryptedPass);
+		} catch (Exception e) {
+			logger.warn(EELFLoggerDelegate.errorLogger, "decryptedPassword failed using non decrypted pwd from the Properties file", e);
+			decPass = decryptedPass;
+		}
 		String usernamePass = userName + ":" + decPass;
 		String encToBase64 = String.valueOf((DatatypeConverter.printBase64Binary(usernamePass.getBytes())));
 		HttpHeaders headers = new HttpHeaders();