Optimize functionality

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

@@ -1,7 +1,7 @@
 /*
- *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *   Copyright (c) 2019, Entgra (pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
  *
- *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Entgra (pvt) Ltd. licenses this file to you under the Apache License,
  *   Version 2.0 (the "License"); you may not use this file except
  *   in compliance with the License.
  *   You may obtain a copy of the License at
@@ -18,16 +18,30 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.api;
 
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Extension;
+import io.swagger.annotations.ExtensionProperty;
+import io.swagger.annotations.Info;
+import io.swagger.annotations.ResponseHeader;
+import io.swagger.annotations.SwaggerDefinition;
+import io.swagger.annotations.Tag;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.device.mgt.common.DeviceCount;
-import org.wso2.carbon.device.mgt.common.DeviceIDList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
 import javax.validation.constraints.Size;
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.util.List;
@@ -147,7 +161,7 @@ public interface DeviceStatusManagementService {
                     @ApiResponse(
                             code = 200,
                             message = "OK. \n Successfully fetched the details of the device.",
-                            response = DeviceCount.class,
+                            response = int.class,
                             responseHeaders = {
                                     @ResponseHeader(
                                             name = "Content-Type",
@@ -224,7 +238,7 @@ public interface DeviceStatusManagementService {
                     @ApiResponse(
                             code = 200,
                             message = "OK. \n Successfully fetched the details of the device.",
-                            response = DeviceIDList.class,
+                            response = String[].class,
                             responseHeaders = {
                                     @ResponseHeader(
                                             name = "Content-Type",

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceStatusManagementServiceImpl.java

@@ -1,7 +1,7 @@
 /*
- *   Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *   Copyright (c) 2019, Entgra (pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
  *
- *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Entgra (pvt) Ltd. licenses this file to you under the Apache License,
  *   Version 2.0 (the "License"); you may not use this file except
  *   in compliance with the License.
  *   You may obtain a copy of the License at
@@ -18,17 +18,20 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.impl;
 
-import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceCount;
-import org.wso2.carbon.device.mgt.common.DeviceIDList;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.DeviceStatusManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 
-import javax.ws.rs.*;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.util.List;
@@ -45,32 +48,32 @@ public class DeviceStatusManagementServiceImpl implements DeviceStatusManagement
     @Path("/count/{type}/{status}")
     public Response getDeviceCountByStatus(@PathParam("type") String type, @PathParam("status") String status,
                                            @HeaderParam("If-Modified-Since") String ifModifiedSince) {
-        DeviceCount deviceCount = new DeviceCount();
+        int deviceCount;
         try {
-            deviceCount.setCount(DeviceMgtAPIUtils.getDeviceManagementService().getDeviceCountByStatus(type, status));
+            deviceCount = DeviceMgtAPIUtils.getDeviceManagementService().getDeviceCountOfTypeByStatus(type, status);
+            return Response.status(Response.Status.OK).entity(deviceCount).build();
         } catch (DeviceManagementException e) {
             String errorMessage = "Error while retrieving device count.";
             log.error(errorMessage, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(errorMessage).build()).build();
         }
-        return Response.status(Response.Status.OK).entity(deviceCount).build();
     }
 
     @GET
     @Override
     @Path("/ids/{type}/{status}")
     public Response getDeviceIdentifiersByStatus(@PathParam("type") String type, @PathParam("status") String status, String ifModifiedSince) {
-        DeviceIDList deviceList = new DeviceIDList();
+        List<String> deviceIds;
         try {
-            deviceList.setIds(DeviceMgtAPIUtils.getDeviceManagementService().getDeviceIdentifiersByStatus(type, status));
+            deviceIds = DeviceMgtAPIUtils.getDeviceManagementService().getDeviceIdentifiersByStatus(type, status);
+            return Response.status(Response.Status.OK).entity(deviceIds.toArray(new String[0])).build();
         } catch (DeviceManagementException e) {
             String errorMessage = "Error while obtaining list of devices";
             log.error(errorMessage, e);
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(
                     new ErrorResponse.ErrorResponseBuilder().setMessage(errorMessage).build()).build();
         }
-        return Response.status(Response.Status.OK).entity(deviceList).build();
     }
 
     @PUT

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

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * you may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.wso2.carbon.device.mgt.common;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.Gson;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-
-@ApiModel(value = "DeviceList", description = "This contains status of device against device identifier.")
-public class DeviceCount implements Serializable{
-
-    @ApiModelProperty(
-            name = "id",
-            value = "Identity of the device.",
-            required = true,
-            example = "123456")
-    @JsonProperty(value = "id", required = true)
-    private int count;
-
-    public DeviceCount() {}
-
-    public DeviceCount(int count) {
-        this.count = count;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public void setCount(int count) {
-        this.count = count;
-    }
-
-    @Override
-    public String toString() {
-        return "{\"count\":" + count + "}";
-    }
-}

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

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * you may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.wso2.carbon.device.mgt.common;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.Gson;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.List;
-
-
-@ApiModel(value = "DeviceIDList", description = "This contains status of device against device identifier.")
-public class DeviceIDList implements Serializable{
-
-    @ApiModelProperty(
-            name = "id",
-            value = "Identity of the device.",
-            required = true,
-            example = "123456")
-    @JsonProperty(value = "id", required = true)
-    private List<String> ids;
-
-    public DeviceIDList() {}
-
-    public DeviceIDList(List<String> ids) {
-        this.ids = ids;
-    }
-
-    public List<String> getId() {
-        return ids;
-    }
-
-    public void setIds(List<String> ids) {
-        this.ids = ids;
-    }
-
-    @Override
-    public String toString() {
-        String deviceIds = new Gson().toJson(ids);
-        return "["+deviceIds+"]";
-    }
-}

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java

@@ -18,7 +18,6 @@
 
 package org.wso2.carbon.device.mgt.core.dao.impl;
 
-import org.apache.commons.lang.StringUtils;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
@@ -31,13 +30,15 @@ import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.geo.GeoCluster;
 import org.wso2.carbon.device.mgt.core.geo.geoHash.GeoCoordinate;
-import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 
 public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
@@ -583,18 +584,22 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         PreparedStatement stmt = null;
         try {
             conn = this.getConnection();
-//            Array arr = conn.createArrayOf("varchar", devices.toArray());
+            StringBuilder sql = new StringBuilder("UPDATE DM_ENROLMENT SET STATUS = ? WHERE DEVICE_ID IN " +
-            String sql = "UPDATE DM_ENROLMENT SET STATUS = ? WHERE DEVICE_ID IN " +
+                    "(SELECT d.ID FROM DM_DEVICE d, DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.ID IN (");
-                    "(SELECT d.ID FROM DM_DEVICE d, DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.ID IN (";
+            for (int i = 0; i < devices.size(); i++) {
-
+                sql.append("?,");
-            StringBuffer bf = new StringBuffer(sql);
+            }
-            bf.append(DeviceManagementDAOUtil.makeString(devices));
+            sql.deleteCharAt(sql.length() - 1);
-            bf.append(") AND t.NAME = ? AND d.TENANT_ID = ?) AND TENANT_ID = ?");
+            sql.append(") AND t.NAME = ? AND d.TENANT_ID = ?) AND TENANT_ID = ?");
-            stmt = conn.prepareStatement(bf.toString());
+            stmt = conn.prepareStatement(sql.toString());
             stmt.setString(1, status);
-            stmt.setString(2, deviceType);
+            int index = 1;
-            stmt.setInt(3, tenantId);
+            for (String device : devices) {
-            stmt.setInt(4, tenantId);
+                stmt.setString(++index, device);
+            }
+            stmt.setString(++index, deviceType);
+            stmt.setInt(++index, tenantId);
+            stmt.setInt(++index, tenantId);
             stmt.executeUpdate();
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while updating enrollment status in bulk", e);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/DeviceManagementDAOUtil.java

@@ -32,10 +32,12 @@ import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Map;
 
 public final class DeviceManagementDAOUtil {
@@ -244,13 +246,4 @@ public final class DeviceManagementDAOUtil {
         return deviceInfo;
     }
 
-    public static String makeString(List<String> values) {
-        StringBuilder buff = new StringBuilder();
-        for (String value : values) {
-            buff.append(value).append(",");
-        }
-        buff.deleteCharAt(buff.length() - 1);
-        return buff.toString();
-    }
-
 }

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

@@ -652,7 +652,7 @@ public interface DeviceManagementProviderService {
     List<GeoCluster> findGeoClusters(String deviceType, GeoCoordinate southWest, GeoCoordinate northEast,
                                             int geohashLength) throws DeviceManagementException;
 
-    Integer getDeviceCountByStatus(String deviceType, String deviceStatus) throws DeviceManagementException;
+    int getDeviceCountOfTypeByStatus(String deviceType, String deviceStatus) throws DeviceManagementException;
 
     List<String> getDeviceIdentifiersByStatus(String deviceType, String deviceStatus) throws DeviceManagementException;
 

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

@@ -2710,12 +2710,11 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     @Override
-    public Integer getDeviceCountByStatus(String deviceType, String deviceStatus) throws DeviceManagementException {
+    public int getDeviceCountOfTypeByStatus(String deviceType, String deviceStatus) throws DeviceManagementException {
         int tenantId = this.getTenantId();
-        int count = 0;
         try {
             DeviceManagementDAOFactory.openConnection();
-            count = deviceDAO.getDeviceCount(deviceType, deviceStatus, tenantId);
+            return deviceDAO.getDeviceCount(deviceType, deviceStatus, tenantId);
         } catch (DeviceManagementDAOException e) {
             String msg = "Error occurred in while retrieving device count by status for deviceType :" +deviceType + " status : " + deviceStatus;
             log.error(msg, e);
@@ -2727,7 +2726,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         } finally {
             DeviceManagementDAOFactory.closeConnection();
         }
-        return count;
     }
 
     @Override