Merge "Add tests to improve code-coverage stats in Sonar"

[portal/ric-dashboard.git] / dashboard / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / config / WebSecurityConfiguration.java

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
index f1438d7..0a3f022 100644 (file)
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
@@ -25,7 +25,6 @@ import java.lang.reflect.InvocationTargetException;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.oransc.ric.portal.dashboard.DashboardConstants;
 import org.oransc.ric.portal.dashboard.DashboardUserManager;
-import org.oransc.ric.portal.dashboard.controller.A1MediatorController;
 import org.oransc.ric.portal.dashboard.controller.AdminController;
 import org.oransc.ric.portal.dashboard.controller.AppManagerController;
 import org.oransc.ric.portal.dashboard.controller.E2ManagerController;
@@ -62,9 +61,9 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
        @Value("${portalapi.appname}")
        private String appName;
        @Value("${portalapi.username}")
-       private String userName;
+       private String portalApiUsername;
        @Value("${portalapi.password}")
-       private String password;
+       private String portalApiPassword;
        @Value("${portalapi.decryptor}")
        private String decryptor;
        @Value("${portalapi.usercookie}")
@@ -93,7 +92,6 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
                        "/swagger-ui.html", //
                        "/webjars/**", //
                        PortalApiConstants.API_PREFIX + "/**", //
-                       A1MediatorController.CONTROLLER_PATH + "/" + DashboardConstants.VERSION_METHOD, //
                        AdminController.CONTROLLER_PATH + "/" + AdminController.HEALTH_METHOD, //
                        AdminController.CONTROLLER_PATH + "/" + AdminController.VERSION_METHOD, //
                        AppManagerController.CONTROLLER_PATH + "/" + DashboardConstants.RIC_INSTANCE_KEY + "/*/"
@@ -116,7 +114,7 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
        public PortalAuthManager portalAuthManagerBean() throws ClassNotFoundException, IllegalAccessException,
                        InstantiationException, InvocationTargetException, NoSuchMethodException {
                logger.debug("portalAuthManagerBean");
-               return new PortalAuthManager(appName, userName, password, decryptor, userCookie);
+               return new PortalAuthManager(appName, portalApiUsername, portalApiPassword, decryptor, userCookie);
        }
 
        /*