password moved from hard coded values to environment properties

password moved from hard coded values to environment properties

Issue-ID: PORTAL-710
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>
Change-Id: I13f2fd2f832af5eb99426082f4a1aa620ce94974
Signed-off-by: Dominik Mizyn <d.mizyn@samsung.com>

2 files changed, 2 insertions, 8 deletions

diff --git a/portal-BE/src/main/resources/application.properties b/portal-BE/src/main/resources/application.properties
index 6debc9ab..56e0f04d 100644
--- a/portal-BE/src/main/resources/application.properties
+++ b/portal-BE/src/main/resources/application.properties
@@ -5,8 +5,8 @@ spring.datasource.url=jdbc:mysql://portal-db:3306/testdb?createDatabaseIfNotExis
 spring.datasource.initialization-mode=always
 spring.session.jdbc.initialize-schema=always
 spring.datasource.continueOnError=true
-spring.datasource.username=portal
-spring.datasource.password=Test123456
+spring.datasource.username=${spring_datasource_username}
+spring.datasource.password=${spring_datasource_password}
 #H2 config
 spring.h2.console.settings.web-allow-others=true
 spring.h2.console.enabled=true
diff --git a/portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java b/portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java
index e2da10ce..492c1795 100644
--- a/portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java
+++ b/portal-BE/src/test/java/org/onap/portal/framework/MockitoTestSuite.java
@@ -37,12 +37,6 @@
  */
 package org.onap.portal.framework;
 
-import static org.mockito.Mockito.when;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;