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

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

@@ -32,6 +32,7 @@ public class Operation {
 	private String code;
 	private Properties properties;
 	private Type type;
+    private Long operationId;
 
 	@XmlElement
 	public String getCode() {
@@ -59,4 +60,14 @@ public class Operation {
 	public void setType(Type type) {
 		this.type = type;
 	}
+
+    public Long getOperationId() {
+        return operationId;
+    }
+
+    public void setOperationId(Long operationId) {
+        this.operationId = operationId;
+    }
+
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java

@@ -17,8 +17,7 @@
  */
 package org.wso2.carbon.device.mgt.common.operation.mgt;
 
-import org.wso2.carbon.device.mgt.common.*;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-
 import java.util.List;
 
 /**
@@ -27,35 +26,37 @@ import java.util.List;
  */
 public interface OperationManager {
 
-	/**
+    /**
-	 * Method to add a operation to a device or a set of devices.
+     * Method to add a operation to a device or a set of devices.
-	 *
+     *
-	 * @param operation Operation to be added
+     * @param operation Operation to be added
-	 * @param devices   List of DeviceIdentifiers to execute the operation
+     * @param devices   List of DeviceIdentifiers to execute the operation
-	 * @throws OperationManagementException If some unusual behaviour is observed while adding the
+     * @throws OperationManagementException If some unusual behaviour is observed while adding the
-	 * operation
+     * operation
-	 */
+     */
-	public boolean addOperation(Operation operation,
+    public boolean addOperation(Operation operation,
-                                List<DeviceIdentifier> devices) throws OperationManagementException;
+            List<DeviceIdentifier> devices) throws OperationManagementException;
-
+
-	/**
+    /**
-	 * Method to retrieve the list of all operations to a device.
+     * Method to retrieve the list of all operations to a device.
-	 *
+     *
-	 * @param deviceId DeviceIdentifier of the device
+     * @param deviceId DeviceIdentifier of the device
-	 * @throws OperationManagementException If some unusual behaviour is observed while fetching the
+     * @throws OperationManagementException If some unusual behaviour is observed while fetching the
-	 * operation list.
+     * operation list.
-	 */
+     */
-	public List<Operation> getOperations(DeviceIdentifier deviceId) throws OperationManagementException;
+    public List<Operation> getOperations(DeviceIdentifier deviceId) throws OperationManagementException;
-
+
-	/**
+    /**
-	 * Method to retrieve the list of available operations to a device.
+     * Method to retrieve the list of available operations to a device.
-	 *
+     *
-	 * @param deviceId DeviceIdentifier of the device
+     * @param deviceId DeviceIdentifier of the device
-	 * @throws OperationManagementException If some unusual behaviour is observed while fetching the
+     * @throws OperationManagementException If some unusual behaviour is observed while fetching the
-	 * operation list.
+     * operation list.
-	 */
+     */
-	public List<Operation> getPendingOperations(DeviceIdentifier deviceId) throws OperationManagementException;
+    public List<Operation> getPendingOperations(DeviceIdentifier deviceId) throws OperationManagementException;
 
     public Operation getPendingOperation(DeviceIdentifier deviceId) throws OperationManagementException;
 
+    public Operation updateOperation(Long operationId, DeviceIdentifier deviceIdentifier, String responsePayLoad)
+            throws OperationManagementException;
 }

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

@@ -360,4 +360,10 @@ public class DeviceManagementServiceProviderImpl implements DeviceManagementServ
         return null;
     }
 
+    @Override
+    public Operation updateOperation(Long operationId, DeviceIdentifier deviceIdentifier,
+            String responsePayLoad) throws OperationManagementException {
+        return null;
+    }
+
 }

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

@@ -103,6 +103,12 @@ public class OperationManagerImpl implements OperationManager {
         return null;
     }
 
+    @Override
+    public Operation updateOperation(Long operationId, DeviceIdentifier deviceIdentifier,
+            String responsePayLoad) throws OperationManagementException {
+        return null;
+    }
+
     private OperationDAO lookupOperationDAO(Operation operation) {
         if (operation instanceof CommandOperation) {
             return commandOperationDAO;
@@ -112,5 +118,4 @@ public class OperationManagerImpl implements OperationManager {
             return simpleOperationDAO;
         }
     }
-
 }

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

@@ -135,10 +135,17 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         return null;
     }
 
+    @Override
+    public Operation updateOperation(Long operationId, DeviceIdentifier deviceIdentifier,
+            String responsePayLoad) throws OperationManagementException {
+        return null;
+    }
+
     @Override
     public void sendEnrolmentInvitation(EmailMessageProperties emailMessageProperties) throws DeviceManagementException {
         DeviceManagementDataHolder.getInstance().getDeviceManagementProvider()
                 .sendEnrolmentInvitation(emailMessageProperties);
     }
 
+
 }