community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove paylooad property from Operation

Browse Source
This commit is contained in:
manoj 2015-04-08 13:01:43 +05:30
parent 0f55d86b08
commit 1c80fcd124
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/Operation.java
View File

@ -37,7 +37,6 @@ public class Operation {
private Properties properties; private Properties properties;
private Type type; private Type type;
private int id; private int id;
private String payLoad;
private Status status; private Status status;
private String receivedTimeStamp; private String receivedTimeStamp;
private String createdTimeStamp; private String createdTimeStamp;
@ -78,14 +77,6 @@ public class Operation {
this.id = id; this.id = id;
} }
public String getPayLoad() {
return payLoad;
}
public void setPayLoad(String payLoad) {
this.payLoad = payLoad;
}
public Status getStatus() { public Status getStatus() {
return status; return status;
} }

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

@ -51,7 +51,7 @@ public class ProfileOperationDAOImpl extends OperationDAOImpl {
oos = new ObjectOutputStream(bao); oos = new ObjectOutputStream(bao);
oos.writeObject(profileOp); oos.writeObject(profileOp);
stmt = conn.prepareStatement("INSERT INTO DM_PROFILE_OPERATION(OPERATION_ID, OPERATIONDETAILS) " + stmt = conn.prepareStatement("INSERT INTO DM_PROFILE_OPERATION(OPERATION_ID, OPERATION_DETAILS) " +
"VALUES(?, ?)"); "VALUES(?, ?)");
stmt.setInt(1, operationId); stmt.setInt(1, operationId);
stmt.setBytes(2, bao.toByteArray()); stmt.setBytes(2, bao.toByteArray());
@ -89,7 +89,7 @@ public class ProfileOperationDAOImpl extends OperationDAOImpl {
ByteArrayInputStream bais = null; ByteArrayInputStream bais = null;
ObjectInputStream ois = null; ObjectInputStream ois = null;
try { try {
stmt = conn.prepareStatement("SELECT OPERATIONDETAILS FROM DM_PROFILE_OPERATION WHERE OPERATION_ID = ?"); stmt = conn.prepareStatement("SELECT OPERATION_DETAILS FROM DM_PROFILE_OPERATION WHERE OPERATION_ID = ?");
stmt.setInt(1, operationId); stmt.setInt(1, operationId);
rs = stmt.executeQuery(); rs = stmt.executeQuery();
@ -138,7 +138,7 @@ public class ProfileOperationDAOImpl extends OperationDAOImpl {
try { try {
Connection connection = OperationManagementDAOFactory.openConnection(); Connection connection = OperationManagementDAOFactory.openConnection();
stmt = connection.prepareStatement( stmt = connection.prepareStatement(
"SELECT po.OPERATIONDETAILS AS OPERATIONDETAILS " + "SELECT po.OPERATION_DETAILS AS OPERATIONDETAILS " +
"FROM DM_OPERATION o " + "FROM DM_OPERATION o " +
"INNER JOIN DM_PROFILE_OPERATION po ON o.ID = po.OPERATION_ID AND o.ID IN (" + "INNER JOIN DM_PROFILE_OPERATION po ON o.ID = po.OPERATION_ID AND o.ID IN (" +
"SELECT dom.OPERATION_ID FROM (SELECT d.ID FROM DM_DEVICE d INNER JOIN " + "SELECT dom.OPERATION_ID FROM (SELECT d.ID FROM DM_DEVICE d INNER JOIN " +
@ -181,7 +181,7 @@ public class ProfileOperationDAOImpl extends OperationDAOImpl {
try { try {
Connection connection = OperationManagementDAOFactory.openConnection(); Connection connection = OperationManagementDAOFactory.openConnection();
stmt = connection.prepareStatement("UPDATE DM_PROFILE_OPERATION O SET O.OPERATIONDETAILS=? " + stmt = connection.prepareStatement("UPDATE DM_PROFILE_OPERATION O SET O.OPERATION_DETAILS=? " +
"WHERE O.OPERATION_ID=?"); "WHERE O.OPERATION_ID=?");
bao = new ByteArrayOutputStream(); bao = new ByteArrayOutputStream();

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

@ -27,7 +27,6 @@ CREATE TABLE IF NOT EXISTS DM_OPERATION (
CREATED_TIMESTAMP TIMESTAMP NOT NULL, CREATED_TIMESTAMP TIMESTAMP NOT NULL,
RECEIVED_TIMESTAMP TIMESTAMP NULL, RECEIVED_TIMESTAMP TIMESTAMP NULL,
STATUS VARCHAR(50) NULL, STATUS VARCHAR(50) NULL,
PAYLOAD CLOB NULL,
OPERATIONCODE VARCHAR(25) NOT NULL, OPERATIONCODE VARCHAR(25) NOT NULL,
PRIMARY KEY (ID) PRIMARY KEY (ID)
); );
@ -50,7 +49,7 @@ CREATE TABLE IF NOT EXISTS DM_COMMAND_OPERATION (
CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION ( CREATE TABLE IF NOT EXISTS DM_PROFILE_OPERATION (
OPERATION_ID INTEGER NOT NULL, OPERATION_ID INTEGER NOT NULL,
ENABLED INTEGER NOT NULL DEFAULT 0, ENABLED INTEGER NOT NULL DEFAULT 0,
OPERATIONDETAILS BLOB DEFAULT NULL, OPERATION_DETAILS BLOB DEFAULT NULL,
PRIMARY KEY (OPERATION_ID), PRIMARY KEY (OPERATION_ID),
CONSTRAINT fk_dm_operation_profile FOREIGN KEY (OPERATION_ID) REFERENCES CONSTRAINT fk_dm_operation_profile FOREIGN KEY (OPERATION_ID) REFERENCES
DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION