Merge "Fixed sonar issue of EPFusionBaseController.java"

[portal.git] / ecomp-portal-BE-os / src / main / java / org / onap / portalapp / conf / ExternalAppConfig.java

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index ee53eba..862bf39 100644 (file)
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -3,6 +3,8 @@
  * ONAP Portal
  * ===================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ *
+ * Modifications Copyright © 2018 IBM.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
@@ -161,6 +163,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
                        MDC.put(MDC_SERVICE_INSTANCE_ID, "");
                        MDC.put(MDC_ALERT_SEVERITY, AlarmSeverityEnum.INFORMATIONAL.severity());
                        MDC.put(MDC_INSTANCE_UUID, SystemProperties.getProperty(SystemProperties.INSTANCE_UUID));
+                       
                        if("true".equalsIgnoreCase(remotecentralizedsystemaccess)){
                                importFromExternalAuth();
                        }                       
@@ -169,12 +172,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
                }
        }
 
-       /**
-        * Does a sync on functions, roles and role functions based on namespace 
-        * for all the centralized applications between AAF and ONAP, updates
-        * fn_user and fn_user_role with user information from AAF.
-        * 
-        */
+       
        private void importFromExternalAuth() throws Exception {
                JSONArray aafAppRoles = new JSONArray();
                JSONArray aafUserList = new JSONArray();
@@ -191,8 +189,8 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
                                        for(int j = 0; j < aafAppRoles.length(); j++){
                                                ObjectMapper mapper = new ObjectMapper();
                                                String name = aafAppRoles.getJSONObject(j).getString("name");
-                                               String desc = aafAppRoles.getJSONObject(j).getString("description");
-                                               ExternalRoleDescription externalRoleDescription = mapper.readValue(desc, ExternalRoleDescription.class);
+                                               //String desc = aafAppRoles.getJSONObject(j).getString("description");
+                                               //ExternalRoleDescription externalRoleDescription = mapper.readValue(desc, ExternalRoleDescription.class);
                                                aafUserList = externalAccessRolesService.getAllUsersByRole(name);       
                                                if(aafUserList != null && aafUserList.length() > 0){
                                                        for(int k = 0; k < aafUserList.length(); k++){
@@ -224,10 +222,6 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
                }
        }
 
-       public DataAccessService dataAccessService() {
-               return super.dataAccessService();
-       }
-
        @Override
        public String[] tileDefinitions() {
                return super.tileDefinitions();