Merge branch 'master' into deviceOrgImprovements

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics-mgt/grafana-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>analytics-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics-mgt/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/APIPublisherStartupHandler.java

@@ -90,6 +90,15 @@ public class APIPublisherStartupHandler implements ServerStartupObserver {
                 } catch (APIManagerPublisherException e) {
                     log.error("failed to update scope role mapping.", e);
                 }
+
+                // execute after api publishing
+                for (PostApiPublishingObsever observer : APIPublisherDataHolder.getInstance().getPostApiPublishingObseverList()) {
+                    if (log.isDebugEnabled()) {
+                        log.debug("Executing " + observer.getClass().getName());
+                    }
+                    observer.execute();
+                }
+                log.info("Finish executing PostApiPublishingObsevers");
             }
         });
         t.start();

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/PostApiPublishingObsever.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. 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 io.entgra.device.mgt.core.apimgt.webapp.publisher;
+
+public interface PostApiPublishingObsever {
+    void execute();
+
+}

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java

@@ -22,6 +22,7 @@ import io.entgra.device.mgt.core.apimgt.extension.rest.api.PublisherRESTAPIServi
 import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIConfig;
 import io.entgra.device.mgt.core.apimgt.webapp.publisher.APIPublisherService;
 import io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.MetadataManagementService;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.PostApiPublishingObsever;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.registry.core.service.RegistryService;
@@ -32,9 +33,11 @@ import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.user.core.tenant.TenantManager;
 import org.wso2.carbon.utils.ConfigurationContextService;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
