Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

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

@@ -17,6 +17,8 @@
  */
 package org.wso2.carbon.device.mgt.core;
 
+import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation;
+
 public final class DeviceManagementConstants {
 
     public static final class Common {
@@ -47,4 +49,13 @@ public final class DeviceManagementConstants {
         public static final String ENROL_NOTIFICATION_TYPE = "enrol";
         public static final String USER_REGISTRATION_NOTIFICATION_TYPE = "userRegistration";
     }
+
+    public static final class AuthorizationSkippedOperationCodes {
+        private AuthorizationSkippedOperationCodes() {
+            throw new AssertionError();
+        }
+
+        public static final String MONITOR_OPERATION_CODE = "MONITOR";
+        public static final String POLICY_OPERATION_CODE = PolicyOperation.POLICY_OPERATION_CODE;
+    }
 }

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

@@ -71,6 +71,7 @@ public class EnrollmentDAOImpl implements EnrollmentDAO {
         PreparedStatement stmt = null;
         ResultSet rs = null;
         int status = -1;
+        int rows;
         try {
             conn = this.getConnection();
             String sql = "UPDATE DM_ENROLMENT SET OWNERSHIP = ?, STATUS = ?, " +
@@ -85,12 +86,12 @@ public class EnrollmentDAOImpl implements EnrollmentDAO {
             stmt.setString(6, enrolmentInfo.getOwner());
             stmt.setInt(7, tenantId);
             stmt.setInt(8, enrolmentInfo.getId());
-            stmt.executeUpdate();
+            rows = stmt.executeUpdate();
 
-            rs = stmt.getGeneratedKeys();
+            if (rows > 0) {
-            if (rs.next()) {
                 status = 1;
             }
+
             return status;
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while updating enrolment configuration", e);

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

@@ -28,6 +28,7 @@ import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorization
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;
+import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
@@ -83,7 +84,7 @@ public class OperationManagerImpl implements OperationManager {
         }
         try {
             List<DeviceIdentifier> authorizedDeviceList;
-            if (operation != null && PolicyOperation.POLICY_OPERATION_CODE.equals(operation.getCode())) {
+            if (operation != null && isAuthenticationSkippedOperation(operation)) {
                 authorizedDeviceList = deviceIds;
             } else {
                 authorizedDeviceList = DeviceManagementDataHolder.getInstance().
@@ -618,4 +619,20 @@ public class OperationManagerImpl implements OperationManager {
         return CarbonContext.getThreadLocalCarbonContext().getUsername();
     }
 
+    private boolean isAuthenticationSkippedOperation(Operation operation) {
+        boolean status;
+        switch (operation.getCode()) {
+            case DeviceManagementConstants.AuthorizationSkippedOperationCodes.POLICY_OPERATION_CODE :
+                status = true;
+                break;
+            case DeviceManagementConstants.AuthorizationSkippedOperationCodes.MONITOR_OPERATION_CODE :
+                status = true;
+                break;
+            default:
+                status = false;
+        }
+
+        return status;
+    }
+
 }

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

@@ -59,7 +59,7 @@ public class CommandOperationDAOImpl extends OperationDAOImpl {
         try {
             Connection connection = OperationManagementDAOFactory.getConnection();
             stmt = connection.prepareStatement(
-                    "UPDATE DM_COMMAND_OPERATION O SET O.ENABLED = ? WHERE O.OPERATION_ID = ?");
+                    "UPDATE DM_COMMAND_OPERATION SET ENABLED = ? WHERE OPERATION_ID = ?");
             stmt.setBoolean(1, operation.isEnabled());
             stmt.setInt(2, operation.getId());
             stmt.executeUpdate();
@@ -134,7 +134,8 @@ public class CommandOperationDAOImpl extends OperationDAOImpl {
             while (rs.next()) {
                 commandOperation = new CommandOperation();
                 commandOperation.setId(rs.getInt("ID"));
-                commandOperation.setEnabled(rs.getInt("ENABLED") != 0);
+                //commandOperation.setEnabled(rs.getInt("ENABLED") != 0);
+                commandOperation.setEnabled(rs.getBoolean("ENABLED") != false);
                 commandOperation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));
                 commandOperation.setType(Operation.Type.valueOf(rs.getString("TYPE")));
                 commandOperation.setCreatedTimeStamp(rs.getString("CREATED_TIMESTAMP"));

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

@@ -82,8 +82,8 @@ public class ConfigOperationDAOImpl extends OperationDAOImpl {
         try {
             super.updateOperation(operation);
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("UPDATE DM_CONFIG_OPERATION O SET O.OPERATION_CONFIG = ? " +
+            stmt = connection.prepareStatement("UPDATE DM_CONFIG_OPERATION SET OPERATION_CONFIG = ? " +
-                    "WHERE O.OPERATION_ID = ?");
+                    "WHERE OPERATION_ID = ?");
             bao = new ByteArrayOutputStream();
             oos = new ObjectOutputStream(bao);
             oos.writeObject(operation);

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

@@ -70,8 +70,8 @@ public class OperationDAOImpl implements OperationDAO {
         PreparedStatement stmt = null;
         try {
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("UPDATE DM_OPERATION O SET O.RECEIVED_TIMESTAMP=? " +
+            stmt = connection.prepareStatement("UPDATE DM_OPERATION SET RECEIVED_TIMESTAMP=? " +
-                    "WHERE O.ID=?");
+                    "WHERE ID=?");
             stmt.setTimestamp(1, new Timestamp(new Date().getTime()));
             stmt.setInt(2, operation.getId());
             stmt.executeUpdate();
@@ -87,8 +87,8 @@ public class OperationDAOImpl implements OperationDAO {
         PreparedStatement stmt = null;
         try {
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("UPDATE DM_ENROLMENT_OP_MAPPING O SET O.STATUS=? " +
+            stmt = connection.prepareStatement("UPDATE DM_ENROLMENT_OP_MAPPING SET STATUS=? " +
-                    "WHERE O.ENROLMENT_ID=? and O.OPERATION_ID=?");
+                    "WHERE ENROLMENT_ID=? and OPERATION_ID=?");
             stmt.setString(1, status.toString());
             stmt.setInt(2, enrolmentId);
             stmt.setInt(3, operationId);

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

@@ -90,8 +90,8 @@ public class PolicyOperationDAOImpl extends OperationDAOImpl {
         try {
             super.updateOperation(operation);
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("UPDATE DM_POLICY_OPERATION O SET O.OPERATION_DETAILS=? " +
+            stmt = connection.prepareStatement("UPDATE DM_POLICY_OPERATION SET OPERATION_DETAILS=? " +
-                    "WHERE O.OPERATION_ID=?");
+                    "WHERE OPERATION_ID=?");
             bao = new ByteArrayOutputStream();
             oos = new ObjectOutputStream(bao);
             oos.writeObject(operation);

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

@@ -90,8 +90,8 @@ public class ProfileOperationDAOImpl extends OperationDAOImpl {
         try {
             super.updateOperation(operation);
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("UPDATE DM_PROFILE_OPERATION O SET O.OPERATION_DETAILS=? " +
+            stmt = connection.prepareStatement("UPDATE DM_PROFILE_OPERATION SET OPERATION_DETAILS=? " +
-                    "WHERE O.OPERATION_ID=?");
+                    "WHERE OPERATION_ID=?");
 
             bao = new ByteArrayOutputStream();
             oos = new ObjectOutputStream(bao);

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/h2.sql

@@ -302,7 +302,6 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
   LAST_FAILED_TIME TIMESTAMP NULL,
   ATTEMPTS INT NULL,
   PRIMARY KEY (ID),
-  UNIQUE INDEX DEVICE_ID_UNIQUE (DEVICE_ID ASC),
   CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
     FOREIGN KEY (POLICY_ID)
     REFERENCES DM_POLICY (ID)

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql

@@ -305,7 +305,6 @@ CREATE TABLE DM_POLICY_COMPLIANCE_STATUS (
   LAST_FAILED_TIME DATETIME2(0) NULL,
   ATTEMPTS INT NULL,
   PRIMARY KEY (ID),
-  CONSTRAINT DEVICE_ID_UNIQUE UNIQUE (DEVICE_ID ASC),
   CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
     FOREIGN KEY (POLICY_ID)
     REFERENCES DM_POLICY (ID)

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mysql.sql

@@ -297,7 +297,6 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
   LAST_FAILED_TIME TIMESTAMP NULL,
   ATTEMPTS INT NULL,
   PRIMARY KEY (ID),
-  UNIQUE INDEX DEVICE_ID_UNIQUE (DEVICE_ID ASC),
   CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
     FOREIGN KEY (POLICY_ID)
     REFERENCES DM_POLICY (ID)

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/oracle.sql

@@ -486,7 +486,6 @@ CREATE TABLE DM_POLICY_COMPLIANCE_STATUS (
   LAST_FAILED_TIME TIMESTAMP(0) NULL,
   ATTEMPTS NUMBER(10) NULL,
   CONSTRAINT PK_DM_POLICY_COMP_STATUS PRIMARY KEY (ID),
-  CONSTRAINT DEVICE_ID_UNIQUE UNIQUE (DEVICE_ID),
   CONSTRAINT FK_POLICY_COMP_STATUS_POLICY
   FOREIGN KEY (POLICY_ID)
   REFERENCES DM_POLICY (ID)

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql

@@ -267,7 +267,6 @@ CREATE TABLE IF NOT EXISTS  DM_POLICY_COMPLIANCE_STATUS (
   ON DELETE NO ACTION
   ON UPDATE NO ACTION
 );
-CREATE UNIQUE INDEX DEVICE_ID_UNIQUE ON DM_POLICY_COMPLIANCE_STATUS (DEVICE_ID ASC);
 
 CREATE TABLE IF NOT EXISTS  DM_POLICY_CHANGE_MGT (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
@@ -316,6 +315,17 @@ CREATE TABLE IF NOT EXISTS  DM_APPLICATION (
   TENANT_ID INTEGER NOT NULL
 );
 
+CREATE TABLE IF NOT EXISTS DM_DEVICE_APPLICATION_MAPPING (
+    ID BIGSERIAL NOT NULL PRIMARY KEY,
+    DEVICE_ID INTEGER NOT NULL,
+    APPLICATION_ID INTEGER NOT NULL,
+    TENANT_ID INTEGER NOT NULL,
+    CONSTRAINT fk_dm_device FOREIGN KEY (DEVICE_ID) REFERENCES
+    DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,
+    CONSTRAINT fk_dm_application FOREIGN KEY (APPLICATION_ID) REFERENCES
+    DM_APPLICATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
+);
+
 -- POLICY RELATED TABLES  FINISHED --
 
 -- NOTIFICATION TABLE --