X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=acs%2Fcommon%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Facs%2Fcommon%2FDeviceRPCRequest.java;h=1a1ad5ddf9a626e3cd39f6ecf468a0fe8f82418f;hb=HEAD;hp=16577440dd1cd8b5cf7ad8357cdf5f7de3c27c57;hpb=a58ada8fd244e69cf2ebe48a251fcdd4d48acec4;p=oam%2Ftr069-adapter.git

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
--- 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;
 import java.util.Map;
 
-public class DeviceRPCRequest implements Serializable, Cloneable {
+public class DeviceRPCRequest implements Serializable {
 
   private static final long serialVersionUID = -7300390764969298783L;
 
@@ -33,7 +33,25 @@ public class DeviceRPCRequest implements Serializable, Cloneable {
   private OperationDetails opDetails;
 
   private OperationOptions options;
-  private Map<String, Object> context = new HashMap<>();
+  private transient Map<String, Object> context = new HashMap<>();
+
+  public DeviceRPCRequest(DeviceDetails deviceDetails, Long operationId, OperationDetails opDetails,
+      OperationOptions options, Map<String, Object> context) {
+    super();
+    this.deviceDetails = deviceDetails;
+    this.operationId = operationId;
+    this.opDetails = opDetails;
+    this.options = options;
+    this.context = context;
+  }
+
+  public DeviceRPCRequest(DeviceRPCRequest deviceRPCRequest) {
+    deviceDetails = deviceRPCRequest.deviceDetails;
+    operationId = deviceRPCRequest.operationId;
+    opDetails = deviceRPCRequest.opDetails;
+    options = deviceRPCRequest.options;
+    context = deviceRPCRequest.context;
+  }
 
   public DeviceRPCRequest() {
 
@@ -84,11 +102,6 @@ public class DeviceRPCRequest implements Serializable, Cloneable {
     this.context.put(name, value);
   }
 
-  @Override
-  public Object clone() throws CloneNotSupportedException {
-    return super.clone();
-  }
-
   @Override
   public String toString() {
     return "NBIDeviceOperationRequest [deviceId=" + deviceDetails.getDeviceId() + ", deviceType="