+import java.util.List;
+import java.util.ArrayList;
+
 
 public class APIPublisherDataHolder {
 
@@ -52,6 +55,7 @@ public class APIPublisherDataHolder {
 
     private static APIPublisherDataHolder thisInstance = new APIPublisherDataHolder();
 
+    private List<PostApiPublishingObsever> postApiPublishingObseverList = new ArrayList<>();
     private APIPublisherDataHolder() {
     }
 
@@ -179,4 +183,16 @@ public class APIPublisherDataHolder {
     public void setMetadataManagementService(MetadataManagementService metadataManagementService) {
         this.metadataManagementService = metadataManagementService;
     }
+
+    public List<PostApiPublishingObsever> getPostApiPublishingObseverList() {
+        return postApiPublishingObseverList;
+    }
+
+    public void addPostApiPublishingObseverList(PostApiPublishingObsever postApiPublishingObseverList) {
+        this.postApiPublishingObseverList.add(postApiPublishingObseverList);
+    }
+
+    public void removePostApiPublishingObseverList(PostApiPublishingObsever postApiPublishingObsever) {
+        this.postApiPublishingObseverList.remove(postApiPublishingObsever);
+    }
 }

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/src/main/java/io/entgra/device/mgt/core/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java

@@ -20,6 +20,7 @@ package io.entgra.device.mgt.core.apimgt.webapp.publisher.internal;
 import io.entgra.device.mgt.core.apimgt.extension.rest.api.APIApplicationServices;
 import io.entgra.device.mgt.core.apimgt.extension.rest.api.PublisherRESTAPIServices;
 import io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.MetadataManagementService;
+import io.entgra.device.mgt.core.apimgt.webapp.publisher.PostApiPublishingObsever;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
@@ -66,6 +67,12 @@ import java.util.HashMap;
  * policy="dynamic"
  * bind="setMetaDataMgtService"
  * unbind="unsetMetaDataMgtService"
+ * @scr.reference name="postApiPublishingObsever"
+ * interface="io.entgra.device.mgt.core.apimgt.webapp.publisher.PostApiPublishingObsever"
+ * cardinality="0..n"
+ * policy="dynamic"
+ * bind="setPostApiPublishingObsever"
+ * unbind="unsetPostApiPublishingObsever"
  */
 public class APIPublisherServiceComponent {
 
@@ -176,4 +183,18 @@ public class APIPublisherServiceComponent {
         APIPublisherDataHolder.getInstance().setMetadataManagementService(null);
     }
 
+    protected void setPostApiPublishingObsever(PostApiPublishingObsever postApiPublishingObsever) {
+        if (log.isDebugEnabled()) {
+            log.debug("Setting PostApiPublishingObsever");
+        }
+        APIPublisherDataHolder.getInstance().addPostApiPublishingObseverList(postApiPublishingObsever);
+    }
+
+    protected void unsetPostApiPublishingObsever(PostApiPublishingObsever postApiPublishingObsever) {
+        if (log.isDebugEnabled()) {
+            log.debug("Unsetting PostApiPublishingObsever");
+        }
+        APIPublisherDataHolder.getInstance().removePostApiPublishingObseverList(postApiPublishingObsever);
+    }
+
 }

components/apimgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/ApplicationManagerImpl.java

@@ -857,7 +857,8 @@ public class ApplicationManagerImpl implements ApplicationManager {
                                                     ApplicationArtifact applicationArtifact, int tenantId) throws ResourceManagementException {
         ApplicationStorageManager applicationStorageManager = APIUtil.getApplicationStorageManager();
 
-        applicationReleaseDTO.setIconName(applicationArtifact.getIconName());
+        applicationReleaseDTO.setIconName(ApplicationManagementUtil.sanitizeName
+                (applicationArtifact.getIconName(), Constants.ICON_NAME));
         applicationReleaseDTO.setBannerName(applicationArtifact.getBannerName());
 
         Map<String, InputStream> screenshots = applicationArtifact.getScreenshots();
@@ -866,11 +867,14 @@ public class ApplicationManagerImpl implements ApplicationManager {
         int counter = 1;
         for (String scName : screenshotNames) {
             if (counter == 1) {
-                applicationReleaseDTO.setScreenshotName1(scName);
+                applicationReleaseDTO.setScreenshotName1(ApplicationManagementUtil.sanitizeName
+                        (scName, Constants.SCREENSHOT_NAME + counter));
             } else if (counter == 2) {
-                applicationReleaseDTO.setScreenshotName2(scName);
+                applicationReleaseDTO.setScreenshotName2(ApplicationManagementUtil.sanitizeName
+                        (scName, Constants.SCREENSHOT_NAME + counter));
             } else if (counter == 3) {
-                applicationReleaseDTO.setScreenshotName3(scName);
+                applicationReleaseDTO.setScreenshotName3(ApplicationManagementUtil.sanitizeName
+                        (scName, Constants.SCREENSHOT_NAME + counter));
             }
             counter++;
         }
@@ -898,7 +902,8 @@ public class ApplicationManagerImpl implements ApplicationManager {
             applicationStorageManager
                     .deleteAppReleaseArtifact(applicationReleaseDTO.getAppHashValue(), Constants.ICON_ARTIFACT,
                             applicationReleaseDTO.getIconName(), tenantId);
-            applicationReleaseDTO.setIconName(applicationArtifact.getIconName());
+            applicationReleaseDTO.setIconName(ApplicationManagementUtil.sanitizeName
+                    (applicationArtifact.getIconName(), Constants.ICON_NAME));
         }
         if (!StringUtils.isEmpty(applicationArtifact.getBannerName())){
             applicationStorageManager
@@ -921,17 +926,20 @@ public class ApplicationManagerImpl implements ApplicationManager {
                     applicationStorageManager
                             .deleteAppReleaseArtifact(applicationReleaseDTO.getAppHashValue(), folderPath,
                                     applicationReleaseDTO.getScreenshotName1(), tenantId);
-                    applicationReleaseDTO.setScreenshotName1(scName);
+                    applicationReleaseDTO.setScreenshotName1(ApplicationManagementUtil.sanitizeName
+                            (scName, Constants.SCREENSHOT_NAME + counter));
                 } else if (counter == 2) {
                     applicationStorageManager
                             .deleteAppReleaseArtifact(applicationReleaseDTO.getAppHashValue(), folderPath,
                                     applicationReleaseDTO.getScreenshotName2(), tenantId);
-                    applicationReleaseDTO.setScreenshotName2(scName);
+                    applicationReleaseDTO.setScreenshotName2(ApplicationManagementUtil.sanitizeName
+                            (scName, Constants.SCREENSHOT_NAME + counter));
                 } else if (counter == 3) {
                     applicationStorageManager
                             .deleteAppReleaseArtifact(applicationReleaseDTO.getAppHashValue(), folderPath,
                                     applicationReleaseDTO.getScreenshotName3(), tenantId);
-                    applicationReleaseDTO.setScreenshotName3(scName);
+                    applicationReleaseDTO.setScreenshotName3(ApplicationManagementUtil.sanitizeName
+                            (scName, Constants.SCREENSHOT_NAME + counter));
                 }
                 counter++;
             }
@@ -2428,7 +2436,8 @@ public class ApplicationManagerImpl implements ApplicationManager {
                     log.error(msg);
                     throw new BadRequestException(msg);
                 }
-                applicationDTO.setName(applicationUpdateWrapper.getName());
+                applicationDTO.setName(ApplicationManagementUtil.sanitizeName(applicationUpdateWrapper.getName(),
+                        Constants.ApplicationProperties.NAME));
             }
             if (!StringUtils.isEmpty(applicationUpdateWrapper.getSubMethod()) && !applicationDTO.getSubType()
                     .equals(applicationUpdateWrapper.getSubMethod())) {

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionCleanupTask.java

@@ -59,4 +59,5 @@ public class ScheduledAppSubscriptionCleanupTask extends RandomlyAssignedSchedul
     public String getTaskName() {
         return TASK_NAME;
     }
+
 }

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/task/ScheduledAppSubscriptionTask.java

@@ -145,4 +145,5 @@ public class ScheduledAppSubscriptionTask extends RandomlyAssignedScheduleTask {
     public String getTaskName() {
         return TASK_NAME;
     }
+
 }

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/APIUtil.java

@@ -309,7 +309,8 @@ public class APIUtil {
         if (param instanceof ApplicationWrapper){
             ApplicationWrapper applicationWrapper = (ApplicationWrapper) param;
             DeviceType deviceType = getDeviceTypeData(applicationWrapper.getDeviceType());
-            applicationDTO.setName(applicationWrapper.getName());
+            applicationDTO.setName(ApplicationManagementUtil.sanitizeName(applicationWrapper.getName(),
+                    Constants.ApplicationProperties.NAME));
             applicationDTO.setDescription(applicationWrapper.getDescription());
             applicationDTO.setAppCategories(applicationWrapper.getCategories());
             applicationDTO.setType(ApplicationType.ENTERPRISE.toString());
@@ -323,7 +324,8 @@ public class APIUtil {
             applicationDTO.setApplicationReleaseDTOs(applicationReleaseEntities);
         } else if (param instanceof WebAppWrapper){
             WebAppWrapper webAppWrapper = (WebAppWrapper) param;
-            applicationDTO.setName(webAppWrapper.getName());
+            applicationDTO.setName(ApplicationManagementUtil.sanitizeName(webAppWrapper.getName(),
+                    Constants.ApplicationProperties.NAME));
             applicationDTO.setDescription(webAppWrapper.getDescription());
             applicationDTO.setAppCategories(webAppWrapper.getCategories());
             applicationDTO.setSubType(webAppWrapper.getSubMethod());
@@ -331,13 +333,14 @@ public class APIUtil {
             applicationDTO.setType(webAppWrapper.getType());
             applicationDTO.setTags(webAppWrapper.getTags());
             applicationDTO.setUnrestrictedRoles(webAppWrapper.getUnrestrictedRoles());
-           applicationReleaseEntities = webAppWrapper.getWebAppReleaseWrappers()
+            applicationReleaseEntities = webAppWrapper.getWebAppReleaseWrappers()
                     .stream().map(APIUtil::releaseWrapperToReleaseDTO).collect(Collectors.toList());
             applicationDTO.setApplicationReleaseDTOs(applicationReleaseEntities);
         } else if (param instanceof PublicAppWrapper) {
             PublicAppWrapper publicAppWrapper = (PublicAppWrapper) param;
             DeviceType deviceType = getDeviceTypeData(publicAppWrapper.getDeviceType());
-            applicationDTO.setName(publicAppWrapper.getName());
+            applicationDTO.setName(ApplicationManagementUtil.sanitizeName(publicAppWrapper.getName(),
+                    Constants.ApplicationProperties.NAME));
             applicationDTO.setDescription(publicAppWrapper.getDescription());
             applicationDTO.setAppCategories(publicAppWrapper.getCategories());
             applicationDTO.setType(ApplicationType.PUBLIC.toString());
@@ -352,7 +355,8 @@ public class APIUtil {
         } else if (param instanceof CustomAppWrapper){
             CustomAppWrapper customAppWrapper = (CustomAppWrapper) param;
             DeviceType deviceType = getDeviceTypeData(customAppWrapper.getDeviceType());
-            applicationDTO.setName(customAppWrapper.getName());
+            applicationDTO.setName(ApplicationManagementUtil.sanitizeName(customAppWrapper.getName(),
+                    Constants.ApplicationProperties.NAME));
             applicationDTO.setDescription(customAppWrapper.getDescription());
             applicationDTO.setAppCategories(customAppWrapper.getCategories());
             applicationDTO.setType(ApplicationType.CUSTOM.toString());

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/ApplicationManagementUtil.java

@@ -535,4 +535,29 @@ public class ApplicationManagementUtil {
         packageNamesOfApps.add(adamId);
         return applicationManager.getApplications(packageNamesOfApps);
     }
+
+    /**
+     * Sanitize app names and shorten icon/screenshot file names
+     *
+     * @param originalName Original name of the file which is being uploaded
+     * @param type Type - Name/Artifact(Icon, Screenshot, etc.)
+     * @return Sanitized and shortened file name
+     */
+    public static String sanitizeName(String originalName, String type) {
+        String sanitizedName = originalName.replaceAll(Constants.APP_NAME_REGEX, "");
+        if (Constants.ApplicationProperties.NAME.equals(type) && sanitizedName.length() > Constants.MAX_APP_NAME_CHARACTERS) {
+            sanitizedName = sanitizedName.substring(0, Constants.MAX_APP_NAME_CHARACTERS);
+            return sanitizedName;
+        } else if (Constants.ICON_NAME.equals(type) || Constants.SCREENSHOT_NAME.equals(type)) {
+            // Shortening icon/screenshot names
+            String fileExtension = "";
+            int dotIndex = originalName.lastIndexOf('.');
+            if (dotIndex >= 0) {
+                fileExtension = originalName.substring(dotIndex);
+            }
+            return type + fileExtension;
+        } else {
+            return sanitizedName;
+        }
+    }
 }

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/Constants.java

@@ -214,4 +214,10 @@ public class Constants {
         public static final String ASSOCIATION_DEVICE = "ASSOCIATION_DEVICE";
         public static final String ASSOCIATION_USER = "ASSOCIATION_USER";
     }
+
+    /**
+     * App name sanitization related constants
+     */
+    public static final int MAX_APP_NAME_CHARACTERS = 350;
+    public static final String APP_NAME_REGEX = "[^a-zA-Z0-9.\\s-]";
 }

components/application-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.admin.api/pom.xml

@@ -18,13 +18,11 @@
   ~
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.common/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/cea-mgt/io.entgra.device.mgt.core.cea.mgt.enforce/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>cea-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/cea-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.organization/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/api/DeviceManagementService.java

@@ -2657,7 +2657,12 @@ public interface DeviceManagementService {
                     name = "appName",
                     value = "App name to be searched")
             @QueryParam("appName")
-                    String appName);
+                    String appName,
+            @ApiParam(
+                    name = "packageName",
+                    value = "App package name to be searched")
+            @QueryParam("packageName")
+                    String packageName);
 
     @GET
     @Path("/application/{packageName}/versions")

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -27,6 +27,7 @@ import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationMana
 import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager;
 import io.entgra.device.mgt.core.application.mgt.core.util.HelperUtil;
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.impl.util.DisenrollRequest;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.util.DeviceMgtUtil;
 import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
@@ -1564,11 +1565,13 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
             @QueryParam("offset") int offset,
             @DefaultValue("10")
             @QueryParam("limit") int limit,
-            @QueryParam("appName") String appName) {
+            @QueryParam("appName") String appName,
+            @QueryParam("packageName") String packageName) {
         PaginationRequest request = new PaginationRequest(offset, limit);
         ApplicationList applicationList = new ApplicationList();
         request.setDeviceType(deviceType);
-        request.setFilter(appName);
+        request.setFilter(DeviceMgtUtil.buildAppSearchFilter(appName, packageName));
+
         try {
             PaginationResult paginationResult = DeviceMgtAPIUtils
                     .getDeviceManagementService()

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/util/DeviceMgtUtil.java

@@ -24,7 +24,9 @@ import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.ErrorResponse;
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.ProfileFeature;
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.exception.BadRequestException;
 import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.Profile;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationFilter;
 
+import com.google.gson.Gson;
 import javax.validation.ConstraintViolation;
 import java.util.ArrayList;
 import java.util.List;
@@ -141,4 +143,12 @@ public class DeviceMgtUtil {
         errorResponse.setErrorItems(errorListItems);
         return errorResponse;
     }
+
+    public static String buildAppSearchFilter(String appName, String packageName) {
+        //Create search filter as a Json string to attach into the filter in PaginationRequest
+        ApplicationFilter applicationFilter = new ApplicationFilter();
+        applicationFilter.setAppName(appName);
+        applicationFilter.setPackageName(packageName);
+        return new Gson().toJson(applicationFilter);
+    }
 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/src/main/java/io/entgra/device/mgt/core/device/mgt/common/app/mgt/ApplicationFilter.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. 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 io.entgra.device.mgt.core.device.mgt.common.app.mgt;
+
+public class ApplicationFilter {
+    public static final class FilterProperties {
+        public static final String REGEX_WHITESPACE = ".*\\s.*";
+        public static final String REGEX_WHITESPACE_REPLACER = "\\s+";
+        public static final String URL_ENCODE_SPACE = "%20";
+    }
+
+    private String appName;
+    private String packageName;
+
+    public String getAppName() {
+        return appName;
+    }
+
+    public void setAppName(String appName) {
+        this.appName = appName;
+        if (this.appName != null && !this.appName.isEmpty() &&
+                //Check if the filter contains spaces and replace URL encode them
+                this.appName.matches(FilterProperties.REGEX_WHITESPACE)) {
+            this.appName = this.appName
+                    .replaceAll(FilterProperties.REGEX_WHITESPACE_REPLACER,
+                            FilterProperties.URL_ENCODE_SPACE);
+        }
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+}

components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -365,13 +365,6 @@
         <dependency>
             <groupId>org.wso2.orbit.javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.1.wso2v1</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.orbit.javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1.wso2v1</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/common/Constants.java

@@ -21,6 +21,7 @@ package io.entgra.device.mgt.core.device.mgt.core.common;
 public class Constants {
     public static final String SCHEME_SEPARATOR = "://";
     public static final String COLON = ":";
+    public static final String QUERY_WILDCARD = "%";
     public static final String URI_QUERY_SEPARATOR = "?";
     public static final String URI_SEPARATOR = "/";
     public static final String BASIC_AUTH_HEADER_PREFIX = "Basic ";

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/ApplicationDAOImpl.java

@@ -17,6 +17,9 @@
  */
 package io.entgra.device.mgt.core.device.mgt.core.dao.impl;
 
+import com.google.gson.Gson;
+import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationFilter;
+import io.entgra.device.mgt.core.device.mgt.core.common.Constants;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
@@ -295,12 +298,27 @@ public class ApplicationDAOImpl implements ApplicationDAO {
                     "PLATFORM = ? AND TENANT_ID = ?) ";
 
         try {
-            String filter = request.getFilter();
+            ApplicationFilter applicationFilter = new Gson().fromJson(request.getFilter(), ApplicationFilter.class);
-            if (filter != null) {
+            boolean isAppNameFilterProvided = false;
+            if (null != applicationFilter.getAppName()) {
                 sql = sql + "AND NAME LIKE ? ";
+                applicationFilter.setAppName(Constants.QUERY_WILDCARD.concat(applicationFilter.getAppName())
+                        .concat(Constants.QUERY_WILDCARD));
+                isAppNameFilterProvided = true;
             }
+
+            boolean isPackageFilterProvided = false;
+            if (null != applicationFilter.getPackageName()) {
+                sql = sql + "AND APP_IDENTIFIER LIKE ? ";
+                applicationFilter.setPackageName(Constants.QUERY_WILDCARD.concat(applicationFilter.getPackageName())
+                        .concat(Constants.QUERY_WILDCARD));
+                isPackageFilterProvided = true;
+            }
+
+            boolean isLimitPresent = false;
             if (request != null && request.getRowCount() != -1) {
                 sql = sql + "LIMIT ? OFFSET ?";
+                isLimitPresent = true;
             }
             Connection conn = this.getConnection();
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
@@ -309,10 +327,13 @@ public class ApplicationDAOImpl implements ApplicationDAO {
                 stmt.setInt(paramIdx++, tenantId);
                 stmt.setString(paramIdx++, request.getDeviceType());
                 stmt.setInt(paramIdx++, tenantId);
-                if (filter != null){
+                if (isAppNameFilterProvided){
-                    stmt.setString(paramIdx++, filter);
+                    stmt.setString(paramIdx++, applicationFilter.getAppName());
                 }
-                if (request != null && request.getRowCount() != -1) {
+                if (isPackageFilterProvided){
+                    stmt.setString(paramIdx++, applicationFilter.getPackageName());
+                }
+                if (isLimitPresent) {
                     stmt.setInt(paramIdx++, request.getRowCount());
                     stmt.setInt(paramIdx, request.getStartIndex());
                 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/operation/timeout/task/impl/OperationTimeoutTask.java

@@ -18,9 +18,6 @@
 package io.entgra.device.mgt.core.device.mgt.core.operation.timeout.task.impl;
 
 import com.google.gson.Gson;
-import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
 import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
 import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.ActivityStatus;
@@ -29,75 +26,85 @@ import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManage
 import io.entgra.device.mgt.core.device.mgt.core.config.operation.timeout.OperationTimeout;
 import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceType;
 import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder;
-import io.entgra.device.mgt.core.device.mgt.core.task.impl.DynamicPartitionedScheduleTask;
+import io.entgra.device.mgt.core.device.mgt.core.task.impl.RandomlyAssignedScheduleTask;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
-public class OperationTimeoutTask extends DynamicPartitionedScheduleTask {
+public class OperationTimeoutTask extends RandomlyAssignedScheduleTask {
 
     private static final Log log = LogFactory.getLog(OperationTimeoutTask.class);
+    public static final String OPERATION_TIMEOUT_TASK = "OPERATION_TIMEOUT_TASK";
+    private Map<String, String> properties;
+
+    @Override
+    public final void setProperties(Map<String, String> properties) {
+        this.properties = properties;
+    }
+
+    public final String getProperty(String name) {
+        if (properties == null) {
+            return null;
+        }
+        return properties.get(name);
+    }
+
     @Override
     protected void setup() {
 
     }
 
     @Override
-    protected void executeDynamicTask() {
+    public String getTaskName() {
-        if (isQualifiedToExecuteTask()) { // this task will run only in one node when the deployment has multiple nodes
+        return OPERATION_TIMEOUT_TASK;
-            String operationTimeoutTaskConfigStr = getProperty(
-                    OperationTimeoutTaskManagerServiceImpl.OPERATION_TIMEOUT_TASK_CONFIG);
-            Gson gson = new Gson();
-            OperationTimeout operationTimeoutConfig = gson.fromJson(operationTimeoutTaskConfigStr, OperationTimeout.class);
-            try {
-                long timeMillis = System.currentTimeMillis() - (long) operationTimeoutConfig.getTimeout();
-                List<String> deviceTypes = new ArrayList<>();
-                if (operationTimeoutConfig.getDeviceTypes().size() == 1 &&
-                        "ALL".equals(operationTimeoutConfig.getDeviceTypes().get(0))) {
-                    try {
-                        List<DeviceType> deviceTypeList = DeviceManagementDataHolder.getInstance()
-                                .getDeviceManagementProvider().getDeviceTypes();
-                        for (DeviceType deviceType : deviceTypeList) {
-                            deviceTypes.add(deviceType.getName());
-                        }
-                    } catch (DeviceManagementException e) {
-                        log.error("Error occurred while reading device types", e);
-                    }
-                } else {
-                    deviceTypes = operationTimeoutConfig.getDeviceTypes();
-                }
-                List<Activity> activities = DeviceManagementDataHolder.getInstance().getOperationManager()
-                        .getActivities(deviceTypes, operationTimeoutConfig.getCode(), timeMillis,
-                                operationTimeoutConfig.getInitialStatus());
-                for (Activity activity : activities) {
-                    for (ActivityStatus activityStatus : activity.getActivityStatus()) {
-                        String operationId = activity.getActivityId().replace("ACTIVITY_", "");
-                        Operation operation = DeviceManagementDataHolder.getInstance().getOperationManager()
-                                .getOperation(Integer.parseInt(operationId));
-                        operation.setStatus(Operation.Status.valueOf(operationTimeoutConfig.getNextStatus()));
-                        DeviceManagementDataHolder.getInstance().getOperationManager()
-                                .updateOperation(activityStatus.getDeviceIdentifier(), operation);
-                    }
-                }
-
-            } catch (OperationManagementException e) {
-                String msg = "Error occurred while retrieving operations.";
-                log.error(msg, e);
-            }
-        }
-
     }
 
-    private boolean isQualifiedToExecuteTask() {
+    @Override
-        if (isDynamicTaskEligible()) {
+    protected void executeRandomlyAssignedTask() {
-            try {
+        // this task will run only in one node when the deployment has multiple nodes
-                return DeviceManagementDataHolder.getInstance().getHeartBeatService().isQualifiedToExecuteTask();
+        String operationTimeoutTaskConfigStr = getProperty(
-            } catch (HeartBeatManagementException e) {
+                OperationTimeoutTaskManagerServiceImpl.OPERATION_TIMEOUT_TASK_CONFIG);
-                log.error("Error while checking is qualified to execute task", e);
+        Gson gson = new Gson();
+        OperationTimeout operationTimeoutConfig = gson.fromJson(operationTimeoutTaskConfigStr, OperationTimeout.class);
+        try {
+            long timeMillis = System.currentTimeMillis() - (long) operationTimeoutConfig.getTimeout();
+            List<String> deviceTypes = new ArrayList<>();
+            if (operationTimeoutConfig.getDeviceTypes().size() == 1 &&
+                    "ALL".equals(operationTimeoutConfig.getDeviceTypes().get(0))) {
+                try {
+                    List<DeviceType> deviceTypeList = DeviceManagementDataHolder.getInstance()
+                            .getDeviceManagementProvider().getDeviceTypes();
+                    for (DeviceType deviceType : deviceTypeList) {
+                        deviceTypes.add(deviceType.getName());
+                    }
+                } catch (DeviceManagementException e) {
+                    log.error("Error occurred while reading device types", e);
+                }
+            } else {
+                deviceTypes = operationTimeoutConfig.getDeviceTypes();
             }
-        } else {
+            List<Activity> activities = DeviceManagementDataHolder.getInstance().getOperationManager()
-            return true;
+                    .getActivities(deviceTypes, operationTimeoutConfig.getCode(), timeMillis,
+                            operationTimeoutConfig.getInitialStatus());
+            String operationId;
+            Operation operation;
+            for (Activity activity : activities) {
+                operationId = activity.getActivityId().replace("ACTIVITY_", "");
+                for (ActivityStatus activityStatus : activity.getActivityStatus()) {
+                    operation = DeviceManagementDataHolder.getInstance().getOperationManager()
+                            .getOperation(Integer.parseInt(operationId));
+                    operation.setStatus(Operation.Status.valueOf(operationTimeoutConfig.getNextStatus()));
+                    DeviceManagementDataHolder.getInstance().getOperationManager()
+                            .updateOperation(activityStatus.getDeviceIdentifier(), operation);
+                }
+            }
+        } catch (OperationManagementException e) {
+            String msg = "Error occurred while retrieving operations.";
+            log.error(msg, e);
         }
-        return false;
     }
+
 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/task/impl/ArchivalTask.java

@@ -23,16 +23,16 @@ import org.apache.commons.logging.LogFactory;
 import io.entgra.device.mgt.core.device.mgt.core.archival.ArchivalException;
 import io.entgra.device.mgt.core.device.mgt.core.archival.ArchivalService;
 import io.entgra.device.mgt.core.device.mgt.core.archival.ArchivalServiceImpl;
-import org.wso2.carbon.ntask.core.Task;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-public class ArchivalTask implements Task {
+public class ArchivalTask extends RandomlyAssignedScheduleTask {
 
     private static final Log log = LogFactory.getLog(ArchivalTask.class);
+    private static final String TASK_NAME = "DATA_ARCHIVAL_TASK";
 
     private ArchivalService archivalService;
 
@@ -42,12 +42,12 @@ public class ArchivalTask implements Task {
     }
 
     @Override
-    public void init() {
+    protected void setup() {
         this.archivalService = new ArchivalServiceImpl();
     }
 
     @Override
-    public void execute() {
+    protected void executeRandomlyAssignedTask() {
         log.info("Executing ArchivalTask at " + new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date()));
         long startTime = System.currentTimeMillis();
         try {
@@ -60,6 +60,11 @@ public class ArchivalTask implements Task {
         log.info("ArchivalTask completed. Total execution time: " + getDurationBreakdown(difference));
     }
 
+    @Override
+    public String getTaskName() {
+        return TASK_NAME;
+    }
+
     private String getDurationBreakdown(long millis) {
         if (millis < 0) {
             throw new IllegalArgumentException("Duration must be greater than zero!");
@@ -74,4 +79,5 @@ public class ArchivalTask implements Task {
 
         return (days + " Days " + hours + " Hours " + minutes + " Minutes " + seconds + " Seconds");
     }
+
 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/task/impl/ArchivedDataDeletionTask.java

@@ -29,9 +29,10 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
 
-public class ArchivedDataDeletionTask implements Task {
+public class ArchivedDataDeletionTask extends RandomlyAssignedScheduleTask {
 
-    private static Log log = LogFactory.getLog(ArchivedDataDeletionTask.class);
+    private static final Log log = LogFactory.getLog(ArchivedDataDeletionTask.class);
+    private static final String TASK_NAME = "ARCHIVED_DATA_CLEANUP_TASK";
 
     private ArchivalService archivalService;
 
@@ -41,12 +42,12 @@ public class ArchivedDataDeletionTask implements Task {
     }
 
     @Override
-    public void init() {
+    public void setup() {
         this.archivalService = new ArchivalServiceImpl();
     }
 
     @Override
-    public void execute() {
+    protected void executeRandomlyAssignedTask() {
         log.info("Executing DataDeletionTask at " + new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date()));
         long startTime = System.nanoTime();
         try {
@@ -58,4 +59,10 @@ public class ArchivedDataDeletionTask implements Task {
         long difference = (endTime - startTime) / (1000000 * 1000);
         log.info("DataDeletionTask completed. Total execution time: " + difference + " seconds");
     }
+
+    @Override
+    public String getTaskName() {
+        return TASK_NAME;
+    }
+
 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java

@@ -109,4 +109,5 @@ public class DeviceDetailsRetrieverTask extends DynamicPartitionedScheduleTask {
     protected void setup() {
 
     }
+
 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/task/impl/DynamicPartitionedScheduleTask.java

@@ -53,7 +53,7 @@ public abstract class DynamicPartitionedScheduleTask implements Task {
     public final void init() {
         try {
             boolean dynamicTaskEnabled = DeviceManagementDataHolder.getInstance().getHeartBeatService().isTaskPartitioningEnabled();
-            if(dynamicTaskEnabled){
+            if (dynamicTaskEnabled) {
                 taskContext = new DynamicTaskContext();
                 taskContext.setPartitioningEnabled(true);
             } else {
@@ -75,9 +75,9 @@ public abstract class DynamicPartitionedScheduleTask implements Task {
             String localHashIndex = getProperty(TaskMgtConstants.Task.LOCAL_HASH_INDEX);
             // These tasks are not dynamically scheduled. They are added via a config so scheduled in each node
             // during the server startup
-            if (localHashIndex == null ) {
+            if (localHashIndex == null) {
                 if (log.isDebugEnabled()) {
-                    log.debug("Executing startup scheduled task (" + getTaskName() +  ") with class: " +
+                    log.debug("Executing startup scheduled task (" + getTaskName() + ") with class: " +
                             this.getClass().getName());
                 }
                 executeDynamicTask();
@@ -116,7 +116,7 @@ public abstract class DynamicPartitionedScheduleTask implements Task {
 
     private void updateContext() throws HeartBeatManagementException {
         ServerCtxInfo ctxInfo = DeviceManagementDataHolder.getInstance().getHeartBeatService().getServerCtxInfo();
-        if(ctxInfo != null) {
+        if (ctxInfo != null) {
             populateContext(ctxInfo);
         } else {
             log.info("Dynamic Task Context not present. Tasks will run on regular worker/manager mode.");
@@ -127,10 +127,10 @@ public abstract class DynamicPartitionedScheduleTask implements Task {
         taskContext.setActiveServerCount(ctxInfo.getActiveServerCount());
         taskContext.setServerHashIndex(ctxInfo.getLocalServerHashIdx());
 
-        if(log.isDebugEnabled()){
+        if (log.isDebugEnabled()) {
             log.debug("Initiating execution of dynamic task for server : " + taskContext.getServerHashIndex() +
-                      " where active server count is : " + taskContext.getActiveServerCount() +
+                    " where active server count is : " + taskContext.getActiveServerCount() +
-                      " partitioning task enabled : " + taskContext.isPartitioningEnabled());
+                    " partitioning task enabled : " + taskContext.isPartitioningEnabled());
         }
     }
 
@@ -142,7 +142,8 @@ public abstract class DynamicPartitionedScheduleTask implements Task {
         return taskContext;
     }
 
-    public static boolean isDynamicTaskEligible(){
+    @Deprecated
+    public static boolean isDynamicTaskEligible() {
         return taskContext != null && taskContext.isPartitioningEnabled();
     }
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/task/impl/RandomlyAssignedScheduleTask.java

@@ -28,8 +28,6 @@ import org.wso2.carbon.ntask.core.Task;
 public abstract class RandomlyAssignedScheduleTask implements Task {
 
     private static final Log log = LogFactory.getLog(RandomlyAssignedScheduleTask.class);
-
-    private static String taskName = "UNSPECIFIED";
     private static boolean qualifiedToExecuteTask = false;
     private static boolean dynamicTaskEnabled = false;
 
@@ -38,32 +36,32 @@ public abstract class RandomlyAssignedScheduleTask implements Task {
         try {
             dynamicTaskEnabled = DeviceManagementDataHolder.getInstance().getHeartBeatService().isTaskPartitioningEnabled();
         } catch (HeartBeatManagementException e) {
-            log.error("Error Instantiating Variables necessary for Randomly Assigned Task Scheduling." , e);
+            log.error("Error Instantiating Variables necessary for Randomly Assigned Task Scheduling.", e);
         }
-        //This is done so that sub class extending this abstract class is forced to specify a task name.
-        taskName = getTaskName();
         setup();
     }
 
     @Override
     public final void execute() {
         refreshContext();
-        executeRandomlyAssignedTask();
+        if (isQualifiedToExecuteTask()) {
+            executeRandomlyAssignedTask();
+        }
     }
 
-    public void refreshContext(){
+    public void refreshContext() {
-        if(dynamicTaskEnabled) {
+        if (dynamicTaskEnabled) {
             try {
                 qualifiedToExecuteTask = DeviceManagementDataHolder.getInstance().getHeartBeatService().isQualifiedToExecuteTask();
-                log.info("## NODE Qualified to execute Randomly Assigned Task : " + taskName);
-                DeviceManagementDataHolder.getInstance().getHeartBeatService().updateTaskExecutionAcknowledgement(taskName);
             } catch (HeartBeatManagementException e) {
-                log.error("Error refreshing Variables necessary for Randomly Assigned Scheduled Task. " +
+                log.error("Error refreshing variables necessary for " +
-                          "Dynamic Tasks will not function.", e);
+                        "Randomly Assigned Scheduled Task: " + getTaskName(), e);
             }
         } else {
             qualifiedToExecuteTask = true;
         }
+        log.info("Node is " + (qualifiedToExecuteTask ? "" : "not")
+                + " qualified to execute Randomly Assigned Task : " + getTaskName());
     }
 
     protected abstract void setup();
@@ -75,4 +73,5 @@ public abstract class RandomlyAssignedScheduleTask implements Task {
     }
 
     public abstract String getTaskName();
+
 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>heartbeat-management</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/dao/impl/GenericHeartBeatDAOImpl.java

@@ -147,7 +147,7 @@ public class GenericHeartBeatDAOImpl implements HeartBeatDAO {
             }
         } catch (SQLException e) {
             String msg = "Error occurred while updating task list of elected server : '" +
-                         uuid + "'  and task list " + taskList;
+                         uuid + "' and task list " + taskList;
             log.error(msg, e);
             throw new HeartBeatDAOException(msg, e);
         }

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/src/main/java/io/entgra/device/mgt/core/server/bootup/heartbeat/beacon/service/HeartBeatManagementServiceImpl.java

@@ -151,7 +151,7 @@ public class HeartBeatManagementServiceImpl implements HeartBeatManagementServic
                 if (candidate != null && candidate.getServerUUID().equalsIgnoreCase(localServerUUID)) {
                     isQualified = true;
                     if (log.isDebugEnabled()) {
-                        log.debug("Node : " + localServerUUID + " Qualified to execute randomly assigned task.");
+                        log.debug("Node : " + localServerUUID + " is qualified to execute randomly assigned task.");
                     }
                 }
             } catch (HeartBeatDAOException e) {

components/heartbeat-management/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>logger</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
     </parent>
 
     <artifactId>io.entgra.device.mgt.core.notification.logger</artifactId>

components/logger/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>operation-template-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/operation-template-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/enforcement/DelegationTask.java

@@ -64,7 +64,7 @@ public class DelegationTask extends DynamicPartitionedScheduleTask {
                     try {
                         devices = new ArrayList<>();
                         toBeNotified = new ArrayList<>();
-                        if (isDynamicTaskEligible()) {
+                        if(getTaskContext() != null && getTaskContext().isPartitioningEnabled()){
                             devices.addAll(service.getAllocatedDevices(deviceType,
                                                                        getTaskContext().getActiveServerCount(),
                                                                        getTaskContext().getServerHashIndex()));

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/src/main/java/io/entgra/device/mgt/core/policy/mgt/core/task/MonitoringTask.java

@@ -105,7 +105,7 @@ public class MonitoringTask extends DynamicPartitionedScheduleTask {
                             PolicyManagementDataHolder.getInstance().getDeviceManagementService()
                                     .getPolicyMonitoringManager(deviceType);
                     List<Device> devices;
-                    if(isDynamicTaskEligible()){
+                    if (getTaskContext() != null && getTaskContext().isPartitioningEnabled()) {
                         devices = deviceManagementProviderService
                                 .getAllocatedDevices(deviceType, getTaskContext().getActiveServerCount(),
                                         getTaskContext().getServerHashIndex());

components/policy-mgt/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>subtype-mgt</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/subtype-mgt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/task-mgt/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>task-manager</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/constant/TaskMgtConstants.java

@@ -49,5 +49,6 @@ public class TaskMgtConstants {
         public static final String TENANT_ID_PROP = "__TENANT_ID_PROP__";
         public static final String LOCAL_HASH_INDEX = "__LOCAL_HASH_INDEX__";
         public static final String LOCAL_TASK_NAME = "__LOCAL_TASK_NAME__";
+        public static final String DYNAMIC_TASK_ID = "__DYNAMIC_TASK_ID__";
     }
 }

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/src/main/java/io/entgra/device/mgt/core/task/mgt/common/spi/TaskManagementService.java

@@ -22,6 +22,7 @@ import io.entgra.device.mgt.core.task.mgt.common.exception.TaskNotFoundException
 import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException;
 
 import java.util.List;
+import java.util.Map;
 
 public interface TaskManagementService {
 
@@ -37,7 +38,9 @@ public interface TaskManagementService {
 
     List<DynamicTask> getAllDynamicTasks() throws TaskManagementException;
 
-    DynamicTask getDynamicTaskById(int dynamicTaskId) throws TaskManagementException;
+    Map<Integer, List<DynamicTask>> getDynamicTasksForAllTenants() throws TaskManagementException;
+
+    DynamicTask getDynamicTask(int dynamicTaskId) throws TaskManagementException;
 
     List<DynamicTask> getActiveDynamicTasks() throws TaskManagementException;
 }

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-manager</artifactId>
-        <version>5.0.40-SNAPSHOT</version>
+        <version>5.0.41-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskDAO.java

@@ -27,16 +27,18 @@ import java.util.List;
  */
 public interface DynamicTaskDAO {
 
-    int addTask(DynamicTask dynamicTask) throws TaskManagementDAOException;
+    int addTask(DynamicTask dynamicTask, int tenantId) throws TaskManagementDAOException;
 
-    boolean updateDynamicTask(DynamicTask dynamicTask) throws TaskManagementDAOException;
+    boolean updateDynamicTask(DynamicTask dynamicTask, int tenantId) throws TaskManagementDAOException;
 
-    void deleteDynamicTask(int dynamicTaskId) throws TaskManagementDAOException;
+    void deleteDynamicTask(int dynamicTaskId, int tenantId) throws TaskManagementDAOException;
 
-    DynamicTask getDynamicTaskById(int dynamicTaskId) throws TaskManagementDAOException;
+    DynamicTask getDynamicTask(int dynamicTaskId, int tenantId) throws TaskManagementDAOException;
 
     List<DynamicTask> getAllDynamicTasks() throws TaskManagementDAOException;
 
-    List<DynamicTask> getActiveDynamicTasks() throws TaskManagementDAOException;
+    List<DynamicTask> getAllDynamicTasks(int tenantId) throws TaskManagementDAOException;
+
+    List<DynamicTask> getActiveDynamicTasks(int tenantId) throws TaskManagementDAOException;
 
 }

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/DynamicTaskPropDAO.java

@@ -26,10 +26,11 @@ import java.util.Map;
  */
 public interface DynamicTaskPropDAO {
 
-    void addTaskProperties(int dynamicTaskId, Map<String, String> properties) throws TaskManagementDAOException;
+    void addTaskProperties(int dynamicTaskId, Map<String, String> properties, int tenantId)
+            throws TaskManagementDAOException;
 
-    Map<String, String> getDynamicTaskProps(int dynamicTaskId) throws TaskManagementDAOException;
+    Map<String, String> getDynamicTaskProps(int dynamicTaskId, int tenantId) throws TaskManagementDAOException;
 
-    void updateDynamicTaskProps(int dynamicTaskId, Map<String, String> properties)
+    void updateDynamicTaskProps(int dynamicTaskId, Map<String, String> properties, int tenantId)
             throws TaskManagementDAOException;
 }

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/common/TaskManagementDAOFactory.java

@@ -103,18 +103,22 @@ public class TaskManagementDAOFactory {
             conn.setAutoCommit(false);
             currentConnection.set(conn);
         } catch (SQLException e) {
-            throw new TransactionManagementException("Error occurred while retrieving config.datasource connection", e);
+            throw new TransactionManagementException("Error occurred while retrieving datasource connection", e);
         }
     }
 
-    public static void openConnection() throws SQLException {
+    public static void openConnection() throws TransactionManagementException {
         Connection conn = currentConnection.get();
         if (conn != null) {
             throw new IllegalTransactionStateException("A transaction is already active within the context of " +
                     "this particular thread. Therefore, calling 'beginTransaction/openConnection' while another " +
                     "transaction is already active is a sign of improper transaction handling");
         }
-        conn = dataSource.getConnection();
+        try {
+            conn = dataSource.getConnection();
+        } catch (SQLException e) {
+            throw new TransactionManagementException("Error occurred while retrieving datasource connection", e);
+        }
         currentConnection.set(conn);
     }
 

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskDAOImpl.java

@@ -17,16 +17,19 @@
  */
 package io.entgra.device.mgt.core.task.mgt.core.dao.impl;
 
-import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory;
-import io.entgra.device.mgt.core.task.mgt.core.dao.util.TaskManagementDAOUtil;
 import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
 import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementDAOException;
 import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskDAO;
+import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory;
+import io.entgra.device.mgt.core.task.mgt.core.dao.util.TaskManagementDAOUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.List;
 
 
@@ -34,9 +37,9 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
     private static final Log log = LogFactory.getLog(DynamicTaskDAOImpl.class);
 
     @Override
-    public int addTask(DynamicTask dynamicTask) throws TaskManagementDAOException {
+    public int addTask(DynamicTask dynamicTask, int tenantId) throws TaskManagementDAOException {
         PreparedStatement stmt = null;
-        ResultSet rs = null;
+        ResultSet rs;
         int taskId = -1;
         try {
             Connection conn = TaskManagementDAOFactory.getConnection();
@@ -48,13 +51,14 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
             stmt.setString(2, dynamicTask.getName());
             stmt.setBoolean(3, dynamicTask.isEnabled());
             stmt.setString(4, dynamicTask.getTaskClassName());
-            stmt.setInt(5, PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
+            stmt.setInt(5, tenantId);
             stmt.executeUpdate();
 
             rs = stmt.getGeneratedKeys();
             if (rs.next()) {
                 taskId = rs.getInt(1);
             }
+            dynamicTask.setDynamicTaskId(taskId);
             return taskId;
         } catch (SQLException e) {
             String msg = "Error occurred while inserting task '" + dynamicTask.getName() + "'";
@@ -66,16 +70,17 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
     }
 
     @Override
-    public boolean updateDynamicTask(DynamicTask dynamicTask) throws TaskManagementDAOException {
+    public boolean updateDynamicTask(DynamicTask dynamicTask, int tenantId) throws TaskManagementDAOException {
         PreparedStatement stmt = null;
         int rows;
         try {
             Connection conn = TaskManagementDAOFactory.getConnection();
-            String sql = "UPDATE DYNAMIC_TASK SET CRON = ?,IS_ENABLED = ? WHERE DYNAMIC_TASK_ID = ?";
+            String sql = "UPDATE DYNAMIC_TASK SET CRON = ?,IS_ENABLED = ? WHERE DYNAMIC_TASK_ID = ? AND TENANT_ID = ?";
             stmt = conn.prepareStatement(sql);
             stmt.setString(1, dynamicTask.getCronExpression());
             stmt.setBoolean(2, dynamicTask.isEnabled());
             stmt.setInt(3, dynamicTask.getDynamicTaskId());
+            stmt.setInt(4, tenantId);
             rows = stmt.executeUpdate();
             return (rows > 0);
         } catch (SQLException e) {
@@ -87,9 +92,8 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
         }
     }
 
-
     @Override
-    public void deleteDynamicTask(int dynamicTaskId) throws TaskManagementDAOException {
+    public void deleteDynamicTask(int dynamicTaskId, int tenantId) throws TaskManagementDAOException {
         if (log.isDebugEnabled()) {
             log.debug("Request received in DAO Layer to delete dynamic task with the id: " + dynamicTaskId);
         }
@@ -98,7 +102,7 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
             Connection conn = TaskManagementDAOFactory.getConnection();
             try (PreparedStatement stmt = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
                 stmt.setInt(1, dynamicTaskId);
-                stmt.setInt(2, PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
+                stmt.setInt(2, tenantId);
                 stmt.executeUpdate();
             }
         } catch (SQLException e) {
@@ -110,7 +114,7 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
     }
 
     @Override
-    public DynamicTask getDynamicTaskById(int dynamicTaskId) throws TaskManagementDAOException {
+    public DynamicTask getDynamicTask(int dynamicTaskId, int tenantId) throws TaskManagementDAOException {
         DynamicTask dynamicTask = null;
         try {
             Connection conn = TaskManagementDAOFactory.getConnection();
@@ -118,7 +122,7 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
 
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                 stmt.setInt(1, dynamicTaskId);
-                stmt.setInt(2, PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
+                stmt.setInt(2, tenantId);
                 try (ResultSet rs = stmt.executeQuery()) {
                     if (rs.next()) {
                         dynamicTask = TaskManagementDAOUtil.loadDynamicTask(rs);
@@ -155,13 +159,14 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
     }
 
     @Override
-    public List<DynamicTask> getActiveDynamicTasks() throws TaskManagementDAOException {
+    public List<DynamicTask> getAllDynamicTasks(int tenantId) throws TaskManagementDAOException {
-        List<DynamicTask> dynamicTasks = null;
+        List<DynamicTask> dynamicTasks;
         try {
             Connection conn = TaskManagementDAOFactory.getConnection();
-            String sql = "SELECT * FROM DYNAMIC_TASK WHERE IS_ENABLED = 'true' ";
+            String sql = "SELECT * FROM DYNAMIC_TASK WHERE TENANT_ID = ?";
 
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+                stmt.setInt(1, tenantId);
                 try (ResultSet rs = stmt.executeQuery()) {
                     dynamicTasks = TaskManagementDAOUtil.loadDynamicTasks(rs);
                 }
@@ -173,4 +178,26 @@ public class DynamicTaskDAOImpl implements DynamicTaskDAO {
         }
         return dynamicTasks;
     }
+
+    @Override
+    public List<DynamicTask> getActiveDynamicTasks(int tenantId) throws TaskManagementDAOException {
+        List<DynamicTask> dynamicTasks;
+        try {
+            Connection conn = TaskManagementDAOFactory.getConnection();
+            String sql = "SELECT * FROM DYNAMIC_TASK WHERE IS_ENABLED = 'true' AND TENANT_ID = ?";
+
+            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+                stmt.setInt(1, tenantId);
+                try (ResultSet rs = stmt.executeQuery()) {
+                    dynamicTasks = TaskManagementDAOUtil.loadDynamicTasks(rs);
+                }
+            }
+        } catch (SQLException e) {
+            String msg = "Error occurred while getting all dynamic task data ";
+            log.error(msg, e);
+            throw new TaskManagementDAOException(msg, e);
+        }
+        return dynamicTasks;
+    }
+
 }

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/dao/impl/DynamicTaskPropDAOImpl.java

@@ -38,9 +38,9 @@ public class DynamicTaskPropDAOImpl implements DynamicTaskPropDAO {
     private static final Log log = LogFactory.getLog(DynamicTaskPropDAOImpl.class);
 
     @Override
-    public void addTaskProperties(int taskId, Map<String, String> properties)
+    public void addTaskProperties(int taskId, Map<String, String> properties, int tenantId)
             throws TaskManagementDAOException {
-        Connection conn = null;
+        Connection conn;
         PreparedStatement stmt = null;
         try {
             conn = TaskManagementDAOFactory.getConnection();
@@ -51,7 +51,7 @@ public class DynamicTaskPropDAOImpl implements DynamicTaskPropDAO {
                 stmt.setInt(1, taskId);
                 stmt.setString(2, propertyKey);
                 stmt.setString(3, properties.get(propertyKey));
-                stmt.setInt(4, PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
+                stmt.setInt(4, tenantId);
                 stmt.addBatch();
             }
             stmt.executeBatch();
@@ -64,17 +64,17 @@ public class DynamicTaskPropDAOImpl implements DynamicTaskPropDAO {
         }
     }
 
-
+    public Map<String, String> getDynamicTaskProps(int dynamicTaskId, int tenantId) throws TaskManagementDAOException {
-    public Map<String, String> getDynamicTaskProps(int dynamicTaskId) throws TaskManagementDAOException {
+        Connection conn;
-        Connection conn = null;
         PreparedStatement stmt = null;
         ResultSet resultSet = null;
         Map<String, String> properties;
         try {
             conn = TaskManagementDAOFactory.getConnection();
             stmt = conn.prepareStatement(
-                    "SELECT * FROM DYNAMIC_TASK_PROPERTIES WHERE DYNAMIC_TASK_ID = ?");
+                    "SELECT * FROM DYNAMIC_TASK_PROPERTIES WHERE DYNAMIC_TASK_ID = ? AND TENANT_ID = ?");
             stmt.setInt(1, dynamicTaskId);
+            stmt.setInt(2, tenantId);
             resultSet = stmt.executeQuery();
             properties = new HashMap<>();
             while (resultSet.next()) {
@@ -92,7 +92,7 @@ public class DynamicTaskPropDAOImpl implements DynamicTaskPropDAO {
     }
 
     @Override
-    public void updateDynamicTaskProps(int dynamicTaskId, Map<String, String> properties)
+    public void updateDynamicTaskProps(int dynamicTaskId, Map<String, String> properties, int tenantId)
             throws TaskManagementDAOException {
         if (properties.isEmpty()) {
             if (log.isDebugEnabled()) {
@@ -105,12 +105,13 @@ public class DynamicTaskPropDAOImpl implements DynamicTaskPropDAO {
         try {
             conn = TaskManagementDAOFactory.getConnection();
             stmt = conn.prepareStatement("UPDATE DYNAMIC_TASK_PROPERTIES SET PROPERTY_VALUE = ? " +
-                    "WHERE DYNAMIC_TASK_ID = ? AND PROPERTY_NAME = ?");
+                    "WHERE DYNAMIC_TASK_ID = ? AND PROPERTY_NAME = ? AND TENANT_ID = ?");
 
             for (Map.Entry<String, String> entry : properties.entrySet()) {
                 stmt.setString(1, entry.getValue());
                 stmt.setInt(2, dynamicTaskId);
                 stmt.setString(3, entry.getKey());
+                stmt.setInt(4, tenantId);
                 stmt.addBatch();
             }
             stmt.executeBatch();
@@ -121,4 +122,5 @@ public class DynamicTaskPropDAOImpl implements DynamicTaskPropDAO {
             TaskManagementDAOUtil.cleanupResources(stmt, null);
         }
     }
+
 }

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/service/TaskManagementServiceImpl.java

@@ -17,10 +17,6 @@
  */
 package io.entgra.device.mgt.core.task.mgt.core.service;
 
-import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO;
-import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory;
-import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder;
-import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil;
 import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
 import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
 import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
@@ -30,14 +26,21 @@ import io.entgra.device.mgt.core.task.mgt.common.exception.TaskNotFoundException
 import io.entgra.device.mgt.core.task.mgt.common.exception.TransactionManagementException;
 import io.entgra.device.mgt.core.task.mgt.common.spi.TaskManagementService;
 import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskDAO;
+import io.entgra.device.mgt.core.task.mgt.core.dao.DynamicTaskPropDAO;
+import io.entgra.device.mgt.core.task.mgt.core.dao.common.TaskManagementDAOFactory;
+import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder;
+import io.entgra.device.mgt.core.task.mgt.core.util.TaskManagementUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.ntask.common.TaskException;
 import org.wso2.carbon.ntask.core.TaskInfo;
 import org.wso2.carbon.ntask.core.TaskManager;
 import org.wso2.carbon.ntask.core.service.TaskService;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -78,42 +81,43 @@ public class TaskManagementServiceImpl implements TaskManagementService {
 
     @Override
     public void createTask(DynamicTask dynamicTask) throws TaskManagementException {
-        String taskId;
+        String nTaskName;
+        int dynamicTaskId;
+        int serverHashIdx;
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             // add into the dynamic task tables
             TaskManagementDAOFactory.beginTransaction();
-            int dynamicTaskId = dynamicTaskDAO.addTask(dynamicTask);
+            dynamicTaskId = dynamicTaskDAO.addTask(dynamicTask, tenantId);
-
+            dynamicTaskPropDAO.addTaskProperties(dynamicTaskId, dynamicTask.getProperties(), tenantId);
-            Map<String, String> taskProperties = dynamicTask.getProperties();
-            dynamicTaskPropDAO.addTaskProperties(dynamicTaskId, taskProperties);
-
-            // add into the ntask core
-            taskId = TaskManagementUtil.generateTaskId(dynamicTaskId);
 
             try {
-                int serverHashIdx = TaskManagerDataHolder.getInstance().getHeartBeatService()
+                serverHashIdx = TaskManagerDataHolder.getInstance().getHeartBeatService()
                         .getServerCtxInfo().getLocalServerHashIdx();
-                taskProperties.put(TaskMgtConstants.Task.LOCAL_HASH_INDEX, String.valueOf(serverHashIdx));
+                nTaskName = TaskManagementUtil.generateNTaskName(dynamicTaskId, serverHashIdx);
-                taskProperties.put(TaskMgtConstants.Task.LOCAL_TASK_NAME, taskId);
             } catch (HeartBeatManagementException e) {
                 String msg = "Unexpected exception when getting server hash index.";
                 log.error(msg, e);
                 throw new TaskManagementException(msg, e);
             }
 
-            if (!isTaskExists(taskId)) {
+            if (isTaskExists(nTaskName)) {
-                TaskInfo.TriggerInfo triggerInfo = new TaskInfo.TriggerInfo();
+                String msg = "Task '" + nTaskName + "' is already exists in the ntask core. "
-                triggerInfo.setCronExpression(dynamicTask.getCronExpression());
+                        + "Hence removing existing task from nTask before adding new one.";
-                TaskInfo taskInfo = new TaskInfo(taskId, dynamicTask.getTaskClassName(), taskProperties, triggerInfo);
+                log.warn(msg);
-                taskManager.registerTask(taskInfo);
+                taskManager.deleteTask(nTaskName);
-                taskManager.scheduleTask(taskId);
+            }
-                if (!dynamicTask.isEnabled()) {
+
-                    taskManager.pauseTask(taskId);
+            // add into the ntask core
-                }
+            Map<String, String> taskProperties = TaskManagementUtil
-            } else {
+                    .populateNTaskProperties(dynamicTask, nTaskName, serverHashIdx);
-                String msg = "Task '" + taskId + "' is already exists in the ntask core "
+            TaskInfo.TriggerInfo triggerInfo = new TaskInfo.TriggerInfo();
-                        + "Hence not creating another task for the same name.";
+            triggerInfo.setCronExpression(dynamicTask.getCronExpression());
-                log.error(msg);
+            TaskInfo taskInfo = new TaskInfo(nTaskName, dynamicTask.getTaskClassName(), taskProperties, triggerInfo);
+            taskManager.registerTask(taskInfo);
+            taskManager.scheduleTask(nTaskName);
+            if (!dynamicTask.isEnabled()) {
+                taskManager.pauseTask(nTaskName);
             }
 
             TaskManagementDAOFactory.commitTransaction();
@@ -137,19 +141,20 @@ public class TaskManagementServiceImpl implements TaskManagementService {
     }
 
     @Override
-    public void updateTask(int dynamicTaskId, DynamicTask dynamicTask) throws TaskManagementException
+    public void updateTask(int dynamicTaskId, DynamicTask dynamicTask)
-            , TaskNotFoundException {
+            throws TaskManagementException, TaskNotFoundException {
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             //Update dynamic task table
             TaskManagementDAOFactory.beginTransaction();
-            DynamicTask existingTask = dynamicTaskDAO.getDynamicTaskById(dynamicTaskId);
+            DynamicTask existingTask = dynamicTaskDAO.getDynamicTask(dynamicTaskId, tenantId);
 
             if (existingTask != null) {
                 existingTask.setEnabled(dynamicTask.isEnabled());
                 existingTask.setCronExpression(dynamicTask.getCronExpression());
-                dynamicTaskDAO.updateDynamicTask(existingTask);
+                dynamicTaskDAO.updateDynamicTask(existingTask, tenantId);
                 if (!dynamicTask.getProperties().isEmpty()) {
-                    dynamicTaskPropDAO.updateDynamicTaskProps(dynamicTaskId, dynamicTask.getProperties());
+                    dynamicTaskPropDAO.updateDynamicTaskProps(dynamicTaskId, dynamicTask.getProperties(), tenantId);
                 }
             } else {
                 String msg = "Task '" + dynamicTaskId + "' is not exists in the dynamic task table.";
@@ -158,12 +163,14 @@ public class TaskManagementServiceImpl implements TaskManagementService {
             }
 
             // Update task in the ntask core
-            String taskId = TaskManagementUtil.generateTaskId(existingTask.getDynamicTaskId());
+            String nTaskName = TaskManagementUtil.generateNTaskName(existingTask.getDynamicTaskId());
-            if (isTaskExists(taskId)) {
+            if (isTaskExists(nTaskName)) {
-                TaskInfo taskInfo = taskManager.getTask(taskId);
+                TaskInfo taskInfo = taskManager.getTask(nTaskName);
-                if (!dynamicTask.getProperties().isEmpty()) {
+
-                    taskInfo.setProperties(dynamicTask.getProperties());
+                Map<String, String> taskProperties = TaskManagementUtil
-                }
+                        .populateNTaskProperties(dynamicTask, nTaskName);
+                taskInfo.setProperties(taskProperties);
+
                 TaskInfo.TriggerInfo triggerInfo;
                 if (taskInfo.getTriggerInfo() == null) {
                     triggerInfo = new TaskInfo.TriggerInfo();
@@ -173,9 +180,9 @@ public class TaskManagementServiceImpl implements TaskManagementService {
                 triggerInfo.setCronExpression(dynamicTask.getCronExpression());
                 taskInfo.setTriggerInfo(triggerInfo);
                 taskManager.registerTask(taskInfo);
-                taskManager.rescheduleTask(taskId);
+                taskManager.rescheduleTask(nTaskName);
             } else {
-                String msg = "Task '" + taskId + "' is not exists in the n task core "
+                String msg = "Task '" + nTaskName + "' is not exists in the n task core "
                         + "Hence cannot update the task.";
                 log.error(msg);
             }
@@ -200,16 +207,17 @@ public class TaskManagementServiceImpl implements TaskManagementService {
     }
 
     @Override
-    public void toggleTask(int dynamicTaskId, boolean isEnabled) throws TaskManagementException
+    public void toggleTask(int dynamicTaskId, boolean isEnabled)
-            , TaskNotFoundException {
+            throws TaskManagementException, TaskNotFoundException {
 
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             //update dynamic task table
             TaskManagementDAOFactory.beginTransaction();
-            DynamicTask existingTask = dynamicTaskDAO.getDynamicTaskById(dynamicTaskId);
+            DynamicTask existingTask = dynamicTaskDAO.getDynamicTask(dynamicTaskId, tenantId);
             if (existingTask != null) {
                 existingTask.setEnabled(isEnabled);
-                dynamicTaskDAO.updateDynamicTask(existingTask);
+                dynamicTaskDAO.updateDynamicTask(existingTask, tenantId);
             } else {
                 String msg = "Task '" + dynamicTaskId + "' is not exists.";
                 log.error(msg);
@@ -217,15 +225,15 @@ public class TaskManagementServiceImpl implements TaskManagementService {
             }
 
             // Update task in the ntask core
-            String taskId = TaskManagementUtil.generateTaskId(existingTask.getDynamicTaskId());
+            String taskName = TaskManagementUtil.generateNTaskName(existingTask.getDynamicTaskId());
-            if (isTaskExists(taskId)) {
+            if (isTaskExists(taskName)) {
                 if (isEnabled) {
-                    taskManager.resumeTask(taskId);
+                    taskManager.resumeTask(taskName);
                 } else {
-                    taskManager.pauseTask(taskId);
+                    taskManager.pauseTask(taskName);
                 }
             } else {
-                String msg = "Task '" + taskId + "' is not exists in the ntask core "
+                String msg = "Task '" + taskName + "' is not exists in the ntask core "
                         + "Hence cannot toggle the task in the ntask.";
                 log.error(msg);
             }
@@ -251,22 +259,23 @@ public class TaskManagementServiceImpl implements TaskManagementService {
     @Override
     public void deleteTask(int dynamicTaskId) throws TaskManagementException, TaskNotFoundException {
         // delete task from dynamic task table
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         try {
             TaskManagementDAOFactory.beginTransaction();
-            DynamicTask existingTask = dynamicTaskDAO.getDynamicTaskById(dynamicTaskId);
+            DynamicTask existingTask = dynamicTaskDAO.getDynamicTask(dynamicTaskId, tenantId);
             if (existingTask != null) {
-                dynamicTaskDAO.deleteDynamicTask(dynamicTaskId);
+                dynamicTaskDAO.deleteDynamicTask(dynamicTaskId, tenantId);
             } else {
                 String msg = "Task '" + dynamicTaskId + "' is not exists.";
                 log.error(msg);
                 throw new TaskNotFoundException(msg);
             }
 
-            String taskId = TaskManagementUtil.generateTaskId(existingTask.getDynamicTaskId());
+            String taskName = TaskManagementUtil.generateNTaskName(existingTask.getDynamicTaskId());
-            if (isTaskExists(taskId)) {
+            if (isTaskExists(taskName)) {
-                taskManager.deleteTask(taskId);
+                taskManager.deleteTask(taskName);
             } else {
-                String msg = "Task '" + taskId + "' is not exists in the ntask core "
+                String msg = "Task '" + taskName + "' is not exists in the ntask core "
                         + "Hence cannot delete from the ntask core.";
                 log.error(msg);
             }
@@ -292,22 +301,21 @@ public class TaskManagementServiceImpl implements TaskManagementService {
 
     @Override
     public List<DynamicTask> getAllDynamicTasks() throws TaskManagementException {
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         List<DynamicTask> dynamicTasks;
         try {
-            if (log.isDebugEnabled()) {
+            if (log.isTraceEnabled()) {
-                log.debug("Fetching the details of all dynamic tasks");
+                log.trace("Fetching the details of all dynamic tasks");
             }
-            TaskManagementDAOFactory.beginTransaction();
+            TaskManagementDAOFactory.openConnection();
-            dynamicTasks = dynamicTaskDAO.getAllDynamicTasks();
+            dynamicTasks = dynamicTaskDAO.getAllDynamicTasks(tenantId);
             if (dynamicTasks != null) {
                 for (DynamicTask dynamicTask : dynamicTasks) {
                     dynamicTask.setProperties(dynamicTaskPropDAO
-                            .getDynamicTaskProps(dynamicTask.getDynamicTaskId()));
+                            .getDynamicTaskProps(dynamicTask.getDynamicTaskId(), tenantId));
                 }
             }
-            TaskManagementDAOFactory.commitTransaction();
         } catch (TaskManagementDAOException e) {
-            TaskManagementDAOFactory.rollbackTransaction();
             String msg = "Error occurred while fetching all dynamic tasks";
             log.error(msg, e);
             throw new TaskManagementException(msg, e);
@@ -322,20 +330,62 @@ public class TaskManagementServiceImpl implements TaskManagementService {
     }
 
     @Override
-    public DynamicTask getDynamicTaskById(int dynamicTaskId) throws TaskManagementException {
+    public Map<Integer, List<DynamicTask>> getDynamicTasksForAllTenants() throws TaskManagementException {
+        List<DynamicTask> dynamicTasks;
+        try {
+            if (log.isTraceEnabled()) {
+                log.trace("Fetching the details of dynamic tasks for all tenants");
+            }
+            TaskManagementDAOFactory.openConnection();
+            dynamicTasks = dynamicTaskDAO.getAllDynamicTasks();
+            if (dynamicTasks != null) {
+                for (DynamicTask dynamicTask : dynamicTasks) {
+                    dynamicTask.setProperties(dynamicTaskPropDAO
+                            .getDynamicTaskProps(dynamicTask.getDynamicTaskId(), dynamicTask.getTenantId()));
+                }
+            }
+        } catch (TaskManagementDAOException e) {
+            String msg = "Error occurred while fetching all dynamic tasks";
+            log.error(msg, e);
+            throw new TaskManagementException(msg, e);
+        } catch (TransactionManagementException e) {
+            String msg = "Failed to start/open transaction to get all dynamic tasks";
+            log.error(msg, e);
+            throw new TaskManagementException(msg, e);
+        } finally {
+            TaskManagementDAOFactory.closeConnection();
+        }
+        Map<Integer, List<DynamicTask>> tenantedDynamicTasks = new HashMap<>();
+        List<DynamicTask> dts;
+        if (dynamicTasks != null) {
+            for (DynamicTask dt : dynamicTasks) {
+                if (tenantedDynamicTasks.containsKey(dt.getTenantId())) {
+                    dts = tenantedDynamicTasks.get(dt.getTenantId());
+                } else {
+                    dts = new ArrayList<>();
+                }
+                dts.add(dt);
+                tenantedDynamicTasks.put(dt.getTenantId(), dts);
+            }
+        }
+        return tenantedDynamicTasks;
+    }
+
+    @Override
+    public DynamicTask getDynamicTask(int dynamicTaskId) throws TaskManagementException {
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         DynamicTask dynamicTask;
         try {
             if (log.isDebugEnabled()) {
                 log.debug("Fetching the details of dynamic task '" + dynamicTaskId + "'");
             }
-            TaskManagementDAOFactory.beginTransaction();
+            TaskManagementDAOFactory.openConnection();
-            dynamicTask = dynamicTaskDAO.getDynamicTaskById(dynamicTaskId);
+            dynamicTask = dynamicTaskDAO.getDynamicTask(dynamicTaskId, tenantId);
             if (dynamicTask != null) {
-                dynamicTask.setProperties(dynamicTaskPropDAO.getDynamicTaskProps(dynamicTask.getDynamicTaskId()));
+                dynamicTask.setProperties(dynamicTaskPropDAO.getDynamicTaskProps(dynamicTask.getDynamicTaskId(),
+                        tenantId));
             }
-            TaskManagementDAOFactory.commitTransaction();
         } catch (TaskManagementDAOException e) {
-            TaskManagementDAOFactory.rollbackTransaction();
             String msg = "Error occurred while fetching dynamic task '" + dynamicTaskId + "'";
             log.error(msg, e);
             throw new TaskManagementException(msg, e);
@@ -351,21 +401,21 @@ public class TaskManagementServiceImpl implements TaskManagementService {
 
     @Override
     public List<DynamicTask> getActiveDynamicTasks() throws TaskManagementException {
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         List<DynamicTask> dynamicTasks;
         try {
             if (log.isDebugEnabled()) {
                 log.debug("Fetching the details of all active dynamic tasks");
             }
-            TaskManagementDAOFactory.beginTransaction();
+            TaskManagementDAOFactory.openConnection();
-            dynamicTasks = dynamicTaskDAO.getActiveDynamicTasks();
+            dynamicTasks = dynamicTaskDAO.getActiveDynamicTasks(tenantId);
             if (dynamicTasks != null) {
                 for (DynamicTask dynamicTask : dynamicTasks) {
-                    dynamicTask.setProperties(dynamicTaskPropDAO.getDynamicTaskProps(dynamicTask.getDynamicTaskId()));
+                    dynamicTask.setProperties(dynamicTaskPropDAO.getDynamicTaskProps(dynamicTask.getDynamicTaskId(),
+                            tenantId));
                 }
             }
-            TaskManagementDAOFactory.commitTransaction();
         } catch (TaskManagementDAOException e) {
-            TaskManagementDAOFactory.rollbackTransaction();
             String msg = "Error occurred while fetching all active dynamic tasks";
             log.error(msg, e);
             throw new TaskManagementException(msg, e);
@@ -380,18 +430,19 @@ public class TaskManagementServiceImpl implements TaskManagementService {
     }
 
     // check whether task exist in the ntask core
-    private boolean isTaskExists(String taskId) throws TaskManagementException, TaskException {
+    private boolean isTaskExists(String taskName) throws TaskManagementException, TaskException {
-        if (StringUtils.isEmpty(taskId)) {
+        if (StringUtils.isEmpty(taskName)) {
-            String msg = "Task ID must not be null or empty.";
+            String msg = "Task Name must not be null or empty.";
             log.error(msg);
             throw new TaskManagementException(msg);
         }
         List<TaskInfo> tasks = taskManager.getAllTasks();
         for (TaskInfo t : tasks) {
-            if (taskId.equals(t.getName())) {
+            if (taskName.equals(t.getName())) {
                 return true;
             }
         }
         return false;
     }
+
 }

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/src/main/java/io/entgra/device/mgt/core/task/mgt/core/util/TaskManagementUtil.java

@@ -17,20 +17,21 @@
  */
 package io.entgra.device.mgt.core.task.mgt.core.util;
 
-import com.google.gson.Gson;
 import io.entgra.device.mgt.core.server.bootup.heartbeat.beacon.exception.HeartBeatManagementException;
+import io.entgra.device.mgt.core.task.mgt.common.bean.DynamicTask;
 import io.entgra.device.mgt.core.task.mgt.common.constant.TaskMgtConstants;
 import io.entgra.device.mgt.core.task.mgt.common.exception.TaskManagementException;
 import io.entgra.device.mgt.core.task.mgt.core.internal.TaskManagerDataHolder;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.io.File;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -55,11 +56,11 @@ public class TaskManagementUtil {
         }
     }
 
-    public static String generateTaskId(int dynamicTaskId) throws TaskManagementException {
+    public static String generateNTaskName(int dynamicTaskId) throws TaskManagementException {
         try {
             int serverHashIdx = TaskManagerDataHolder.getInstance().getHeartBeatService()
                     .getServerCtxInfo().getLocalServerHashIdx();
-            return generateTaskId(dynamicTaskId, serverHashIdx);
+            return generateNTaskName(dynamicTaskId, serverHashIdx);
         } catch (HeartBeatManagementException e) {
             String msg = "Failed to generate task id for a dynamic task " + dynamicTaskId;
             log.error(msg, e);
@@ -67,18 +68,33 @@ public class TaskManagementUtil {
         }
     }
 
-    public static String generateTaskId(int dynamicTaskId, int serverHashIdx) {
+    public static String generateNTaskName(int dynamicTaskId, int serverHashIdx) {
         return TaskMgtConstants.Task.DYNAMIC_TASK_TYPE + TaskMgtConstants.Task.NAME_SEPARATOR + dynamicTaskId
                 + TaskMgtConstants.Task.NAME_SEPARATOR + serverHashIdx;
     }
 
-    public static String generateTaskPropsMD5(Map<String, String> taskProperties) {
+    public static Map<String, String> populateNTaskProperties(DynamicTask dynamicTask,
-        taskProperties.remove(TaskMgtConstants.Task.TENANT_ID_PROP);
+                                                              String nTaskName) throws TaskManagementException {
-        taskProperties.remove(TaskMgtConstants.Task.LOCAL_HASH_INDEX);
+        try {
-        taskProperties.remove(TaskMgtConstants.Task.LOCAL_TASK_NAME);
+            int serverHashIdx = TaskManagerDataHolder.getInstance().getHeartBeatService()
-        Gson gson = new Gson();
+                    .getServerCtxInfo().getLocalServerHashIdx();
-        String json = gson.toJson(taskProperties);
+            return populateNTaskProperties(dynamicTask, nTaskName, serverHashIdx);
-        return DigestUtils.md5Hex(json);
+        } catch (HeartBeatManagementException e) {
+            String msg = "Failed to populate nTask properties a dynamic task " + dynamicTask.getDynamicTaskId();
+            log.error(msg, e);
+            throw new TaskManagementException(msg, e);
+        }
+    }
+
+    public static Map<String, String> populateNTaskProperties(DynamicTask dynamicTask,
+                                                              String nTaskName, int serverHashIdx) {
+        Map<String, String> taskProperties = new HashMap<>();
+        taskProperties.put(TaskMgtConstants.Task.DYNAMIC_TASK_ID, String.valueOf(dynamicTask.getDynamicTaskId()));
+        taskProperties.put(TaskMgtConstants.Task.LOCAL_TASK_NAME, nTaskName);
+        taskProperties.put(TaskMgtConstants.Task.LOCAL_HASH_INDEX, String.valueOf(serverHashIdx));
+        taskProperties.put(TaskMgtConstants.Task.TENANT_ID_PROP,
+                String.valueOf(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId()));
+        return taskProperties;
     }
 
 }