Fixing merge conflicts

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

@@ -123,7 +123,7 @@ public class CommandOperationDAOImpl extends OperationDAOImpl {
             String sql = "SELECT o.ID, co1.ENABLED, co1.STATUS, o.TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, " +
                     "o.OPERATION_CODE FROM (SELECT co.OPERATION_ID, co.ENABLED, dm.STATUS " +
                     "FROM DM_COMMAND_OPERATION co INNER JOIN (SELECT ENROLMENT_ID, OPERATION_ID, STATUS " +
-                    "FROM DM_ENROLMENT_OPERATION_MAPPING WHERE ENROLMENT_ID = ? AND STATUS = ?) dm " +
+                    "FROM DM_ENROLMENT_OP_MAPPING WHERE ENROLMENT_ID = ? AND STATUS = ?) dm " +
                     "ON dm.OPERATION_ID = co.OPERATION_ID) co1 INNER JOIN DM_OPERATION o ON co1.OPERATION_ID = o.ID";
 
             stmt = conn.prepareStatement(sql);

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

@@ -164,7 +164,7 @@ public class ConfigOperationDAOImpl extends OperationDAOImpl {
         try {
             Connection conn = OperationManagementDAOFactory.getConnection();
             String sql = "SELECT co.OPERATION_ID, co.OPERATION_CONFIG FROM DM_CONFIG_OPERATION co " +
-                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OPERATION_MAPPING WHERE ENROLMENT_ID = ? " +
+                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING WHERE ENROLMENT_ID = ? " +
                     "AND STATUS = ?) dm ON dm.OPERATION_ID = co.OPERATION_ID";
 
             stmt = conn.prepareStatement(sql);

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

@@ -87,7 +87,7 @@ public class OperationDAOImpl implements OperationDAO {
         PreparedStatement stmt = null;
         try {
             Connection connection = OperationManagementDAOFactory.getConnection();
-            stmt = connection.prepareStatement("UPDATE DM_ENROLMENT_OPERATION_MAPPING O SET O.STATUS=? " +
+            stmt = connection.prepareStatement("UPDATE DM_ENROLMENT_OP_MAPPING O SET O.STATUS=? " +
                     "WHERE O.ENROLMENT_ID=? and O.OPERATION_ID=?");
             stmt.setString(1, status.toString());
             stmt.setInt(2, enrolmentId);
@@ -203,7 +203,7 @@ public class OperationDAOImpl implements OperationDAO {
             String sql = "SELECT o.ID, o.TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, o.STATUS, o.OPERATION_CODE " +
                     " FROM (SELECT ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, STATUS," +
                     "OPERATION_CODE  FROM DM_OPERATION  WHERE id = ?) o INNER JOIN (SELECT * FROM " +
-                    "DM_ENROLMENT_OPERATION_MAPPING dm where dm.OPERATION_ID = ? AND dm.ENROLMENT_ID = ?) om " +
+                    "DM_ENROLMENT_OP_MAPPING dm where dm.OPERATION_ID = ? AND dm.ENROLMENT_ID = ?) om " +
                     "ON o.ID = om.OPERATION_ID ";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, operationId);
@@ -243,7 +243,7 @@ public class OperationDAOImpl implements OperationDAO {
             Connection conn = OperationManagementDAOFactory.getConnection();
             String sql = "SELECT o.ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, OPERATION_CODE " +
                     "FROM DM_OPERATION o " +
-                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OPERATION_MAPPING dm " +
+                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
                     "WHERE dm.ENROLMENT_ID = ? AND dm.STATUS = ?) om ON o.ID = om.OPERATION_ID ORDER BY o.CREATED_TIMESTAMP ASC";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, enrolmentId);
@@ -283,7 +283,7 @@ public class OperationDAOImpl implements OperationDAO {
             Connection conn = OperationManagementDAOFactory.getConnection();
             String sql = "SELECT o.ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, " +
                     "OPERATION_CODE, om.STATUS  FROM DM_OPERATION o " +
-                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OPERATION_MAPPING dm " +
+                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
                     "WHERE dm.ENROLMENT_ID = ?) om ON o.ID = om.OPERATION_ID ORDER BY o.CREATED_TIMESTAMP ASC";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, enrolmentId);
@@ -320,7 +320,7 @@ public class OperationDAOImpl implements OperationDAO {
             Connection connection = OperationManagementDAOFactory.getConnection();
             stmt = connection.prepareStatement("SELECT o.ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, " +
                     "OPERATION_CODE  FROM DM_OPERATION o " +
-                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OPERATION_MAPPING dm " +
+                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
                     "WHERE dm.ENROLMENT_ID = ? AND dm.STATUS = ?) om ON o.ID = om.OPERATION_ID " +
                     "ORDER BY o.CREATED_TIMESTAMP ASC LIMIT 1");
             stmt.setInt(1, enrolmentId);
@@ -361,7 +361,7 @@ public class OperationDAOImpl implements OperationDAO {
             String sql = "SELECT o.ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, OPERATION_CODE FROM " +
                     "(SELECT o.ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, OPERATION_CODE " +
                     "FROM DM_OPERATION o WHERE o.TYPE = ?) o " +
-                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OPERATION_MAPPING dm " +
+                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
                     "WHERE dm.ENROLMENT_ID = ? AND dm.STATUS = ?) om ON o.ID = om.OPERATION_ID ORDER BY o.CREATED_TIMESTAMP ASC";
 
             stmt = conn.prepareStatement(sql);

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

@@ -35,7 +35,7 @@ public class OperationMappingDAOImpl implements OperationMappingDAO {
         PreparedStatement stmt = null;
         try {
             Connection conn = OperationManagementDAOFactory.getConnection();
-            String sql = "INSERT INTO DM_ENROLMENT_OPERATION_MAPPING(ENROLMENT_ID, OPERATION_ID, STATUS) VALUES (?, ?,?)";
+            String sql = "INSERT INTO DM_ENROLMENT_OP_MAPPING(ENROLMENT_ID, OPERATION_ID, STATUS) VALUES (?, ?,?)";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, deviceId);
             stmt.setInt(2, operationId);
@@ -54,7 +54,7 @@ public class OperationMappingDAOImpl implements OperationMappingDAO {
         PreparedStatement stmt = null;
         try {
             Connection conn = OperationManagementDAOFactory.getConnection();
-            String sql = "DELETE FROM DM_ENROLMENT_OPERATION_MAPPING WHERE ENROLMENT_ID = ? AND OPERATION_ID = ?";
+            String sql = "DELETE FROM DM_ENROLMENT_OP_MAPPING WHERE ENROLMENT_ID = ? AND OPERATION_ID = ?";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, 0);
             stmt.setInt(2, 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

@@ -164,7 +164,7 @@ public class PolicyOperationDAOImpl extends OperationDAOImpl {
         try {
             Connection conn = OperationManagementDAOFactory.getConnection();
             String sql = "SELECT po.OPERATION_ID, ENABLED, OPERATION_DETAILS FROM DM_POLICY_OPERATION po " +
-                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OPERATION_MAPPING WHERE ENROLMENT_ID = ? " +
+                    "INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING WHERE ENROLMENT_ID = ? " +
                     "AND STATUS = ?) dm ON dm.OPERATION_ID = po.OPERATION_ID";
 
             stmt = conn.prepareStatement(sql);

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

@@ -167,7 +167,7 @@ public class ProfileOperationDAOImpl extends OperationDAOImpl {
             Connection conn = OperationManagementDAOFactory.getConnection();
             String sql = "Select po.OPERATION_ID, ENABLED, OPERATION_DETAILS from DM_PROFILE_OPERATION po " +
                     "INNER JOIN  " +
-                    "(Select * From DM_ENROLMENT_OPERATION_MAPPING WHERE ENROLMENT_ID=? " +
+                    "(Select * From DM_ENROLMENT_OP_MAPPING WHERE ENROLMENT_ID=? " +
                     "AND STATUS=?) dm ON dm.OPERATION_ID = po.OPERATION_ID";
 
             stmt = conn.prepareStatement(sql);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql

@@ -64,7 +64,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OPERATION_MAPPING (
+CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql

@@ -79,7 +79,7 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OPERATION_MAPPING (
+CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,

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

@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OPERATION_MAPPING (
+CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,

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

@@ -73,7 +73,7 @@ CREATE TABLE DM_ENROLMENT (
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE TABLE DM_ENROLMENT_OPERATION_MAPPING (
+CREATE TABLE DM_ENROLMENT_OP_MAPPING (
     ID INTEGER IDENTITY NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,
@@ -400,4 +400,3 @@ CREATE TABLE DM_NOTIFICATION (
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 -- NOTIFICATION TABLE END --
-

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

@@ -81,7 +81,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
 )ENGINE = InnoDB;
 
 
-CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OPERATION_MAPPING (
+CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OP_MAPPING (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,
@@ -397,4 +397,3 @@ CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
 )ENGINE = InnoDB;
 
 -- END NOTIFICATION TABLES --
-

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

@@ -117,7 +117,7 @@ BEGIN
 END;
 /
 
-CREATE TABLE DM_ENROLMENT_OPERATION_MAPPING (
+CREATE TABLE DM_ENROLMENT_OP_MAPPING (
     ID NUMBER(10) NOT NULL,
     ENROLMENT_ID NUMBER(10) NOT NULL,
     OPERATION_ID NUMBER(10) NOT NULL,
@@ -130,13 +130,13 @@ CREATE TABLE DM_ENROLMENT_OPERATION_MAPPING (
 );
 
 -- Generate ID using sequence and trigger
-CREATE SEQUENCE DM_ENROLMENT_OPERATION_MAPPING_seq START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE DM_ENROLMENT_OP_MAPPING_seq START WITH 1 INCREMENT BY 1;
 
-CREATE OR REPLACE TRIGGER DM_ENROLMENT_OPERATION_MAPPING_seq_tr
+CREATE OR REPLACE TRIGGER DM_ENROLMENT_OP_MAPPING_seq_tr
- BEFORE INSERT ON DM_ENROLMENT_OPERATION_MAPPING FOR EACH ROW
+ BEFORE INSERT ON DM_ENROLMENT_OP_MAPPING FOR EACH ROW
  WHEN (NEW.ID IS NULL)
 BEGIN
- SELECT DM_ENROLMENT_OPERATION_MAPPING_seq.NEXTVAL INTO :NEW.ID FROM DUAL;
+ SELECT DM_ENROLMENT_OP_MAPPING_seq.NEXTVAL INTO :NEW.ID FROM DUAL;
 END;
 /
 

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

@@ -69,7 +69,7 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-CREATE TABLE IF NOT EXISTS DM_ENROLMENT_OPERATION_MAPPING (
+CREATE TABLE IF NOT EXISTS  DM_ENROLMENT_OP_MAPPING (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   ENROLMENT_ID INTEGER NOT NULL,
   OPERATION_ID INTEGER NOT NULL,
@@ -93,7 +93,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
 
 -- POLICY RELATED TABLES ---
 
-CREATE  TABLE IF NOT EXISTS DM_PROFILE (
+CREATE  TABLE DM_PROFILE (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   PROFILE_NAME VARCHAR(45) NOT NULL ,
   TENANT_ID INTEGER NOT NULL ,
@@ -107,8 +107,7 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE (
   ON UPDATE NO ACTION
 );
 
-
+CREATE  TABLE DM_POLICY (
-CREATE  TABLE IF NOT EXISTS DM_POLICY (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   NAME VARCHAR(45) DEFAULT NULL ,
   DESCRIPTION VARCHAR(1000) NULL,
@@ -126,7 +125,7 @@ CREATE  TABLE IF NOT EXISTS DM_POLICY (
   ON UPDATE NO ACTION
 );
 
-CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
+CREATE  TABLE DM_DEVICE_POLICY (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   DEVICE_ID INTEGER NOT NULL ,
   ENROLMENT_ID INTEGER NOT NULL,
@@ -144,7 +143,7 @@ CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY (
   ON UPDATE NO ACTION
 );
 
-CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
+CREATE  TABLE DM_DEVICE_TYPE_POLICY (
   ID INTEGER NOT NULL,
   DEVICE_TYPE_ID INTEGER NOT NULL ,
   POLICY_ID INTEGER NOT NULL ,
@@ -161,7 +160,7 @@ CREATE  TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY (
   ON UPDATE NO ACTION
 );
 
-CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
+CREATE  TABLE DM_PROFILE_FEATURES (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   PROFILE_ID INTEGER NOT NULL,
   FEATURE_CODE VARCHAR(30) NOT NULL,
@@ -175,7 +174,7 @@ CREATE  TABLE IF NOT EXISTS DM_PROFILE_FEATURES (
   ON UPDATE NO ACTION
 );
 
-CREATE  TABLE IF NOT EXISTS DM_ROLE_POLICY (
+CREATE  TABLE DM_ROLE_POLICY (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   ROLE_NAME VARCHAR(45) NOT NULL ,
   POLICY_ID INTEGER NOT NULL,
@@ -186,7 +185,7 @@ CREATE  TABLE IF NOT EXISTS DM_ROLE_POLICY (
   ON UPDATE NO ACTION
 );
 
-CREATE  TABLE IF NOT EXISTS DM_USER_POLICY (
+CREATE  TABLE DM_USER_POLICY (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   POLICY_ID INT NOT NULL ,
   USERNAME VARCHAR(45) NOT NULL,
@@ -197,7 +196,7 @@ CREATE  TABLE IF NOT EXISTS DM_USER_POLICY (
   ON UPDATE NO ACTION
 );
 
-CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY_APPLIED (
+CREATE  TABLE DM_DEVICE_POLICY_APPLIED (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   DEVICE_ID INTEGER NOT NULL ,
   ENROLMENT_ID INTEGER NOT NULL,
@@ -256,7 +255,6 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CRITERIA_PROPERTIES (
 );
 COMMENT ON COLUMN DM_POLICY_CRITERIA_PROPERTIES.CONTENT IS 'This is used to ';
 
-
 CREATE TABLE IF NOT EXISTS  DM_POLICY_COMPLIANCE_STATUS (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   DEVICE_ID INTEGER NOT NULL,
@@ -276,7 +274,6 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
 );
 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,
   POLICY_ID INTEGER NOT NULL,
@@ -284,7 +281,6 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT (
   TENANT_ID INTEGER NOT NULL
 );
 
-
 CREATE TABLE IF NOT EXISTS  DM_POLICY_COMPLIANCE_FEATURES (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   COMPLIANCE_STATUS_ID INTEGER NOT NULL,
@@ -298,7 +294,6 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_FEATURES (
   ON UPDATE NO ACTION
 );
 
-
 CREATE TABLE IF NOT EXISTS  DM_ENROLMENT (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   DEVICE_ID INTEGER NOT NULL,
@@ -312,7 +307,6 @@ CREATE TABLE IF NOT EXISTS DM_ENROLMENT (
     DM_DEVICE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
 
-
 CREATE TABLE IF NOT EXISTS  DM_APPLICATION (
   ID BIGSERIAL NOT NULL PRIMARY KEY,
   NAME VARCHAR(50) NOT NULL,
@@ -342,5 +336,5 @@ CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
   CONSTRAINT fk_dm_operation_notification FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
 );
--- NOTIFICATION TABLE END --
 
+-- NOTIFICATION TABLE END --