From 82447ef865a004d571fffbb422068b6affac5029 Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Wed, 11 Sep 2019 16:18:13 +0530
Subject: [PATCH 1/7] Fixing issues with query-devices

---
 .../mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
index 33cf2ec35b..31c5981c89 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
@@ -652,10 +652,13 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         List<Device> devices;
         DeviceList deviceList = new DeviceList();
         try {
+            if(map.getProperties().isEmpty()){
+                return Response.status(Response.Status.BAD_REQUEST).entity("No search criteria defined.").build();
+            }
             DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService();
             devices = dms.getDevicesBasedOnProperties(map.getProperties());
             if(devices == null || devices.isEmpty()){
-                return Response.status(Response.Status.OK).entity("No device found matching query criteria.").build();
+                return Response.status(Response.Status.NOT_FOUND).entity("No device found matching query criteria.").build();
             }
         } catch (DeviceManagementException e) {
             String msg = "Error occurred while searching for devices that matches the provided device properties";

From 27e01e80a83e4080a0e3b4d879869dfc4e54d6d8 Mon Sep 17 00:00:00 2001
From: Jayasanka Weerasinghe <jayasanka.sack@gmail.com>
Date: Wed, 18 Sep 2019 14:02:50 +0000
Subject: [PATCH 2/7] Fix server starting issue

This issue is occurred as a result of having java8 codes in the source. Hence remove and replace the code.
---
 .../apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js       | 3 +--
 .../react-app/src/components/apps/list-apps/Filters.js        | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
index 841e9215cb..eb047468f1 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js
@@ -92,7 +92,6 @@ class AppDetailsDrawer extends React.Component {
 
     componentDidMount() {
         this.getCategories();
-        this.getTags();
     }
 
     componentDidUpdate(prevProps, prevState, snapshot) {
@@ -117,7 +116,7 @@ class AppDetailsDrawer extends React.Component {
         ).then(res => {
             if (res.status === 200) {
                 const categories = JSON.parse(res.data.data);
-
+                this.getTags();
                 const globalCategories = categories.map(category => {
                     return (
                         <Option
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
index 791cde970d..d5f8e770c2 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js
@@ -75,8 +75,6 @@ class FiltersForm extends React.Component {
 
     componentDidMount() {
         this.getCategories();
-        this.getTags();
-        this.getDeviceTypes();
     }
 
     getCategories = () => {
@@ -86,6 +84,7 @@ class FiltersForm extends React.Component {
         ).then(res => {
             if (res.status === 200) {
                 let categories = JSON.parse(res.data.data);
+                this.getTags();
                 this.setState({
                     categories: categories,
                     loading: false
@@ -116,6 +115,7 @@ class FiltersForm extends React.Component {
         ).then(res => {
             if (res.status === 200) {
                 let tags = JSON.parse(res.data.data);
+                this.getDeviceTypes();
                 this.setState({
                     tags: tags,
                     loading: false,

From c129fb1c41d6736481d839e7b8636f24286f4e15 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Wed, 18 Sep 2019 19:32:59 +0530
Subject: [PATCH 3/7] Fix image loading issue in tenant mode

---
 .../mgt/api/services/ArtifactDownloadAPI.java            | 7 ++++++-
 .../mgt/api/services/impl/ArtifactDownloadAPIImpl.java   | 5 +++--
 .../application/mgt/common/services/AppmDataHandler.java | 2 +-
 .../application/mgt/core/impl/AppmDataHandlerImpl.java   | 8 +++-----
 .../carbon/device/application/mgt/core/util/APIUtil.java | 9 +++++----
 .../io/entgra/ui/request/interceptor/LoginHandler.java   | 9 +--------
 6 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ArtifactDownloadAPI.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ArtifactDownloadAPI.java
index 816b96c62b..f6f149ea62 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ArtifactDownloadAPI.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ArtifactDownloadAPI.java
@@ -57,7 +57,7 @@ import javax.ws.rs.core.Response;
 public interface ArtifactDownloadAPI {
 
     @GET
-    @Path("/{uuid}/{folderName}/{fileName}")
+    @Path("/{tenantId}/{uuid}/{folderName}/{fileName}")
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
     @ApiOperation(
             produces = MediaType.APPLICATION_OCTET_STREAM,
@@ -81,6 +81,11 @@ public interface ArtifactDownloadAPI {
                             response = ErrorResponse.class)
             })
     Response getArtifact(
+            @ApiParam(
+                    name = "tenantId",
+                    value = "Tenant Id of the application artifact belongs.",
+                    required = true)
+            @PathParam("tenantId") int tenantId,
             @ApiParam(
             name = "uuid",
             value = "UUID of the application release.",
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java
index c603b85161..d442de1b96 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java
@@ -47,14 +47,15 @@ public class ArtifactDownloadAPIImpl implements ArtifactDownloadAPI {
     @GET
     @Override
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
-    @Path("/{uuid}/{folderName}/{fileName}")
+    @Path("/{tenantId}/{uuid}/{folderName}/{fileName}")
     public Response getArtifact(
+            @PathParam("tenantId") int tenantId,
             @PathParam("uuid") String uuid,
             @PathParam("folderName") String folderName,
             @PathParam("fileName") String fileName) {
         AppmDataHandler dataHandler = APIUtil.getDataHandler();
         try {
-            InputStream fileInputStream = dataHandler.getArtifactStream(uuid, folderName, fileName);
+            InputStream fileInputStream = dataHandler.getArtifactStream(tenantId, uuid, folderName, fileName);
             Response.ResponseBuilder response = Response
                     .ok(fileInputStream, MediaType.APPLICATION_OCTET_STREAM);
             response.status(Response.Status.OK);
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/AppmDataHandler.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/AppmDataHandler.java
index 7e4cb13a82..7385688db5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/AppmDataHandler.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/AppmDataHandler.java
@@ -35,6 +35,6 @@ public interface AppmDataHandler {
 
     Map<String, LifecycleState> getLifecycleConfiguration() throws LifecycleManagementException;
 
-    InputStream getArtifactStream(String uuid, String folderName, String artifactName)
+    InputStream getArtifactStream(int tenantId, String uuid, String folderName, String artifactName)
             throws ApplicationManagementException;
 }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java
index d1a3f056cf..d1c941e045 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java
@@ -60,9 +60,8 @@ public class AppmDataHandlerImpl implements AppmDataHandler {
         return lifecycleStateManager.getLifecycleConfig();
     }
 
-    @Override public InputStream getArtifactStream(String uuid, String folderName, String artifactName)
+    @Override public InputStream getArtifactStream(int tenantId, String uuid, String folderName, String artifactName)
             throws ApplicationManagementException {
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
         ApplicationReleaseDAO applicationReleaseDAO = ApplicationManagementDAOFactory.getApplicationReleaseDAO();
         String appReleaseHashValue;
@@ -83,9 +82,8 @@ public class AppmDataHandlerImpl implements AppmDataHandler {
             }
             return inputStream;
         } catch (ApplicationManagementDAOException e) {
-            String msg =
-                    "Error occurred when retrieving application release hash value for given application release UUID: "
-                            + uuid;
+            String msg = "Error occurred when retrieving application release hash value for given application release "
+                    + "UUID: " + uuid;
             log.error(msg, e);
             throw new ApplicationManagementException(msg, e);
         } catch (ApplicationStorageManagementException e) {
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
index 0829079e66..f3b325caa2 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java
@@ -353,8 +353,7 @@ public class APIUtil {
         application.setRating(applicationDTO.getAppRating());
         List<ApplicationRelease> applicationReleases = new ArrayList<>();
         for (ApplicationReleaseDTO applicationReleaseDTO : applicationDTO.getApplicationReleaseDTOs()) {
-            ApplicationRelease applicationRelease = releaseDtoToRelease(applicationReleaseDTO);
-            applicationReleases.add(applicationRelease);
+            applicationReleases.add(releaseDtoToRelease(applicationReleaseDTO));
         }
         application.setApplicationReleases(applicationReleases);
         return application;
@@ -362,8 +361,10 @@ public class APIUtil {
 
     public static ApplicationRelease releaseDtoToRelease(ApplicationReleaseDTO applicationReleaseDTO)
             throws ApplicationManagementException {
-        String basePath = getArtifactDownloadBaseURL() + applicationReleaseDTO.getUuid()
-                + Constants.FORWARD_SLASH;
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
+        String basePath =
+                getArtifactDownloadBaseURL() + tenantId + Constants.FORWARD_SLASH + applicationReleaseDTO.getUuid()
+                        + Constants.FORWARD_SLASH;
 
         List<String> screenshotPaths = new ArrayList<>();
         ApplicationRelease applicationRelease = new ApplicationRelease();
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LoginHandler.java b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LoginHandler.java
index 03cf263bbc..a43c022967 100644
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LoginHandler.java
+++ b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LoginHandler.java
@@ -38,8 +38,6 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.protocol.HTTP;
 import org.wso2.carbon.device.application.mgt.common.ProxyResponse;
-import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
-import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
 
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
@@ -66,11 +64,6 @@ public class LoginHandler extends HttpServlet {
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
         try {
             validateLoginRequest(req, resp);
-            DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance()
-                    .getDeviceManagementConfig();
-            String adminUsername = deviceManagementConfig.getIdentityConfigurations().getAdminUsername();
-            String adminPwd = deviceManagementConfig.getIdentityConfigurations().getAdminPassword();
-
             HttpSession httpSession = req.getSession(false);
             if (httpSession != null) {
                 httpSession.invalidate();
@@ -120,7 +113,7 @@ public class LoginHandler extends HttpServlet {
                 // default login
                 HttpPost apiRegEndpoint = new HttpPost(serverUrl + HandlerConstants.APP_REG_ENDPOINT);
                 apiRegEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC + Base64.getEncoder()
-                        .encodeToString((adminUsername + HandlerConstants.COLON + adminPwd).getBytes()));
+                        .encodeToString((username + HandlerConstants.COLON + password).getBytes()));
                 apiRegEndpoint.setHeader(HTTP.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString());
                 apiRegEndpoint.setEntity(constructAppRegPayload(tags));
 

From 7838eaf97b96ee7afb0931ec6046fd8854a021fc Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Thu, 19 Sep 2019 07:59:45 +0530
Subject: [PATCH 4/7] Modifying group devices API to retrieve properties

---
 .../service/api/GroupManagementService.java   | 10 +++++++++-
 .../impl/GroupManagementServiceImpl.java      |  4 ++--
 .../impl/GroupManagementServiceImplTest.java  | 12 ++++++------
 .../dao/impl/group/GenericGroupDAOImpl.java   |  1 -
 .../GroupManagementProviderService.java       |  2 +-
 .../GroupManagementProviderServiceImpl.java   | 19 ++++++++++++++++++-
 ...ManagementProviderServiceNegativeTest.java |  2 +-
 .../GroupManagementProviderServiceTest.java   |  2 +-
 .../impl/GroupManagementServiceImpl.java      |  2 +-
 .../impl/GroupManagementServiceImplTest.java  |  6 +++---
 10 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
index d060f3a3df..0e5673dd29 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
@@ -681,7 +681,15 @@ public interface GroupManagementService {
                                                "pagination index/offset.",
                                        defaultValue = "5")
                                @QueryParam("limit")
-                                       int limit);
+                                       int limit,
+
+                               @ApiParam(
+                                       name = "requireDeviceProps",
+                                       value = "Boolean flag indicating whether to include device properties \n" +
+                                               " to the device object.",
+                                       required = false)
+                               @QueryParam("requireDeviceProps")
+                                       boolean requireDeviceProps);
 
     @Path("/id/{groupId}/devices/count")
     @GET
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
index 49f0b4ad76..9ba2a67efe 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
@@ -205,10 +205,10 @@ public class GroupManagementServiceImpl implements GroupManagementService {
     }
 
     @Override
-    public Response getDevicesOfGroup(int groupId, int offset, int limit) {
+    public Response getDevicesOfGroup(int groupId, int offset, int limit, boolean requireDeviceProps) {
         try {
             GroupManagementProviderService service = DeviceMgtAPIUtils.getGroupManagementProviderService();
-            List<Device> deviceList = service.getDevices(groupId, offset, limit);
+            List<Device> deviceList = service.getDevices(groupId, offset, limit, requireDeviceProps);
             int deviceCount = service.getDeviceCount(groupId);
             DeviceList deviceListWrapper = new DeviceList();
             if (deviceList != null) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java
index 9a4829cb56..c176663514 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java
@@ -266,16 +266,16 @@ public class GroupManagementServiceImplTest {
         PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getGroupManagementProviderService"))
                 .toReturn(groupManagementProviderService);
         Mockito.doReturn(1).when(groupManagementProviderService).getDeviceCount(Mockito.anyInt());
-        Mockito.doReturn(new ArrayList<Device>()).when(groupManagementProviderService).getDevices(1, 0, 10);
-        Mockito.doReturn(null).when(groupManagementProviderService).getDevices(2, 0, 10);
-        Mockito.doThrow(new GroupManagementException()).when(groupManagementProviderService).getDevices(3, 0, 10);
-        Response response = groupManagementService.getDevicesOfGroup(1, 0, 10);
+        Mockito.doReturn(new ArrayList<Device>()).when(groupManagementProviderService).getDevices(1, 0, 10, false);
+        Mockito.doReturn(null).when(groupManagementProviderService).getDevices(2, 0, 10, false);
+        Mockito.doThrow(new GroupManagementException()).when(groupManagementProviderService).getDevices(3, 0, 10, false);
+        Response response = groupManagementService.getDevicesOfGroup(1, 0, 10, false);
         Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
                 "getDevicesOfGroup request failed for a request with valid parameters");
-        response = groupManagementService.getDevicesOfGroup(2, 0, 10);
+        response = groupManagementService.getDevicesOfGroup(2, 0, 10, false);
         Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
                 "getDevicesOfGroup request failed for a request with valid parameters");
-        response = groupManagementService.getDevicesOfGroup(3, 0, 10);
+        response = groupManagementService.getDevicesOfGroup(3, 0, 10, false);
         Assert.assertEquals(response.getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode(),
                 "getDevicesOfGroup request succeded for a request with in-valid parameters");
     }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/group/GenericGroupDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/group/GenericGroupDAOImpl.java
index 7ad8b9981e..584a4f9a45 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/group/GenericGroupDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/group/GenericGroupDAOImpl.java
@@ -38,7 +38,6 @@ import java.util.List;
  * This class represents implementation of GroupDAO
  */
 public class GenericGroupDAOImpl extends AbstractGroupDAOImpl {
-
     @Override
     public List<DeviceGroup> getGroups(GroupPaginationRequest request, int tenantId)
             throws GroupManagementDAOException {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java
index 27aa73f358..c347625aba 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderService.java
@@ -164,7 +164,7 @@ public interface GroupManagementProviderService {
      * @return list of devices in group.
      * @throws GroupManagementException
      */
-    List<Device> getDevices(int groupId, int startIndex, int rowCount) throws GroupManagementException;
+    List<Device> getDevices(int groupId, int startIndex, int rowCount, boolean requireDeviceProps) throws GroupManagementException;
 
     /**
      * This method is used to retrieve the device count of a given group.
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java
index e800ff228a..a62bc23c2d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java
@@ -36,6 +36,8 @@ import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyExistException;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupNotExistException;
 import org.wso2.carbon.device.mgt.common.group.mgt.RoleDoesNotExistException;
+import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;
+import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.GroupDAO;
 import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory;
@@ -56,12 +58,14 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
     private static Log log = LogFactory.getLog(GroupManagementProviderServiceImpl.class);
 
     private GroupDAO groupDAO;
+    private DeviceDAO deviceDAO;
 
     /**
      * Set groupDAO from GroupManagementDAOFactory when class instantiate.
      */
     public GroupManagementProviderServiceImpl() {
         this.groupDAO = GroupManagementDAOFactory.getGroupDAO();
+        this.deviceDAO = DeviceManagementDAOFactory.getDeviceDAO();
     }
 
     /**
@@ -627,7 +631,7 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
      * {@inheritDoc}
      */
     @Override
-    public List<Device> getDevices(int groupId, int startIndex, int rowCount)
+    public List<Device> getDevices(int groupId, int startIndex, int rowCount, boolean requireDeviceProps)
             throws GroupManagementException {
         if (log.isDebugEnabled()) {
             log.debug("Group devices of group: " + groupId + " start index " + startIndex + " row count " + rowCount);
@@ -638,6 +642,16 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             rowCount = DeviceManagerUtil.validateDeviceListPageSize(rowCount);
             GroupManagementDAOFactory.openConnection();
             devices = this.groupDAO.getDevices(groupId, startIndex, rowCount, tenantId);
+
+            if(requireDeviceProps) {
+                DeviceManagementDAOFactory.openConnection();
+                for (Device device : devices) {
+                    Device retrievedDevice = deviceDAO.getDeviceProps(device.getDeviceIdentifier(), tenantId);
+                    if (retrievedDevice != null && !retrievedDevice.getProperties().isEmpty()) {
+                        device.setProperties(retrievedDevice.getProperties());
+                    }
+                }
+            }
         } catch (GroupManagementDAOException | SQLException | DeviceManagementException e) {
             String msg = "Error occurred while getting devices in group.";
             log.error(msg, e);
@@ -648,6 +662,9 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
             throw new GroupManagementException(msg, e);
         } finally {
             GroupManagementDAOFactory.closeConnection();
+            if(requireDeviceProps){
+                DeviceManagementDAOFactory.closeConnection();
+            }
         }
         return devices;
     }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceNegativeTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceNegativeTest.java
index ccaf84652e..d82ce26d6b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceNegativeTest.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceNegativeTest.java
@@ -138,7 +138,7 @@ public class GroupManagementProviderServiceNegativeTest extends BaseDeviceManage
     @Test(description = "This method tests the getDevices method under negative circumstances", expectedExceptions =
             {GroupManagementException.class})
     public void testGetDevicesWithPagination() throws GroupManagementException {
-        groupManagementProviderService.getDevices(1, 0, 10);
+        groupManagementProviderService.getDevices(1, 0, 10, false);
     }
 
     @Test(description = "This method tests the getGroupCount with username when the user name is given as null",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceTest.java
index e1c3be07cc..5746fed8db 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceTest.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceTest.java
@@ -225,7 +225,7 @@ public class GroupManagementProviderServiceTest extends BaseDeviceManagementTest
 
     @Test(dependsOnMethods = ("createGroup"))
     public void getDevices() throws GroupManagementException {
-        List<Device> devices = groupManagementProviderService.getDevices(1, 1, 50);
+        List<Device> devices = groupManagementProviderService.getDevices(1, 1, 50, false);
         Assert.assertNotNull(devices);
     }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
index d73533e10a..4e409ae1d7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
@@ -208,7 +208,7 @@ public class GroupManagementServiceImpl implements GroupManagementService {
     public Response getDevicesOfGroup(int groupId, int offset, int limit) {
         try {
             GroupManagementProviderService service = DeviceMgtAPIUtils.getGroupManagementProviderService();
-            List<Device> deviceList = service.getDevices(groupId, offset, limit);
+            List<Device> deviceList = service.getDevices(groupId, offset, limit, false);
             int deviceCount = service.getDeviceCount(groupId);
             DeviceList deviceListWrapper = new DeviceList();
             if (deviceList != null) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java
index d3c42b794a..a763b49a98 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImplTest.java
@@ -266,9 +266,9 @@ public class GroupManagementServiceImplTest {
         PowerMockito.stub(PowerMockito.method(DeviceMgtAPIUtils.class, "getGroupManagementProviderService"))
                 .toReturn(groupManagementProviderService);
         Mockito.doReturn(1).when(groupManagementProviderService).getDeviceCount(Mockito.anyInt());
-        Mockito.doReturn(new ArrayList<Device>()).when(groupManagementProviderService).getDevices(1, 0, 10);
-        Mockito.doReturn(null).when(groupManagementProviderService).getDevices(2, 0, 10);
-        Mockito.doThrow(new GroupManagementException()).when(groupManagementProviderService).getDevices(3, 0, 10);
+        Mockito.doReturn(new ArrayList<Device>()).when(groupManagementProviderService).getDevices(1, 0, 10, false);
+        Mockito.doReturn(null).when(groupManagementProviderService).getDevices(2, 0, 10, false);
+        Mockito.doThrow(new GroupManagementException()).when(groupManagementProviderService).getDevices(3, 0, 10, false);
         Response response = groupManagementService.getDevicesOfGroup(1, 0, 10);
         Assert.assertEquals(response.getStatus(), Response.Status.OK.getStatusCode(),
                 "getDevicesOfGroup request failed for a request with valid parameters");

From 647099f8a9099095f2944ea6906225484cbdbd4a Mon Sep 17 00:00:00 2001
From: Ace <ruwany.ace@gmail.com>
Date: Thu, 19 Sep 2019 10:22:47 +0530
Subject: [PATCH 5/7] Adding debug logs to query-devices API

---
 .../mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
index 31c5981c89..91770d28ea 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
@@ -653,11 +653,17 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         DeviceList deviceList = new DeviceList();
         try {
             if(map.getProperties().isEmpty()){
+                if (log.isDebugEnabled()) {
+                    log.debug("No search criteria defined when querying devices.");
+                }
                 return Response.status(Response.Status.BAD_REQUEST).entity("No search criteria defined.").build();
             }
             DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService();
             devices = dms.getDevicesBasedOnProperties(map.getProperties());
             if(devices == null || devices.isEmpty()){
+                if (log.isDebugEnabled()) {
+                    log.debug("No Devices Found for criteria : " + map);
+                }
                 return Response.status(Response.Status.NOT_FOUND).entity("No device found matching query criteria.").build();
             }
         } catch (DeviceManagementException e) {

From ff2c03868867d6d606f5dbda33b13efafa0f6c47 Mon Sep 17 00:00:00 2001
From: Amanda Randombage <74random.amanda@gmail.com>
Date: Thu, 19 Sep 2019 18:08:56 +0000
Subject: [PATCH 6/7] Modify permanent delete API to support list of devices

---
 .../admin/DeviceManagementAdminService.java   |  27 +-
 .../DeviceManagementAdminServiceImpl.java     |  26 +-
 .../device/mgt/common/DeviceManager.java      |   8 +-
 .../carbon/device/mgt/core/dao/DeviceDAO.java |  13 +-
 .../core/dao/impl/AbstractDeviceDAOImpl.java  | 567 +++++++++---------
 .../DeviceManagementProviderService.java      |   2 +-
 .../DeviceManagementProviderServiceImpl.java  | 142 +++--
 .../type/template/DeviceTypeManager.java      |  33 +-
 .../template/dao/DeviceTypePluginDAOImpl.java |  45 +-
 .../device/type/template/dao/PluginDAO.java   |   2 +-
 .../dao/PropertyBasedPluginDAOImpl.java       |  41 +-
 11 files changed, 487 insertions(+), 419 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
index 4377c9d185..ca8bdcf5f6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java
@@ -249,7 +249,7 @@ public interface DeviceManagementAdminService {
                     List<String> deviceIdentifiers);
 
     @DELETE
-    @Path("/type/{device-type}/id/{device-id}")
+    @Path("/permanent-delete")
     @ApiOperation(
             produces = MediaType.APPLICATION_JSON,
             consumes = MediaType.APPLICATION_JSON,
@@ -282,37 +282,20 @@ public interface DeviceManagementAdminService {
                                             description = "Date and time the resource has been modified the last time.\n" +
                                                           "Used by caches, or in conditional requests."),
                             }),
-                    @ApiResponse(
-                            code = 304,
-                            message = "Not Modified. Empty body because the client already has the latest " +
-                                      "version of the requested resource."),
                     @ApiResponse(
                             code = 400,
                             message = "Bad Request. \n Invalid request or validation error.",
                             response = ErrorResponse.class),
-                    @ApiResponse(
-                            code = 404,
-                            message = "Not Found. \n No device is found under the provided type and id.",
-                            response = ErrorResponse.class),
                     @ApiResponse(
                             code = 500,
                             message = "Internal Server Error. \n " +
                                       "Server error occurred while retrieving information requested device.",
                             response = ErrorResponse.class)
             })
-    Response deleteDevicePermanently(
-            @ApiParam(
-                    name = "device-type",
-                    value = "The device type, such as ios, android, or windows.",
-                    required = true)
-            @PathParam("device-type")
-            @Size(max = 45)
-                    String deviceType,
+    Response deleteDevicesPermanently(
             @ApiParam(
-                    name = "device-id",
-                    value = "The device identifier of the device.",
+                    name = "Device Identifiers",
+                    value = "List of device identifiers.",
                     required = true)
-            @PathParam("device-id")
-            @Size(max = 45)
-                    String deviceId);
+                    List<String> deviceIdentifiers);
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java
index 4a2fb4f25d..769c877989 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java
@@ -138,26 +138,26 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
 
     @DELETE
     @Override
-    @Path("/type/{device-type}/id/{device-id}")
-    public Response deleteDevicePermanently(@PathParam("device-type") String deviceType,
-                                 @PathParam("device-id") String deviceId) {
+    @Path("/permanent-delete")
+    public Response deleteDevicesPermanently(List<String> deviceIdentifiers) {
         DeviceManagementProviderService deviceManagementProviderService =
                 DeviceMgtAPIUtils.getDeviceManagementService();
         try {
-            DeviceIdentifier deviceIdentifier = new DeviceIdentifier(deviceId, deviceType);
-            Device persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier, true);
-            if (persistedDevice == null) {
-                String msg = "No device found with the device type: " + deviceType +
-                             " having the device ID: " + deviceId + " to permanently delete.";
+            if (!deviceManagementProviderService.deleteDevices(deviceIdentifiers)) {
+                String msg = "Found un-deployed device type.";
                 log.error(msg);
-                return Response.status(Response.Status.NOT_FOUND).entity(
+                return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
                         new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
             }
-            boolean response = deviceManagementProviderService.deleteDevice(deviceIdentifier);
-            return Response.status(Response.Status.OK).entity(response).build();
+            return Response.status(Response.Status.OK).entity(true).build();
         } catch (DeviceManagementException e) {
-            String msg = "Error encountered while permanently deleting device of type : " + deviceType + " and " +
-                         "ID : " + deviceId;
+            String msg = "Error encountered while permanently deleting devices";
+            log.error(msg, e);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
+                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+        }
+        catch (InvalidDeviceException e) {
+            String msg = "Found Invalid devices";
             log.error(msg, e);
             return Response.status(Response.Status.BAD_REQUEST).entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java
index 5a2259fe40..9def04000c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/DeviceManager.java
@@ -97,13 +97,11 @@ public interface DeviceManager {
     boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException;
 
     /**
-     * Method to delete a particular device from CDM.
-     *
-     * @param deviceId Fully qualified device identifier
-     * @return A boolean indicating the status of the operation.
+     * Method to delete multiple devices from CDM.
+     * @param deviceIdentifiers Fully qualified device identifier list
      * @throws DeviceManagementException If some unusual behaviour is observed while deleting a device
      */
-    boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException;
+    void deleteDevices(List<String> deviceIdentifiers) throws DeviceManagementException;
 
     /**
      * Method to retrieve the status of the registration process of a particular device.
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
index f824a2255b..8d6601bc9f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
@@ -522,11 +522,12 @@ public interface DeviceDAO {
     List<Device> getDevicesByIdentifiers(List<String> deviceIdentifiers, int tenantId)
             throws DeviceManagementDAOException;
 
-    /**
-     * This method is used to permanently delete the device and its related details
-     * @param deviceIdentifier device id
-     * @param tenantId tenant id
-     * @throws DeviceManagementDAOException
+    /***
+     * This method is used to permanently delete devices and their related details
+     * @param deviceIdentifiers List of device identifiers.
+     * @param deviceIds list of device ids (primary keys).
+     * @param enrollmentIds list of enrollment ids.
+     * @throws DeviceManagementDAOException when no enrolments are found for the given device.
      */
-    void deleteDevice(DeviceIdentifier deviceIdentifier, int tenantId) throws DeviceManagementDAOException;
+    void deleteDevices(List<String> deviceIdentifiers, List<Integer> deviceIds, List<Integer> enrollmentIds) throws DeviceManagementDAOException;
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
index 6e5ef3a586..b27313f4af 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
@@ -56,6 +56,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -1560,9 +1561,8 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
                 ps.setInt(index++, tenantId);
                 ps.setInt(index, tenantId);
                 try (ResultSet rs = ps.executeQuery()) {
-                    if (rs.next()) {
-                        Device device = DeviceManagementDAOUtil.loadDevice(rs);
-                        devices.add(device);
+                    while (rs.next()) {
+                        devices.add(DeviceManagementDAOUtil.loadDevice(rs));
                     }
                 }
             }
@@ -1572,369 +1572,394 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
                     + " given device identifiers.", e);
         }
     }
-    
-    public void deleteDevice(DeviceIdentifier deviceIdentifier, int tenantId) throws DeviceManagementDAOException {
-        String deviceIdentifierId = deviceIdentifier.getId();
-        String deviceType = deviceIdentifier.getType();
+
+    @Override
+    public void deleteDevices(List<String> deviceIdentifiers, List<Integer> deviceIds, List<Integer> enrollmentIds)
+            throws DeviceManagementDAOException {
         Connection conn;
         try {
             conn = this.getConnection();
-            int deviceId = getDeviceId(conn, deviceIdentifier, tenantId);
-            if (deviceId == -1) {
-                String msg = "Device " + deviceIdentifierId + " of type " + deviceType + " is not found";
+            if (enrollmentIds.isEmpty()) {
+                String msg = "Enrollments not found for the devices: " + deviceIdentifiers;
                 log.error(msg);
                 throw new DeviceManagementDAOException(msg);
             } else {
-                List<Integer> enrollmentIds = getEnrollmentIds(conn, deviceId, tenantId);
-                if (enrollmentIds == null || enrollmentIds.isEmpty()) {
-                    String msg = "Enrollments not found for the device " + deviceIdentifierId + " of type "
-                                 + deviceType;
-                    log.error(msg);
-                    throw new DeviceManagementDAOException(msg);
-                } else {
-                    removeDeviceDetail(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device detail data of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
-                    removeDeviceLocation(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device location data of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
-                    removeDeviceInfo(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device info data of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
-                    removeDeviceNotification(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device notification data of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
-                    removeDeviceApplicationMapping(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device application mapping data of device "
-                                  + deviceIdentifierId + " of type " + deviceType);
-                    }
-                    removeDevicePolicyApplied(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device applied policy data of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
-                    removeDevicePolicy(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device policy data of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
-                    if (log.isDebugEnabled()) {
-                        log.debug("Starting to remove " + enrollmentIds.size() + " enrollment data of device "
-                                  + deviceIdentifierId + " of type " + deviceType);
-                    }
-                    for (Integer enrollmentId : enrollmentIds) {
-                        removeEnrollmentDeviceDetail(conn, enrollmentId);
-                        removeEnrollmentDeviceLocation(conn, enrollmentId);
-                        removeEnrollmentDeviceInfo(conn, enrollmentId);
-                        removeEnrollmentDeviceApplicationMapping(conn, enrollmentId);
-                        removeDeviceOperationResponse(conn, enrollmentId);
-                        removeEnrollmentOperationMapping(conn, enrollmentId);
-                    }
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed enrollment device details, enrollment device location, " +
-                                  "enrollment device info, enrollment device application mapping, " +
-                                  "enrollment device operation response, enrollment operation mapping data of device "
-                                  + deviceIdentifierId + " of type " + deviceType);
-                    }
-                    removeDeviceEnrollment(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device enrollment data of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
-                    removeDeviceGroupMapping(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully removed device group mapping data of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
-                    removeDevice(conn, deviceId);
-                    if (log.isDebugEnabled()) {
-                        log.debug("Successfully permanently deleted the device of device " + deviceIdentifierId
-                                  + " of type " + deviceType);
-                    }
+                removeDeviceDetail(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device detail data of devices: " + deviceIdentifiers);
+                }
+                removeDeviceLocation(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device location data of devices: " + deviceIdentifiers);
+                }
+                removeDeviceInfo(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device info data of devices: " + deviceIdentifiers);
+                }
+                removeDeviceNotification(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device notification data of devices: " + deviceIdentifiers);
+                }
+                removeDeviceApplicationMapping(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device application mapping data of devices: "
+                            + deviceIdentifiers);
+                }
+                removeDevicePolicyApplied(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device applied policy data of devices: " + deviceIdentifiers);
+                }
+                removeDevicePolicy(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device policy data of devices: " + deviceIdentifiers);
+                }
+                if (log.isDebugEnabled()) {
+                    log.debug("Starting to remove " + enrollmentIds.size() + " enrollment data of devices with " +
+                            "identifiers: " + deviceIdentifiers);
+                }
+                removeEnrollmentDeviceDetail(conn, enrollmentIds);
+                removeEnrollmentDeviceLocation(conn, enrollmentIds);
+                removeEnrollmentDeviceInfo(conn, enrollmentIds);
+                removeEnrollmentDeviceApplicationMapping(conn, enrollmentIds);
+                removeDeviceOperationResponse(conn, enrollmentIds);
+                removeEnrollmentOperationMapping(conn, enrollmentIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed enrollment device details, enrollment device location," +
+                            "enrollment device info, enrollment device application mapping, " +
+                            "enrollment device operation response, enrollment operation mapping data of " +
+                            "devices with identifiers:  " + deviceIdentifiers);
+                }
+                removeDeviceEnrollment(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device enrollment data of devices: " + deviceIdentifiers);
+                }
+                removeDeviceGroupMapping(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully removed device group mapping data of devices: " + deviceIdentifiers);
+                }
+                removeDevice(conn, deviceIds);
+                if (log.isDebugEnabled()) {
+                    log.debug("Successfully permanently deleted the device of devices: " + deviceIdentifiers);
                 }
             }
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while deleting the device " + deviceIdentifierId
-                                                   + " of type " + deviceType, e);
+            String msg ="Error occurred while deleting the devices: " + deviceIdentifiers;
+            log.error(msg,e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private int getDeviceId(Connection conn, DeviceIdentifier deviceIdentifier, int tenantId)
-            throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
-        ResultSet rs = null;
-        int deviceId = -1;
+    /***
+     * This method removes records of a given list of devices from the DM_DEVICE_DETAIL table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDeviceDetail(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_DETAIL WHERE DEVICE_ID = ?";
         try {
-            String sql = "SELECT ID FROM DM_DEVICE WHERE DEVICE_IDENTIFICATION = ? AND TENANT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setString(1, deviceIdentifier.getId());
-            stmt.setInt(2, tenantId);
-            rs = stmt.executeQuery();
-            if (rs.next()) {
-                deviceId = rs.getInt("ID");
-            }
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while retrieving device id of the device", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            String msg = "Error occurred while removing device details.";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
-        return deviceId;
     }
 
-    private List<Integer> getEnrollmentIds(Connection conn, int deviceId, int tenantId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
-        ResultSet rs = null;
-        List<Integer> enrollmentIds = new ArrayList<>();
+    /***
+     * This method removes records of a given list of devices from the DM_DEVICE_LOCATION table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDeviceLocation(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_LOCATION WHERE DEVICE_ID = ?";
         try {
-            String sql = "SELECT ID FROM DM_ENROLMENT WHERE DEVICE_ID = ? AND TENANT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.setInt(2, tenantId);
-            rs = stmt.executeQuery();
-            while (rs.next()) {
-                enrollmentIds.add(rs.getInt("ID"));
-            }
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while retrieving enrollment id of the device", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
+            String msg = "Error occurred while obtaining locations of devices.";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
-        return enrollmentIds;
     }
 
-    private void removeDeviceDetail(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of devices from the DM_DEVICE_INFO table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDeviceInfo(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_INFO WHERE DEVICE_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_DETAIL WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device detail", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing device info.";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeDeviceLocation(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of devices from the DM_NOTIFICATION table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDeviceNotification(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_NOTIFICATION WHERE DEVICE_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_LOCATION WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device location", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing device notifications.";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
-    }
 
-    private void removeDeviceInfo(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
-        try {
-            String sql = "DELETE FROM DM_DEVICE_INFO WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
-        } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device info", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
-        }
     }
 
-    private void removeDeviceNotification(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of devices from the DM_DEVICE_APPLICATION_MAPPING table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDeviceApplicationMapping(Connection conn, List<Integer> deviceIds)
+            throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_APPLICATION_MAPPING WHERE DEVICE_ID = ?";
         try {
-            String sql = "DELETE FROM DM_NOTIFICATION WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device notification", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing device application mapping";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeDeviceApplicationMapping(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of devices from the DM_DEVICE_POLICY_APPLIED table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDevicePolicyApplied(Connection conn, List<Integer> deviceIds)
+            throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_POLICY_APPLIED WHERE DEVICE_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_APPLICATION_MAPPING WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device application mapping", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing policies applied on devices";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeDevicePolicyApplied(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of devices from the DM_DEVICE_POLICY table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDevicePolicy(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_POLICY WHERE DEVICE_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_POLICY_APPLIED WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device policy applied", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing policies of devices";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeDevicePolicy(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of enrollments from the DM_DEVICE_DETAIL table
+     * @param conn Connection object
+     * @param enrollmentIds list of enrollment ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeEnrollmentDeviceDetail(Connection conn, List<Integer> enrollmentIds)
+            throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_DETAIL WHERE ENROLMENT_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_POLICY WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, enrollmentIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device policy", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing enrollment details of devices";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeEnrollmentDeviceDetail(Connection conn, int enrollmentId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of enrollments from the DM_DEVICE_LOCATION table
+     * @param conn Connection object
+     * @param enrollmentIds list of enrollment ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeEnrollmentDeviceLocation(Connection conn, List<Integer> enrollmentIds)
+            throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_LOCATION WHERE ENROLMENT_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_DETAIL WHERE ENROLMENT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, enrollmentId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, enrollmentIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing enrollment device detail", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing enrollment locations of devices";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeEnrollmentDeviceLocation(Connection conn, int enrollmentId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of enrollments from the DM_DEVICE_INFO table
+     * @param conn Connection object
+     * @param enrollmentIds list of enrollment ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeEnrollmentDeviceInfo(Connection conn, List<Integer> enrollmentIds)
+            throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_INFO WHERE ENROLMENT_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_LOCATION WHERE ENROLMENT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, enrollmentId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, enrollmentIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing enrollment device location", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing enrollment info of devices";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeEnrollmentDeviceInfo(Connection conn, int enrollmentId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of enrollments from the DM_DEVICE_APPLICATION_MAPPING table
+     * @param conn Connection object
+     * @param enrollmentIds list of enrollment ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeEnrollmentDeviceApplicationMapping(Connection conn, List<Integer> enrollmentIds)
+            throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_APPLICATION_MAPPING WHERE ENROLMENT_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_INFO WHERE ENROLMENT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, enrollmentId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, enrollmentIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing enrollment device info", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing enrollment device application mapping";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeEnrollmentDeviceApplicationMapping(Connection conn, int enrollmentId)
+    /***
+     * This method removes records of a given list of enrollments from the DM_DEVICE_OPERATION_RESPONSE table
+     * @param conn Connection object
+     * @param enrollmentIds list of enrollment ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDeviceOperationResponse(Connection conn, List<Integer> enrollmentIds)
             throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+        String sql = "DELETE FROM DM_DEVICE_OPERATION_RESPONSE WHERE ENROLMENT_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_APPLICATION_MAPPING WHERE ENROLMENT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, enrollmentId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, enrollmentIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing enrollment device application " +
-                                                   "mapping", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing device operation response";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeDeviceOperationResponse(Connection conn, int enrollmentId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of enrollments from the DM_ENROLMENT_OP_MAPPING table
+     * @param conn Connection object
+     * @param enrollmentIds list of enrollment ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeEnrollmentOperationMapping(Connection conn, List<Integer> enrollmentIds)
+            throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_ENROLMENT_OP_MAPPING WHERE ENROLMENT_ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_OPERATION_RESPONSE WHERE ENROLMENT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, enrollmentId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, enrollmentIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device operation response", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing enrollment operation mapping";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeEnrollmentOperationMapping(Connection conn, int enrollmentId)
+    /***
+     * This method removes records of a given list of enrollments from the DM_ENROLMENT table
+     * @param conn Connection object
+     * @param enrollmentIds list of enrollment ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDeviceEnrollment(Connection conn, List<Integer> enrollmentIds)
             throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+        String sql = "DELETE FROM DM_ENROLMENT WHERE DEVICE_ID = ?";
         try {
-            String sql = "DELETE FROM DM_ENROLMENT_OP_MAPPING WHERE ENROLMENT_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, enrollmentId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, enrollmentIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing enrollment operation mapping", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing enrollments of devices";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeDeviceEnrollment(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of devices from the DM_DEVICE_GROUP_MAP table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDeviceGroupMapping(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE_GROUP_MAP WHERE DEVICE_ID = ?";
         try {
-            String sql = "DELETE FROM DM_ENROLMENT WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device enrollment", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing device group mapping";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeDeviceGroupMapping(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
+    /***
+     * This method removes records of a given list of devices from the DM_DEVICE table
+     * @param conn Connection object
+     * @param deviceIds list of device ids (primary keys)
+     * @throws DeviceManagementDAOException if deletion fails
+     */
+    private void removeDevice(Connection conn, List<Integer> deviceIds) throws DeviceManagementDAOException {
+        String sql = "DELETE FROM DM_DEVICE WHERE ID = ?";
         try {
-            String sql = "DELETE FROM DM_DEVICE_GROUP_MAP WHERE DEVICE_ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
+            executeBatchOperation(conn, sql, deviceIds);
         } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device group mapping", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+            String msg = "Error occurred while removing devices.";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
         }
     }
 
-    private void removeDevice(Connection conn, int deviceId) throws DeviceManagementDAOException {
-        PreparedStatement stmt = null;
-        try {
-            String sql = "DELETE FROM DM_DEVICE WHERE ID = ?";
-            stmt = conn.prepareStatement(sql);
-            stmt.setInt(1, deviceId);
-            stmt.executeUpdate();
-        } catch (SQLException e) {
-            throw new DeviceManagementDAOException("Error occurred while removing device", e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, null);
+    /***
+     * This method executes batch operations for a given list of primary keys
+     * where the statement only has one param of type int, following the given pattern:
+     *    DELETE FROM TABLE WHERE ID = ?
+     * @param sql SQL statement
+     * @param conn Connection object
+     * @param identifiers list of device ids (primary keys)
+     * @throws SQLException if deletion fails.
+     */
+    private void executeBatchOperation(Connection conn, String sql, List<Integer> identifiers) throws SQLException {
+        try (PreparedStatement ps = conn.prepareStatement(sql)) {
+            if (conn.getMetaData().supportsBatchUpdates()) {
+                for (int identifier : identifiers) {
+                    ps.setInt(1, identifier);
+                    ps.addBatch();
+                }
+                for (int i : ps.executeBatch()) {
+                    if (i == 0 || i == Statement.SUCCESS_NO_INFO || i == Statement.EXECUTE_FAILED) {
+                        break;
+                    }
+                }
+            } else {
+                for (int enrollmentId : identifiers) {
+                    ps.setInt(1, enrollmentId);
+                    if (ps.executeUpdate() == 0) {
+                        break;
+                    }
+                }
+            }
         }
     }
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
index 8aa8f71626..3b2012ac63 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
@@ -597,7 +597,7 @@ public interface DeviceManagementProviderService {
 
     boolean disenrollDevice(DeviceIdentifier deviceId) throws DeviceManagementException;
 
-    boolean deleteDevice(DeviceIdentifier deviceId) throws DeviceManagementException;
+    boolean deleteDevices(List<String> deviceIdentifiers) throws DeviceManagementException, InvalidDeviceException;
 
     boolean isEnrolled(DeviceIdentifier deviceId) throws DeviceManagementException;
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
index b590d18564..7fec5a6333 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@@ -99,6 +99,7 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.core.DeviceManagementPluginRepository;
+import org.wso2.carbon.device.mgt.core.cache.DeviceCacheKey;
 import org.wso2.carbon.device.mgt.core.cache.impl.DeviceCacheManagerImpl;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
@@ -142,6 +143,7 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
@@ -519,72 +521,90 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     @Override
-    public boolean deleteDevice(DeviceIdentifier deviceId) throws DeviceManagementException {
-        if (deviceId == null) {
-            String msg = "Required values are not set to permanently delete device";
-            log.error(msg);
-            throw new DeviceManagementException(msg);
-        }
-        if (log.isDebugEnabled()) {
-            log.debug("Permanently deleting device: " + deviceId.getId() + " of type '" + deviceId.getType() + "'");
-        }
-        DeviceManager deviceManager = this.getDeviceManager(deviceId.getType());
-        if (deviceManager == null) {
-            if (log.isDebugEnabled()) {
-                log.debug("Device Manager associated with the device type '" + deviceId.getType() + "' is null. " +
-                          "Therefore, not attempting method 'deleteDevice'");
-            }
-            return false;
-        }
-
+    public boolean deleteDevices(List<String> deviceIdentifiers) throws DeviceManagementException, InvalidDeviceException {
+        List<Integer> deviceIds = new ArrayList<>();
+        List<Integer> enrollmentIds = new ArrayList<>();
+        Map<String, List<String>> deviceIdentifierMap = new HashMap<>();
+        Map<String, DeviceManager> deviceManagerMap = new HashMap<>();
+        List<DeviceCacheKey> deviceCacheKeyList = new ArrayList<>();
         int tenantId = this.getTenantId();
-
-        Device device = this.getDevice(deviceId, false);
-        if (device == null) {
-            if (log.isDebugEnabled()) {
-                log.debug("Device not found for id '" + deviceId.getId() + "'");
+        List<Device> existingDevices;
+        try {
+            DeviceManagementDAOFactory.beginTransaction();
+            existingDevices = deviceDAO.getDevicesByIdentifiers(deviceIdentifiers, tenantId);
+            if (existingDevices.size() != deviceIdentifiers.size()) {
+                for (Device device : existingDevices) {
+                    deviceIdentifiers.remove(device.getDeviceIdentifier());
+                }
+                String msg =
+                        "Couldn't find device ids for all the requested device identifiers. " +
+                                "Therefore payload should contain device identifiers which are not in the system. " +
+                                "Invalid device identifiers are " + deviceIdentifiers.toString();
+                log.error(msg);
+                DeviceManagementDAOFactory.rollbackTransaction();
+                throw new InvalidDeviceException(msg);
             }
-            return false;
-        }
-
-        if (!device.getEnrolmentInfo().getStatus().equals(EnrolmentInfo.Status.REMOVED)) {
-            String msg = "Device " + deviceId.getId() + " of type " + deviceId.getType() + " is not dis-enrolled to " +
-                         "permanently delete the device";
-            log.error(msg);
-            throw new DeviceManagementException(msg);
-        } else {
-            try {
-                DeviceManagementDAOFactory.beginTransaction();
-                deviceDAO.deleteDevice(deviceId, tenantId);
+            for (Device device : existingDevices) {
+                if (!device.getEnrolmentInfo().getStatus().equals(EnrolmentInfo.Status.REMOVED)) {
+                    String msg = "Device " + device.getDeviceIdentifier() + " of type " + device.getType()
+                            + " is not dis-enrolled to permanently delete the device";
+                    log.error(msg);
+                    DeviceManagementDAOFactory.rollbackTransaction();
+                    throw new InvalidDeviceException(msg);
+                }
+                DeviceCacheKey deviceCacheKey = new DeviceCacheKey();
+                deviceCacheKey.setDeviceId(device.getDeviceIdentifier());
+                deviceCacheKey.setDeviceType(device.getType());
+                deviceCacheKey.setTenantId(tenantId);
+                deviceCacheKeyList.add(deviceCacheKey);
+                deviceIds.add(device.getId());
+                enrollmentIds.add(device.getEnrolmentInfo().getId());
+                if (deviceIdentifierMap.containsKey(device.getType())) {
+                    deviceIdentifierMap.get(device.getType()).add(device.getDeviceIdentifier());
+                } else {
+                    deviceIdentifierMap.put(device.getType(),
+                            new ArrayList<>(Arrays.asList(device.getDeviceIdentifier())));
+                    DeviceManager deviceManager = this.getDeviceManager(device.getType());
+                    if (deviceManager == null) {
+                        if (log.isDebugEnabled()) {
+                            log.debug("Device Manager associated with the device type '"
+                                    + device.getType() + "' is null. Therefore, not attempting method 'deleteDevice'");
+                        }
+                        return false;
+                    }
+                    deviceManagerMap.put(device.getType(), deviceManager);
+                }
+            }
+            //deleting device from the core
+            deviceDAO.deleteDevices(deviceIdentifiers, deviceIds, enrollmentIds);
+            for (Map.Entry<String, DeviceManager> entry : deviceManagerMap.entrySet()) {
                 try {
-                    deviceManager.deleteDevice(deviceId, device);
+                    // deleting device from the plugin level
+                    entry.getValue().deleteDevices(deviceIdentifierMap.get(entry.getKey()));
                 } catch (DeviceManagementException e) {
-                    String msg = "Error occurred while permanently deleting '" + deviceId.getType() +
-                                 "' device with the identifier '" + deviceId.getId() + "' in plugin.";
+                    String msg = "Error occurred while permanently deleting '" + entry.getKey() +
+                            "' devices with the identifiers: '" + deviceIdentifierMap.get(entry.getKey())
+                            + "' in plugin.";
                     log.error(msg, e);
+                    // a DeviceManagementException is thrown when the device deletion fails from the plugin level.
+                    // Here, that exception is caught and a DeviceManagementDAOException is thrown
                     throw new DeviceManagementDAOException(msg, e);
                 }
-                DeviceManagementDAOFactory.commitTransaction();
-                this.removeDeviceFromCache(deviceId);
-            } catch (DeviceManagementDAOException e) {
-                DeviceManagementDAOFactory.rollbackTransaction();
-                String msg = "Error occurred while permanently deleting '" + deviceId.getType() +
-                             "' device with the identifier '" + deviceId.getId() + "'";
-                log.error(msg, e);
-                throw new DeviceManagementException(msg, e);
-            } catch (TransactionManagementException e) {
-                String msg = "Error occurred while initiating transaction";
-                log.error(msg, e);
-                throw new DeviceManagementException(msg, e);
-            } catch (Exception e) {
-                String msg = "Error occurred while permanently deleting device: " + deviceId.getId();
-                log.error(msg, e);
-                throw new DeviceManagementException(msg, e);
-            } finally {
-                DeviceManagementDAOFactory.closeConnection();
             }
+            DeviceManagementDAOFactory.commitTransaction();
+            this.removeDevicesFromCache(deviceCacheKeyList);
+            return true;
+        } catch (TransactionManagementException e) {
+            String msg = "Error occurred while initiating transaction";
+            log.error(msg, e);
+            throw new DeviceManagementException(msg, e);
+        } catch (DeviceManagementDAOException e) {
+            DeviceManagementDAOFactory.rollbackTransaction();
+            String msg = "Error occurred while permanently deleting '" + deviceIdentifiers +
+                    "' devices";
+            log.error(msg, e);
+            throw new DeviceManagementException(msg, e);
         }
-        return true;
     }
 
     @Override
@@ -2976,6 +2996,14 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         DeviceCacheManagerImpl.getInstance().removeDeviceFromCache(deviceIdentifier, this.getTenantId());
     }
 
+    /***
+     * This method removes a given list of devices from the cache
+     * @param deviceList list of DeviceCacheKey objects
+     */
+    private void removeDevicesFromCache(List<DeviceCacheKey> deviceList) {
+        DeviceCacheManagerImpl.getInstance().removeDevicesFromCache(deviceList);
+    }
+
     @Override
     public List<GeoCluster> findGeoClusters(String deviceType, GeoCoordinate southWest, GeoCoordinate northEast,
                                             int geohashLength) throws DeviceManagementException {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java
index 4e60210424..9becdfeade 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/DeviceTypeManager.java
@@ -587,31 +587,36 @@ public class DeviceTypeManager implements DeviceManager {
     }
 
     @Override
-    public boolean deleteDevice(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException {
+    public void deleteDevices(List<String> deviceIdentifierList) throws DeviceManagementException {
         if (propertiesExist) {
-            boolean status;
-            Device existingDevice = this.getDevice(deviceIdentifier);
-            if (existingDevice == null) {
-                return false;
-            }
             try {
                 if (log.isDebugEnabled()) {
-                    log.debug("Deleting the details of " + deviceType + " device : " + device.getDeviceIdentifier());
+                    log.debug("Deleting the details of " + deviceType + " devices : " + deviceIdentifierList);
                 }
                 deviceTypePluginDAOManager.getDeviceTypeDAOHandler().beginTransaction();
-                status = deviceTypePluginDAOManager.getDeviceDAO().deleteDevice(existingDevice);
-                deviceTypePluginDAOManager.getDeviceTypeDAOHandler().commitTransaction();
+                if (deviceTypePluginDAOManager.getDeviceDAO().deleteDevices(deviceIdentifierList)) {
+                    deviceTypePluginDAOManager.getDeviceTypeDAOHandler().commitTransaction();
+                } else {
+                    deviceTypePluginDAOManager.getDeviceTypeDAOHandler().rollbackTransaction();
+                    String msg = "Error occurred while deleting the " + deviceType + " devices: '" +
+                            deviceIdentifierList;
+                    log.error(msg);
+                    throw new DeviceManagementException(msg);
+                }
             } catch (DeviceTypeMgtPluginException e) {
                 deviceTypePluginDAOManager.getDeviceTypeDAOHandler().rollbackTransaction();
-                throw new DeviceManagementException(
-                        "Error occurred while deleting the " + deviceType + " device: '" +
-                        device.getDeviceIdentifier() + "'", e);
+                if (log.isDebugEnabled()) {
+                    log.debug("Error occurred while deleting the " + deviceType + " devices: '" +
+                            deviceIdentifierList + "'. Transaction rolled back");
+                }
+                String msg= "Error occurred while deleting the " + deviceType + " devices: '" +
+                        deviceIdentifierList;
+                log.error(msg,e);
+                throw new DeviceManagementException(msg, e);
             } finally {
                 deviceTypePluginDAOManager.getDeviceTypeDAOHandler().closeConnection();
             }
-            return status;
         }
-        return true;
     }
 
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypePluginDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypePluginDAOImpl.java
index 00c9e4ff40..e1427897d2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypePluginDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/DeviceTypePluginDAOImpl.java
@@ -39,6 +39,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.exception.DeviceTypeMgtPluginException;
 import org.wso2.carbon.device.mgt.extensions.device.type.template.util.DeviceTypeUtils;
 
@@ -46,6 +47,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -215,30 +217,39 @@ public class DeviceTypePluginDAOImpl implements PluginDAO {
     }
 
     @Override
-    public boolean deleteDevice(Device device) throws DeviceTypeMgtPluginException {
-        boolean status = false;
-        Connection conn;
-        PreparedStatement stmt = null;
+    public boolean deleteDevices(List<String> deviceIdentifiers) throws DeviceTypeMgtPluginException {
         try {
-            conn = deviceTypeDAOHandler.getConnection();
-            stmt = conn.prepareStatement(deleteDBQueryForDeleteDevice);
-            stmt.setString(1, device.getDeviceIdentifier());
-            int rows = stmt.executeUpdate();
-            if (rows > 0) {
-                status = true;
-                if (log.isDebugEnabled()) {
-                    log.debug("Device " + device.getDeviceIdentifier() + " data has been deleted.");
+            Connection conn = deviceTypeDAOHandler.getConnection();
+            boolean status = true;
+            try (PreparedStatement ps = conn.prepareStatement(deleteDBQueryForDeleteDevice)) {
+                if (conn.getMetaData().supportsBatchUpdates()) {
+                    for (String deviceId : deviceIdentifiers) {
+                        ps.setString(1, deviceId);
+                        ps.addBatch();
+                    }
+                    for (int i : ps.executeBatch()) {
+                        if (i == 0 || i == Statement.SUCCESS_NO_INFO || i == Statement.EXECUTE_FAILED) {
+                            status = false;
+                            break;
+                        }
+                    }
+                } else {
+                    for (String deviceId : deviceIdentifiers) {
+                        ps.setString(1, deviceId);
+                        if (ps.executeUpdate() == 0) {
+                            status = false;
+                            break;
+                        }
+                    }
                 }
             }
+            return status;
         } catch (SQLException e) {
-            String msg = "Error occurred while deleting the device '" + device.getDeviceIdentifier() + "' data in "
-                         + deviceDAODefinition.getDeviceTableName();
+            String msg = "Error occurred while deleting the data in "
+                    + deviceDAODefinition.getDeviceTableName();
             log.error(msg, e);
             throw new DeviceTypeMgtPluginException(msg, e);
-        } finally {
-            DeviceTypeUtils.cleanupResources(stmt, null);
         }
-        return status;
     }
 
     private String getDeviceTableColumnNames() {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PluginDAO.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PluginDAO.java
index a6bdbb79df..5ea6a1197b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PluginDAO.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PluginDAO.java
@@ -50,5 +50,5 @@ public interface PluginDAO {
 
     List<Device> getAllDevices() throws DeviceTypeMgtPluginException;
 
-    boolean deleteDevice(Device device) throws DeviceTypeMgtPluginException;
+    boolean deleteDevices(List<String> deviceIdentifiers) throws DeviceTypeMgtPluginException;
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PropertyBasedPluginDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PropertyBasedPluginDAOImpl.java
index 9b01e290d3..7cc32f6315 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PropertyBasedPluginDAOImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/template/dao/PropertyBasedPluginDAOImpl.java
@@ -46,6 +46,7 @@ import org.wso2.carbon.device.mgt.extensions.device.type.template.util.DeviceTyp
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.sql.Statement;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -218,22 +219,38 @@ public class PropertyBasedPluginDAOImpl implements PluginDAO {
     }
 
     @Override
-    public boolean deleteDevice(Device device) throws DeviceTypeMgtPluginException {
-        Connection conn;
-        PreparedStatement stmt = null;
+    public boolean deleteDevices(List<String> deviceIdentifiers) throws DeviceTypeMgtPluginException {
         try {
-            conn = deviceTypeDAOHandler.getConnection();
-            stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_PROPERTIES WHERE DEVICE_IDENTIFICATION = ?");
-            stmt.setString(1, device.getDeviceIdentifier());
-            stmt.executeUpdate();
-            return true;
+            Connection conn = deviceTypeDAOHandler.getConnection();
+            boolean status = true;
+            try (PreparedStatement ps = conn.prepareStatement("DELETE FROM DM_DEVICE_PROPERTIES WHERE DEVICE_IDENTIFICATION = ?")) {
+                if (conn.getMetaData().supportsBatchUpdates()) {
+                    for (String deviceId : deviceIdentifiers) {
+                        ps.setString(1, deviceId);
+                        ps.addBatch();
+                    }
+                    for (int i : ps.executeBatch()) {
+                        if (i == 0 || i == Statement.SUCCESS_NO_INFO || i == Statement.EXECUTE_FAILED) {
+                            status = false;
+                            break;
+                        }
+                    }
+                } else {
+                    for (String deviceId : deviceIdentifiers) {
+                        ps.setString(1, deviceId);
+                        if (ps.executeUpdate() == 0) {
+                            status = false;
+                            break;
+                        }
+                    }
+                }
+            }
+            return status;
         } catch (SQLException e) {
-            String msg = "Error occurred while deleting the device '" + device.getDeviceIdentifier() + "' data on"
-                         + deviceType;
+            String msg = "Error occurred while deleting the data of the devices: '" + deviceIdentifiers + "'of type:  "
+                    + deviceType;
             log.error(msg, e);
             throw new DeviceTypeMgtPluginException(msg, e);
-        } finally {
-            DeviceTypeUtils.cleanupResources(stmt, null);
         }
     }
 

From a82b4763e21db40801198cda7da580059caf778e Mon Sep 17 00:00:00 2001
From: Amanda Randombage <74random.amanda@gmail.com>
Date: Thu, 19 Sep 2019 21:11:51 +0000
Subject: [PATCH 7/7] Fix device management test failures

---
 .../org/wso2/carbon/device/mgt/core/TestDeviceManager.java     | 3 +--
 .../wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java   | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java
index 8675858f8b..838a3318d5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/TestDeviceManager.java
@@ -60,8 +60,7 @@ public class TestDeviceManager implements DeviceManager {
     }
 
     @Override
-    public boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {
-        return true;
+    public void deleteDevices(List<String> deviceIdentifiers) throws DeviceManagementException {
     }
 
     @Override
diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java
index f303b15c7f..af32ddb05f 100644
--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/java/org/wso2/carbon/policy/mgt/core/mock/TypeXDeviceManager.java
@@ -79,8 +79,7 @@ public class TypeXDeviceManager implements DeviceManager {
     }
 
     @Override
-    public boolean deleteDevice(DeviceIdentifier deviceId, Device device) throws DeviceManagementException {
-        return false;
+    public void deleteDevices(List<String> deviceIdentifiers) throws DeviceManagementException {
     }
 
     @Override