2 files changed, 8 insertions, 7 deletions
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java
index 0819a58d5..30459465f 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/CommonHeader.java
@@ -21,13 +21,13 @@
 
 package org.openecomp.appc.domainmodel.lcm;
 
-import java.util.Date;
+import java.time.Instant;
 
 
 public class CommonHeader {
 
     private Flags flags;
-    private Date timestamp;
+    private Instant timestamp;
     private String apiVer;
     private String originatorId;
     private String requestId;
@@ -41,11 +41,11 @@ public class CommonHeader {
         this.flags = flags;
     }
 
-    public Date getTimeStamp() {
+    public Instant getTimeStamp() {
         return timestamp;
     }
 
-    public void setTimestamp(Date timestamp) {
+    public void setTimestamp(Instant timestamp) {
         this.timestamp = timestamp;
     }
 
diff --git a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java
index fd2bcffbf..e47f5469a 100644
--- a/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java
+++ b/appc-dispatcher/appc-dispatcher-common/domain-model-lib/src/main/java/org/openecomp/appc/domainmodel/lcm/RuntimeContext.java
@@ -21,6 +21,7 @@
 
 package org.openecomp.appc.domainmodel.lcm;
 
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -31,7 +32,7 @@ public class RuntimeContext {
     private VNFContext vnfContext;
 
     //TODO move fields timeStart abd isLockAcquired to a better place
-    private Date timeStart;
+    private Instant timeStart;
     private boolean isLockAcquired;
     private String rpcName;
 
@@ -43,7 +44,7 @@ public class RuntimeContext {
         this.rpcName = rpcName;
     }
 
-    public Date getTimeStart() {
+    public Instant getTimeStart() {
         return timeStart;
     }
 
@@ -55,7 +56,7 @@ public class RuntimeContext {
         this.isLockAcquired = isLockAcquired;
     }
 
-    public void setTimeStart(Date timeStart) {
+    public void setTimeStart(Instant timeStart) {
         this.timeStart = timeStart;
     }