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/DeviceManagementServiceProviderImpl.java

@@ -357,13 +357,13 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
 
     @Override
     public Operation getNextPendingOperation(DeviceIdentifier deviceId) throws OperationManagementException {
-        return null;
+        return operationManager.getNextPendingOperation(deviceId);
     }
 
     @Override
     public Operation updateOperation(int id, DeviceIdentifier deviceIdentifier,
                                      String payLoad) throws OperationManagementException {
-        return null;
+        return operationManager.updateOperation(id, deviceIdentifier, payLoad);
     }
 
 }

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

@@ -20,20 +20,18 @@ package org.wso2.carbon.device.mgt.core.operation.mgt.dao.impl;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
-import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
+import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationDAO;
-import org.wso2.carbon.device.mgt.core.operation.mgt.dao.*;
+import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOException;
+import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
+import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOUtil;
 
-import javax.sql.DataSource;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
 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.sql.SQLException;
 import java.util.List;
 
 public class OperationDAOImpl implements OperationDAO {
@@ -165,11 +163,11 @@ public class OperationDAOImpl implements OperationDAO {
     }
 
     private Operation.Status getStatus(String status) {
-        return null;
+        return Operation.Status.valueOf(status);
     }
 
     private Operation.Type getType(String type) {
-        return null;
+        return Operation.Type.valueOf(type);
     }
 
 

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

@@ -116,7 +116,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
 
     @Override
     public boolean addOperation(Operation operation,
-            List<DeviceIdentifier> devices) throws OperationManagementException {
+                                List<DeviceIdentifier> devices) throws OperationManagementException {
         return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().addOperation(operation, devices);
     }
 
@@ -133,13 +133,14 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
 
     @Override
     public Operation getNextPendingOperation(DeviceIdentifier deviceId) throws OperationManagementException {
-        return null;
+        return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getNextPendingOperation(deviceId);
     }
 
     @Override
     public Operation updateOperation(int operationId, DeviceIdentifier deviceIdentifier,
                                      String responsePayLoad) throws OperationManagementException {
-        return null;
+        return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
+                updateOperation(operationId, deviceIdentifier, responsePayLoad);
     }
 
     @Override