Repair widget micro service, onboarding of widgets

Issue: PORTAL-30, PORTAL-40, PORTAL-45, PORTAL-46, PORTAL-47
Change-Id: I97de4cc038f7167d5e368249f9ea5e47e8fc1b09
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceServiceImpl.java
index aaadfa18..520bef98 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/portal/service/MicroserviceServiceImpl.java
@@ -24,6 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.crypto.BadPaddingException;
+
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
 import org.openecomp.portalapp.portal.domain.MicroserviceData;
@@ -82,7 +84,11 @@ public class MicroserviceServiceImpl implements MicroserviceService {
 		List<MicroserviceData> list = (List<MicroserviceData>) dataAccessService.getList(MicroserviceData.class, null);
 		for (int i = 0; i < list.size(); i++) {
 			if (list.get(i).getPassword() != null)
-				list.get(i).setPassword(decryptedPassword(list.get(i).getPassword()));
+				try{
+					list.get(i).setPassword(decryptedPassword(list.get(i).getPassword()));
+				} catch(BadPaddingException bpe){
+					logger.error(EELFLoggerDelegate.errorLogger, "Couldn't decrypt - Check decryption key in system.properties - looks wrong. Still going ahead with list population though", bpe);
+				}
 			list.get(i).setParameterList(getServiceParameters(list.get(i).getId()));
 		}
 		return list;