Removing commented code and refactoring.

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/constants/AndroidSenseConstants.java

@@ -16,9 +16,6 @@
 
 package org.wso2.carbon.device.mgt.iot.androidsense.service.impl.constants;
 
-import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.user.api.Permission;
-
 public class AndroidSenseConstants {
 
     public final static String DEVICE_TYPE = "android_sense";
@@ -47,26 +44,9 @@ public class AndroidSenseConstants {
 
     public static final String SCOPE = "scope";
 
-    public static Permission[] permissions;
+    public static final String PERM_ENROLL_ANDROID_SENSE = "/permission/admin/device-mgt/devices/enroll/android-sense";
-
+    public static final String PERM_OWNING_DEVICE_VIEW = "/permission/admin/device-mgt/devices/owning-device/view";
-    static {
-
-        Permission enroll = new Permission("/permission/admin/device-mgt/devices/enroll", CarbonConstants
-                .UI_PERMISSION_ACTION);
-        Permission disEnroll = new Permission("/permission/admin/device-mgt/devices/disenroll", CarbonConstants
-                .UI_PERMISSION_ACTION);
-        Permission owningDevice = new Permission("/permission/admin/device-mgt/devices/owning-device",
-                CarbonConstants.UI_PERMISSION_ACTION);
-        Permission groups = new Permission("/permission/admin/device-mgt/groups", CarbonConstants.UI_PERMISSION_ACTION);
-        Permission notifications = new Permission("/permission/admin/device-mgt/notifications", CarbonConstants
-                .UI_PERMISSION_ACTION);
-        Permission policies = new Permission("/permission/admin/device-mgt/policies", CarbonConstants
-                .UI_PERMISSION_ACTION);
-        Permission subscribe = new Permission("/permission/admin/manage/api/subscribe", CarbonConstants
-                .UI_PERMISSION_ACTION);
 
-        permissions = new Permission[]{enroll, disEnroll, owningDevice, groups, notifications, policies, subscribe};
+    public static final String ROLE_NAME = "internal/devicemgt-user";
-
-    }
 
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/java/org/wso2/carbon/device/mgt/iot/androidsense/service/impl/listener/AndroidSensePermissionUpdateListener.java

@@ -17,10 +17,11 @@ package org.wso2.carbon.device.mgt.iot.androidsense.service.impl.listener;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.iot.androidsense.service.impl.AndroidSenseServiceImpl;
 import org.wso2.carbon.device.mgt.iot.androidsense.service.impl.constants.AndroidSenseConstants;
 import org.wso2.carbon.user.api.AuthorizationManager;
+import org.wso2.carbon.user.api.Permission;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.api.UserStoreManager;
 import org.wso2.carbon.user.core.service.RealmService;
@@ -28,11 +29,9 @@ import org.wso2.carbon.user.core.service.RealmService;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-public class PermissionUpdateListener implements ServletContextListener {
+public class AndroidSensePermissionUpdateListener implements ServletContextListener {
 
-    private static Log log = LogFactory.getLog(AndroidSenseServiceImpl.class);
+    private static Log log = LogFactory.getLog(AndroidSensePermissionUpdateListener.class);
-
-    private static final String ROLE_NAME = "internal/devicemgt-user";
 
     @Override
     public void contextInitialized(ServletContextEvent servletContextEvent) {
@@ -40,16 +39,16 @@ public class PermissionUpdateListener implements ServletContextListener {
         UserStoreManager userStoreManager = getUserStoreManager();
         try {
             if (userStoreManager != null) {
-                if (!userStoreManager.isExistingRole(ROLE_NAME)) {
+                if (!userStoreManager.isExistingRole(AndroidSenseConstants.ROLE_NAME)) {
-                    userStoreManager.addRole(ROLE_NAME, null, AndroidSenseConstants.permissions);
+                    userStoreManager.addRole(AndroidSenseConstants.ROLE_NAME, null, getPermissions());
                 } else {
-                    getAuthorizationManager().authorizeRole(ROLE_NAME,
+                    getAuthorizationManager().authorizeRole(AndroidSenseConstants.ROLE_NAME,
-                            "/permission/admin/device-mgt/devices/enroll/android-sense", "ui.execute");
+                            AndroidSenseConstants.PERM_ENROLL_ANDROID_SENSE, CarbonConstants.UI_PERMISSION_ACTION);
-                    getAuthorizationManager().authorizeRole(ROLE_NAME,
+                    getAuthorizationManager().authorizeRole(AndroidSenseConstants.ROLE_NAME,
-                            "/permission/admin/device-mgt/devices/owning-device/view", "ui.execute");
+                            AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants.UI_PERMISSION_ACTION);
                 }
             } } catch (UserStoreException e) {
-            //
+            log.error("Error while creating a role and adding a user for Android Sense.", e);
         }
     }
 
@@ -101,25 +100,14 @@ public class PermissionUpdateListener implements ServletContextListener {
         return authorizationManager;
     }
 
+    private Permission[] getPermissions() {
+
+            Permission androidSense = new Permission(AndroidSenseConstants.PERM_ENROLL_ANDROID_SENSE,
+                    CarbonConstants.UI_PERMISSION_ACTION);
+            Permission view = new Permission(AndroidSenseConstants.PERM_OWNING_DEVICE_VIEW, CarbonConstants
+                    .UI_PERMISSION_ACTION);
 
-//    public static void registerApiAccessRoles(String user) {
+            return new Permission[]{androidSense, view};
-//        UserStoreManager userStoreManager = null;
+    }
-//        try {
-//            userStoreManager = getUserStoreManager();
-//            String[] userList = new String[]{user};
-//            if (userStoreManager != null) {
-//                String rolesOfUser[] = userStoreManager.getRoleListOfUser(user);
-//                if (!userStoreManager.isExistingRole(Constants.DEFAULT_ROLE_NAME)) {
-//                    userStoreManager.addRole(Constants.DEFAULT_ROLE_NAME, userList, Constants.DEFAULT_PERMISSION);
-//                } else if (rolesOfUser != null && Arrays.asList(rolesOfUser).contains(Constants.DEFAULT_ROLE_NAME)) {
-//                    return;
-//                } else {
-//                    userStoreManager.updateUserListOfRole(Constants.DEFAULT_ROLE_NAME, new String[0], userList);
-//                }
-//            }
-//        } catch (UserStoreException e) {
-//            log.error("Error while creating a role and adding a user for virtual_firealarm.", e);
-//        }
-//    }
 
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/src/main/webapp/WEB-INF/web.xml

@@ -32,6 +32,6 @@
 	</context-param>
 
 	<listener>
-		<listener-class>org.wso2.carbon.device.mgt.iot.androidsense.service.impl.listener.PermissionUpdateListener</listener-class>
+		<listener-class>org.wso2.carbon.device.mgt.iot.androidsense.service.impl.listener.AndroidSensePermissionUpdateListener</listener-class>
 	</listener>
 </web-app>