Merge pull request #496 from madhawap/release-2.0.x

Task operation config related changes

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

@@ -42,6 +42,5 @@ public class MonitoringOperation {
         this.recurrentTimes = recurrentTimes;
     }
 
-
 }
 

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

@@ -52,6 +52,6 @@ public class OperationMonitoringTaskConfig {
 
     public void setMonitoringOperation(List<MonitoringOperation> monitoringOperation) {
         this.monitoringOperation = monitoringOperation;
-    }
 
     }
+}

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementPluginRepository.java

@@ -195,7 +195,6 @@ public class DeviceManagementPluginRepository implements DeviceManagerStartupLis
                 } else {
                     deviceTaskManagerService.startTask(deviceManagementService.getType(),
                             operationMonitoringTaskConfig);
-                    // TODO: In here a race condition can arise. Need to handle it.
                 }
             }
         } catch (DeviceMgtTaskException e) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceTaskManagerServiceComponent.java

@@ -76,12 +76,12 @@ public class DeviceTaskManagerServiceComponent {
         }
     }
 
-    private void getDeviceOperationMonitoringConfig(ComponentContext componentContext) throws DeviceMgtTaskException {
+    private void getDeviceOperationMonitoringConfig(ComponentContext componentContext)
+            throws DeviceMgtTaskException {
 
         DeviceTaskManagerService deviceTaskManagerService = new DeviceTaskManagerServiceImpl();
 
-        DeviceManagementDataHolder.getInstance().setDeviceTaskManagerService(
+        DeviceManagementDataHolder.getInstance().setDeviceTaskManagerService(deviceTaskManagerService);
-                deviceTaskManagerService);
 
         componentContext.getBundleContext().registerService(DeviceTaskManagerService.class,
                 deviceTaskManagerService, null);
@@ -89,11 +89,10 @@ public class DeviceTaskManagerServiceComponent {
         Map<String, OperationMonitoringTaskConfig> deviceConfigMap = DeviceMonitoringOperationDataHolder
                 .getInstance().getOperationMonitoringConfigFromMap();
 
-        for (String platformType : new ArrayList<String>(deviceConfigMap.keySet())) {
+        for (String platformType : new ArrayList<>(deviceConfigMap.keySet())) {
             deviceTaskManagerService.startTask(platformType, deviceConfigMap.get(platformType));
             deviceConfigMap.remove(platformType);
         }
-
     }
 
     @SuppressWarnings("unused")

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -1222,17 +1222,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     @Override
     public List<MonitoringOperation> getMonitoringOperationList(String deviceType) {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-//        Map<DeviceTypeIdentifier, DeviceManagementService> deviceManagementServiceMap =
+
-//                pluginRepository.getAllDeviceManagementServices(tenantId);
         DeviceManagementService dms = pluginRepository.getDeviceManagementService(deviceType, tenantId);
-      // ;
-       // OperationMonitoringTaskConfig operationMonitoringTaskConfig;
-        //Map<String, List<MonitoringOperation>> deviceTypeSpecificMonitoringOperations = new HashMap<>();
 
-//        for(DeviceTypeIdentifier dti : deviceManagementServiceMap.keySet()){
-//            dms = deviceManagementServiceMap.get(dti);
-//
-//        }
         OperationMonitoringTaskConfig operationMonitoringTaskConfig = dms.getOperationMonitoringConfig();
         return operationMonitoringTaskConfig.getMonitoringOperation();
     }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java

@@ -19,8 +19,10 @@
 
 package org.wso2.carbon.device.mgt.core.task.impl;
 
+import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.core.task.DeviceMgtTaskException;
 import org.wso2.carbon.device.mgt.core.task.DeviceTaskManager;
 import org.wso2.carbon.ntask.core.Task;
@@ -32,10 +34,18 @@ public class DeviceDetailsRetrieverTask implements Task {
     private static Log log = LogFactory.getLog(DeviceDetailsRetrieverTask.class);
 //    private DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl();
     private String deviceType;
+    private String oppConfig;
+    private OperationMonitoringTaskConfig operationMonitoringTaskConfig;
 
     @Override
     public void setProperties(Map<String, String> map) {
         deviceType = map.get("DEVICE_TYPE");
+        oppConfig = map.get("OPPCONFIG");
+
+        Gson gson = new Gson();
+
+        operationMonitoringTaskConfig = gson.fromJson(oppConfig,
+                OperationMonitoringTaskConfig.class);
     }
 
     @Override
@@ -49,14 +59,18 @@ public class DeviceDetailsRetrieverTask implements Task {
             log.debug("Device details retrieving task started to run.");
         }
 
-        DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl(deviceType);
+        DeviceTaskManager deviceTaskManager = new DeviceTaskManagerImpl(deviceType,
-
+                operationMonitoringTaskConfig);
+        //pass the configurations also from here, monitoring tasks
         try {
             deviceTaskManager.addOperations();
         } catch (DeviceMgtTaskException e) {
-            log.error("Error occurred while trying to add the operations to device to retrieve device details.", e);
+            log.error(
+                    "Error occurred while trying to add the operations to device to retrieve device details.",
+                    e);
         }
 
     }
+
 }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceTaskManagerImpl.java

@@ -25,6 +25,7 @@ import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.MonitoringOperation;
+import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
@@ -46,30 +47,26 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
     private static Log log = LogFactory.getLog(DeviceTaskManagerImpl.class);
     private String deviceType;
     private static Map<Integer, Map<String, Long>> map = new HashMap<>();
+    private OperationMonitoringTaskConfig operationMonitoringTaskConfig;
+
+    public DeviceTaskManagerImpl(String deviceType,
+                                 OperationMonitoringTaskConfig operationMonitoringTaskConfig) {
+        this.operationMonitoringTaskConfig = operationMonitoringTaskConfig;
+        this.deviceType = deviceType;
+    }
 
     public DeviceTaskManagerImpl(String deviceType) {
         this.deviceType = deviceType;
     }
 
     //get device type specific operations
-    public List<MonitoringOperation> getOperationList() throws DeviceMgtTaskException {
+    private List<MonitoringOperation> getOperationList() throws DeviceMgtTaskException {
-
+        return operationMonitoringTaskConfig.getMonitoringOperation();
-        DeviceManagementProviderService deviceManagementProviderService = DeviceManagementDataHolder
-                .getInstance().
-                        getDeviceManagementProvider();
-
-        return deviceManagementProviderService.getMonitoringOperationList(
-                deviceType);//Get task list from each device type
     }
 
     @Override
     public int getTaskFrequency() throws DeviceMgtTaskException {
-        DeviceManagementProviderService deviceManagementProviderService = DeviceManagementDataHolder
+        return operationMonitoringTaskConfig.getFrequency();
-                .getInstance().
-                        getDeviceManagementProvider();
-
-        return deviceManagementProviderService.getDeviceMonitoringFrequency(deviceType);
-
     }
 
 //    @Override
@@ -80,11 +77,7 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
 
     @Override
     public boolean isTaskEnabled() throws DeviceMgtTaskException {
-        DeviceManagementProviderService deviceManagementProviderService = DeviceManagementDataHolder
+        return operationMonitoringTaskConfig.isEnabled();
-                .getInstance().
-                        getDeviceManagementProvider();
-
-        return deviceManagementProviderService.isDeviceMonitoringEnabled(deviceType);
     }
 
 
@@ -149,13 +142,22 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
         return opNames;
     }
 
+    private List<MonitoringOperation> getOperationListforTask() throws DeviceMgtTaskException {
+
+        DeviceManagementProviderService deviceManagementProviderService = DeviceManagementDataHolder
+                .getInstance().
+                        getDeviceManagementProvider();
+
+        return deviceManagementProviderService.getMonitoringOperationList(
+                deviceType);//Get task list from each device type
+    }
 
 
     @Override
     public boolean isTaskOperation(String opName) {
 
         try {
-            List<MonitoringOperation> monitoringOperations = this.getOperationList();
+            List<MonitoringOperation> monitoringOperations = this.getOperationListforTask();
             for (MonitoringOperation taop : monitoringOperations) {
                 if (taop.getTaskName().equalsIgnoreCase(opName)) {
                     return true;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceTaskManagerServiceImpl.java

@@ -19,6 +19,7 @@
 
 package org.wso2.carbon.device.mgt.core.task.impl;
 
+import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
@@ -46,9 +47,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
     private static Log log = LogFactory.getLog(DeviceTaskManagerServiceImpl.class);
 
     @Override
-    public void startTask(String deviceType, OperationMonitoringTaskConfig operationMonitoringTaskConfig) throws DeviceMgtTaskException {
+    public void startTask(String deviceType, OperationMonitoringTaskConfig operationMonitoringTaskConfig)
-
+            throws DeviceMgtTaskException {
-//        String TASK_NAME = deviceType;
 
         log.info("Task adding for " + deviceType);
 
@@ -62,7 +62,8 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
                 log.debug("Device details retrieving task is started for the tenant id " + tenantId);
                 //                log.debug("Device details retrieving task is at frequency of : " + deviceTaskManager
                 //                        .getTaskFrequency());
-                log.debug("Device details retrieving task is at frequency of : " + operationMonitoringTaskConfig
+                log.debug(
+                        "Device details retrieving task is at frequency of : " + operationMonitoringTaskConfig
                                 .getFrequency());
             }
 
@@ -73,32 +74,38 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
             triggerInfo.setIntervalMillis(operationMonitoringTaskConfig.getFrequency());
             triggerInfo.setRepeatCount(-1);
 
+            Gson gson = new Gson();
+            String operationConfigs = gson.toJson(operationMonitoringTaskConfig);
+
             Map<String, String> properties = new HashMap<>();
+
             properties.put(TENANT_ID, String.valueOf(tenantId));
             properties.put("DEVICE_TYPE", deviceType);
+            properties.put("OPPCONFIG", operationConfigs);
 
+            String taskName = deviceType + String.valueOf(tenantId);
 
             if (!taskManager.isTaskScheduled(deviceType)) {
 
-                TaskInfo taskInfo = new TaskInfo(deviceType, TASK_CLASS, properties, triggerInfo);
+                TaskInfo taskInfo = new TaskInfo(taskName, TASK_CLASS, properties, triggerInfo);
 
                 taskManager.registerTask(taskInfo);
                 taskManager.rescheduleTask(taskInfo.getName());
             } else {
-                throw new DeviceMgtTaskException("Device details retrieving task is already started for this tenant " +
+                throw new DeviceMgtTaskException(
-                        tenantId);
+                        "Device details retrieving task is already started for this tenant " + tenantId);
             }
 
         } catch (TaskException e) {
-            throw new DeviceMgtTaskException("Error occurred while creating the task for tenant " + tenantId, e);
+            throw new DeviceMgtTaskException("Error occurred while creating the task for tenant " + tenantId,
+                    e);
         }
 
     }
 
     @Override
-    public void stopTask(String deviceType, OperationMonitoringTaskConfig operationMonitoringTaskConfig) throws DeviceMgtTaskException {
+    public void stopTask(String deviceType, OperationMonitoringTaskConfig operationMonitoringTaskConfig)
-
+            throws DeviceMgtTaskException {
-//        String TASK_NAME = deviceType;
 
         try {
             TaskService taskService = DeviceManagementDataHolder.getInstance().getTaskService();
@@ -108,15 +115,15 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
             }
         } catch (TaskException e) {
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            throw new DeviceMgtTaskException("Error occurred while deleting the task for tenant " + tenantId, e);
+            throw new DeviceMgtTaskException("Error occurred while deleting the task for tenant " + tenantId,
+                    e);
         }
 
     }
 
     @Override
-    public void updateTask(String deviceType, OperationMonitoringTaskConfig operationMonitoringTaskConfig) throws DeviceMgtTaskException {
+    public void updateTask(String deviceType, OperationMonitoringTaskConfig operationMonitoringTaskConfig)
-
+            throws DeviceMgtTaskException {
-//        String TASK_NAME = deviceType;
 
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         //        deviceTaskManager = new DeviceTaskManagerImpl();
@@ -134,21 +141,20 @@ public class DeviceTaskManagerServiceImpl implements DeviceTaskManagerService {
                 Map<String, String> properties = new HashMap<>();
                 properties.put(TENANT_ID, String.valueOf(tenantId));
 
-                TaskInfo taskInfo = new TaskInfo(deviceType, TASK_CLASS, properties,
+                TaskInfo taskInfo = new TaskInfo(deviceType, TASK_CLASS, properties, triggerInfo);
-                        triggerInfo);
 
                 taskManager.registerTask(taskInfo);
                 taskManager.rescheduleTask(taskInfo.getName());
             } else {
-                throw new DeviceMgtTaskException("Device details retrieving task has not been started for this tenant " +
+                throw new DeviceMgtTaskException(
+                        "Device details retrieving task has not been started for this tenant " +
                                 tenantId + ". Please start the task first.");
             }
 
         } catch (TaskException e) {
-            throw new DeviceMgtTaskException("Error occurred while updating the task for tenant " + tenantId, e);
+            throw new DeviceMgtTaskException("Error occurred while updating the task for tenant " + tenantId,
+                    e);
         }
-
-
     }
 }