Group Constants moved to common

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Group.java

@@ -22,9 +22,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
+import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyEixistException;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupUser;
@@ -48,20 +48,6 @@ import java.util.List;
 @SuppressWarnings("NonJaxWsWebServices")
 public class Group {
 
-    private static final String DEFAULT_ADMIN_ROLE = "admin";
-    private static final String DEFAULT_OPERATOR_ROLE = "invoke-device-operations";
-    private static final String DEFAULT_STATS_MONITOR_ROLE = "view-statistics";
-    private static final String DEFAULT_VIEW_POLICIES = "view-policies";
-    private static final String DEFAULT_MANAGE_POLICIES = "mange-policies";
-    private static final String DEFAULT_VIEW_EVENTS = "view-events";
-    private static final String[] DEFAULT_ADMIN_PERMISSIONS = {"/permission/device-mgt/admin/groups",
-                                                               "/permission/device-mgt/user/groups"};
-    private static final String[] DEFAULT_OPERATOR_PERMISSIONS = {"/permission/device-mgt/user/groups/device_operation"};
-    private static final String[] DEFAULT_STATS_MONITOR_PERMISSIONS = {"/permission/device-mgt/user/groups/device_monitor"};
-    private static final String[] DEFAULT_MANAGE_POLICIES_PERMISSIONS = {"/permission/device-mgt/user/groups/device_policies/add"};
-    private static final String[] DEFAULT_VIEW_POLICIES_PERMISSIONS = {"/permission/device-mgt/user/groups/device_policies/view"};
-    private static final String[] DEFAULT_VIEW_EVENTS_PERMISSIONS = {"/permission/device-mgt/user/groups/device_events"};
-
     private static Log log = LogFactory.getLog(Group.class);
 
     @POST
@@ -76,18 +62,18 @@ public class Group {
         group.setDateOfLastUpdate(new Date().getTime());
         try {
             GroupManagementProviderService groupManagementService = DeviceMgtAPIUtils.getGroupManagementProviderService();
-            groupManagementService.createGroup(group, DEFAULT_ADMIN_ROLE, DEFAULT_ADMIN_PERMISSIONS);
+            groupManagementService.createGroup(group, DeviceGroupConstants.Roles.DEFAULT_ADMIN_ROLE, DeviceGroupConstants.Permissions.DEFAULT_ADMIN_PERMISSIONS);
             groupManagementService.addGroupSharingRole(owner, group.getName(), owner,
-                                                       DEFAULT_OPERATOR_ROLE,
+                                                       DeviceGroupConstants.Roles.DEFAULT_OPERATOR_ROLE,
-                                                       DEFAULT_OPERATOR_PERMISSIONS);
+                                                       DeviceGroupConstants.Permissions.DEFAULT_OPERATOR_PERMISSIONS);
-            groupManagementService.addGroupSharingRole(owner, group.getName(), owner, DEFAULT_STATS_MONITOR_ROLE,
+            groupManagementService.addGroupSharingRole(owner, group.getName(), owner, DeviceGroupConstants.Roles.DEFAULT_STATS_MONITOR_ROLE,
-                                                       DEFAULT_STATS_MONITOR_PERMISSIONS);
+                                                       DeviceGroupConstants.Permissions.DEFAULT_STATS_MONITOR_PERMISSIONS);
-            groupManagementService.addGroupSharingRole(owner, group.getName(), owner, DEFAULT_VIEW_POLICIES,
+            groupManagementService.addGroupSharingRole(owner, group.getName(), owner, DeviceGroupConstants.Roles.DEFAULT_VIEW_POLICIES,
-                                                       DEFAULT_VIEW_POLICIES_PERMISSIONS);
+                                                       DeviceGroupConstants.Permissions.DEFAULT_VIEW_POLICIES_PERMISSIONS);
-            groupManagementService.addGroupSharingRole(owner, group.getName(), owner, DEFAULT_MANAGE_POLICIES,
+            groupManagementService.addGroupSharingRole(owner, group.getName(), owner, DeviceGroupConstants.Roles.DEFAULT_MANAGE_POLICIES,
-                                                       DEFAULT_MANAGE_POLICIES_PERMISSIONS);
+                                                       DeviceGroupConstants.Permissions.DEFAULT_MANAGE_POLICIES_PERMISSIONS);
-            groupManagementService.addGroupSharingRole(owner, group.getName(), owner, DEFAULT_VIEW_EVENTS,
+            groupManagementService.addGroupSharingRole(owner, group.getName(), owner, DeviceGroupConstants.Roles.DEFAULT_VIEW_EVENTS,
-                                                       DEFAULT_VIEW_EVENTS_PERMISSIONS);
+                                                       DeviceGroupConstants.Permissions.DEFAULT_VIEW_EVENTS_PERMISSIONS);
             return Response.status(Response.Status.CREATED).build();
         } catch (GroupAlreadyEixistException e) {
             return Response.status(Response.Status.CONFLICT).entity(e.getMessage()).build();

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroupConstants.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.wso2.carbon.device.mgt.common.group.mgt;
+
+/**
+ * Holds Device Group constants and expose to external access
+ */
+public class DeviceGroupConstants {
+    public static class Roles {
+        public static final String DEFAULT_ADMIN_ROLE = "admin";
+        public static final String DEFAULT_OPERATOR_ROLE = "invoke-device-operations";
+        public static final String DEFAULT_STATS_MONITOR_ROLE = "view-statistics";
+        public static final String DEFAULT_VIEW_POLICIES = "view-policies";
+        public static final String DEFAULT_MANAGE_POLICIES = "mange-policies";
+        public static final String DEFAULT_VIEW_EVENTS = "view-events";
+    }
+
+    public static class Permissions {
+        public static final String[] DEFAULT_ADMIN_PERMISSIONS =
+                {"/permission/device-mgt/admin/groups", "/permission/device-mgt/user/groups"};
+        public static final String[] DEFAULT_OPERATOR_PERMISSIONS =
+                {"/permission/device-mgt/user/groups/device_operation"};
+        public static final String[] DEFAULT_STATS_MONITOR_PERMISSIONS =
+                {"/permission/device-mgt/user/groups/device_monitor"};
+        public static final String[] DEFAULT_MANAGE_POLICIES_PERMISSIONS =
+                {"/permission/device-mgt/user/groups/device_policies/add"};
+        public static final String[] DEFAULT_VIEW_POLICIES_PERMISSIONS =
+                {"/permission/device-mgt/user/groups/device_policies/view"};
+        public static final String[] DEFAULT_VIEW_EVENTS_PERMISSIONS =
+                {"/permission/device-mgt/user/groups/device_events"};
+    }
+}