From 12aed521e5dd8487161bc93de199db624e1258c5 Mon Sep 17 00:00:00 2001 From: Megala Date: Thu, 29 Sep 2016 13:57:06 +0530 Subject: [PATCH] Refactoring code --- .../operation/OracleOperationDAOImpl.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/operation/OracleOperationDAOImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/operation/OracleOperationDAOImpl.java index 07d2f31b7eb..f37419422d3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/operation/OracleOperationDAOImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/operation/OracleOperationDAOImpl.java @@ -44,7 +44,8 @@ import java.util.List; */ public class OracleOperationDAOImpl extends GenericOperationDAOImpl { - @Override public List getOperationsForDevice(int enrolmentId, PaginationRequest request) + @Override + public List getOperationsForDevice(int enrolmentId, PaginationRequest request) throws OperationManagementDAOException { PreparedStatement stmt = null; ResultSet rs = null; @@ -87,7 +88,8 @@ public class OracleOperationDAOImpl extends GenericOperationDAOImpl { return operations; } - @Override public List getOperationsByDeviceAndStatus(int enrolmentId, + @Override + public List getOperationsByDeviceAndStatus(int enrolmentId, PaginationRequest request, Operation.Status status) throws OperationManagementDAOException { PreparedStatement stmt = null; ResultSet rs = null; @@ -131,7 +133,8 @@ public class OracleOperationDAOImpl extends GenericOperationDAOImpl { return operations; } - @Override public void updateEnrollmentOperationsStatus(int enrolmentId, String operationCode, + @Override + public void updateEnrollmentOperationsStatus(int enrolmentId, String operationCode, Operation.Status existingStatus, Operation.Status newStatus) throws OperationManagementDAOException { PreparedStatement stmt = null; ResultSet rs = null; @@ -167,8 +170,8 @@ public class OracleOperationDAOImpl extends GenericOperationDAOImpl { } } - @Override public boolean updateTaskOperation(int enrolmentId, String operationCode) - throws OperationManagementDAOException { + @Override + public boolean updateTaskOperation(int enrolmentId, String operationCode) throws OperationManagementDAOException { PreparedStatement stmt = null; ResultSet rs = null; boolean result = false; @@ -204,8 +207,8 @@ public class OracleOperationDAOImpl extends GenericOperationDAOImpl { return result; } - @Override public List getActivitiesUpdatedAfter(long timestamp, int limit, int offset) - throws OperationManagementDAOException { + @Override + public List getActivitiesUpdatedAfter(long timestamp, int limit, int offset) throws OperationManagementDAOException { PreparedStatement stmt = null; ResultSet rs = null; List activities = new ArrayList<>(); @@ -334,7 +337,8 @@ public class OracleOperationDAOImpl extends GenericOperationDAOImpl { return activities; } - @Override public int getActivityCountUpdatedAfter(long timestamp) throws OperationManagementDAOException { + @Override + public int getActivityCountUpdatedAfter(long timestamp) throws OperationManagementDAOException { PreparedStatement stmt = null; ResultSet rs = null; try {