VES Heartbeat and Software Management Feature

[oam/tr069-adapter.git] / acs / common / src / main / java / org / commscope / tr069adapter / acs / common / DeviceRPCRequest.java

diff --git a/acs/common/src/main/java/org/commscope/tr069adapter/acs/common/DeviceRPCRequest.java b/acs/common/src/main/java/org/commscope/tr069adapter/acs/common/DeviceRPCRequest.java
index 1657744..1a1ad5d 100644 (file)
--- a/acs/common/src/main/java/org/commscope/tr069adapter/acs/common/DeviceRPCRequest.java
+++ b/acs/common/src/main/java/org/commscope/tr069adapter/acs/common/DeviceRPCRequest.java
@@ -22,7 +22,7 @@ import java.io.Serializable;
 import java.util.HashMap;\r
 import java.util.Map;\r
 \r
-public class DeviceRPCRequest implements Serializable, Cloneable {\r
+public class DeviceRPCRequest implements Serializable {\r
 \r
   private static final long serialVersionUID = -7300390764969298783L;\r
 \r
@@ -33,7 +33,25 @@ public class DeviceRPCRequest implements Serializable, Cloneable {
   private OperationDetails opDetails;\r
 \r
   private OperationOptions options;\r
-  private Map<String, Object> context = new HashMap<>();\r
+  private transient Map<String, Object> context = new HashMap<>();\r
+\r
+  public DeviceRPCRequest(DeviceDetails deviceDetails, Long operationId, OperationDetails opDetails,\r
+      OperationOptions options, Map<String, Object> context) {\r
+    super();\r
+    this.deviceDetails = deviceDetails;\r
+    this.operationId = operationId;\r
+    this.opDetails = opDetails;\r
+    this.options = options;\r
+    this.context = context;\r
+  }\r
+\r
+  public DeviceRPCRequest(DeviceRPCRequest deviceRPCRequest) {\r
+    deviceDetails = deviceRPCRequest.deviceDetails;\r
+    operationId = deviceRPCRequest.operationId;\r
+    opDetails = deviceRPCRequest.opDetails;\r
+    options = deviceRPCRequest.options;\r
+    context = deviceRPCRequest.context;\r
+  }\r
 \r
   public DeviceRPCRequest() {\r
 \r
@@ -84,11 +102,6 @@ public class DeviceRPCRequest implements Serializable, Cloneable {
     this.context.put(name, value);\r
   }\r
 \r
-  @Override\r
-  public Object clone() throws CloneNotSupportedException {\r
-    return super.clone();\r
-  }\r
-\r
   @Override\r
   public String toString() {\r
     return "NBIDeviceOperationRequest [deviceId=" + deviceDetails.getDeviceId() + ", deviceType="\r