X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-impl%2Fappc%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fappc%2FCommonHeader.java;h=058323412088050d8ba39e87924f1b2c092e714e;hb=9b3ff5f270572a6760ff07dda9577cdadb53b088;hp=a3859b4aea4cab84f32d1ec62b412f22c0feebb1;hpb=96585ff6166369ae6c3f5326e56d55114ae6a3e0;p=policy%2Fmodels.git

diff --git a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
index a3859b4ae..058323412 100644
--- a/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
+++ b/models-interactions/model-impl/appc/src/main/java/org/onap/policy/appc/CommonHeader.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * appc
  * ================================================================================
- * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,13 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 
+@Getter
+@Setter
+@EqualsAndHashCode
 public class CommonHeader implements Serializable {
     private static final long serialVersionUID = -3581658269910980336L;
 
@@ -54,7 +60,9 @@ public class CommonHeader implements Serializable {
     @SerializedName("Flags")
     private Collection<Map<String, String>> flags = new ArrayList<>();
 
-    public CommonHeader() {}
+    public CommonHeader() {
+        // Default constructor
+    }
 
     /**
      * Construct an instance from an existing instance.
@@ -65,6 +73,8 @@ public class CommonHeader implements Serializable {
         this.originatorId = commonHeader.originatorId;
         this.requestId = commonHeader.requestId;
         this.subRequestId = commonHeader.subRequestId;
+        this.timeStamp = commonHeader.getTimeStamp();
+        this.apiVer = commonHeader.getApiVer();
         if (commonHeader.requestTrack != null) {
             this.requestTrack.addAll(commonHeader.requestTrack);
         }
@@ -73,145 +83,10 @@ public class CommonHeader implements Serializable {
         }
     }
 
-    public Instant getTimeStamp() {
-        return timeStamp;
-    }
-
-    public void setTimeStamp(Instant timeStamp) {
-        this.timeStamp = timeStamp;
-    }
-
-    public String getApiVer() {
-        return apiVer;
-    }
-
-    public void setApiVer(String apiVer) {
-        this.apiVer = apiVer;
-    }
-
-    public String getOriginatorId() {
-        return originatorId;
-    }
-
-    public void setOriginatorId(String originatorId) {
-        this.originatorId = originatorId;
-    }
-
-    public UUID getRequestId() {
-        return requestId;
-    }
-
-    public void setRequestId(UUID requestId) {
-        this.requestId = requestId;
-    }
-
-    public String getSubRequestId() {
-        return subRequestId;
-    }
-
-    public void setSubRequestId(String subRequestId) {
-        this.subRequestId = subRequestId;
-    }
-
-    public Collection<String> getRequestTrack() {
-        return requestTrack;
-    }
-
-    public void setRequestTrack(Collection<String> requestTrack) {
-        this.requestTrack = requestTrack;
-    }
-
-    public Collection<Map<String, String>> getFlags() {
-        return flags;
-    }
-
-    public void setFlags(Collection<Map<String, String>> flags) {
-        this.flags = flags;
-    }
-
     @Override
     public String toString() {
         return "CommonHeader [TimeStamp=" + timeStamp + ", APIver=" + apiVer + ", OriginatorId=" + originatorId
                 + ", RequestId=" + requestId + ", SubrequestId=" + subRequestId + ", RequestTrack=" + requestTrack
                 + ", Flags=" + flags + "]";
     }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((apiVer == null) ? 0 : apiVer.hashCode());
-        result = prime * result + ((flags == null) ? 0 : flags.hashCode());
-        result = prime * result + ((originatorId == null) ? 0 : originatorId.hashCode());
-        result = prime * result + ((requestId == null) ? 0 : requestId.hashCode());
-        result = prime * result + ((requestTrack == null) ? 0 : requestTrack.hashCode());
-        result = prime * result + ((subRequestId == null) ? 0 : subRequestId.hashCode());
-        result = prime * result + ((timeStamp == null) ? 0 : timeStamp.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        CommonHeader other = (CommonHeader) obj;
-        if (apiVer == null) {
-            if (other.apiVer != null) {
-                return false;
-            }
-        } else if (!apiVer.equals(other.apiVer)) {
-            return false;
-        }
-        if (flags == null) {
-            if (other.flags != null) {
-                return false;
-            }
-        } else if (!flags.equals(other.flags)) {
-            return false;
-        }
-        if (originatorId == null) {
-            if (other.originatorId != null) {
-                return false;
-            }
-        } else if (!originatorId.equals(other.originatorId)) {
-            return false;
-        }
-        if (requestId == null) {
-            if (other.requestId != null) {
-                return false;
-            }
-        } else if (!requestId.equals(other.requestId)) {
-            return false;
-        }
-        if (requestTrack == null) {
-            if (other.requestTrack != null) {
-                return false;
-            }
-        } else if (!requestTrack.equals(other.requestTrack)) {
-            return false;
-        }
-        if (subRequestId == null) {
-            if (other.subRequestId != null) {
-                return false;
-            }
-        } else if (!subRequestId.equals(other.subRequestId)) {
-            return false;
-        }
-        if (timeStamp == null) {
-            if (other.timeStamp != null) {
-                return false;
-            }
-        } else if (!timeStamp.equals(other.timeStamp)) {
-            return false;
-        }
-        return true;
-    }
-
 }