Clean up MdcData and ImportMetadata

Removed duplicated class. Added assertions to check the logic.

Change-Id: Ia953ee0c88d71214cf620cdd286f6ecdd3f3d26d
Issue-ID: SDC-2326
Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>

3 files changed, 37 insertions, 118 deletions

diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/ImportMetadata.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/ImportMetadata.java
index 0d0aa7bd4c..c74c510206 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/ImportMetadata.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/ImportMetadata.java
@@ -16,65 +16,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ * Modifications copyright (c) 2019 Nokia
+ * ================================================================================
  */
 
 package org.openecomp.sdc.fe.impl;
 
-public class ImportMetadata {
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 
+@NoArgsConstructor
+@AllArgsConstructor
+@Getter
+@Setter
+public class ImportMetadata {
 	private String name;
 	private long size;
 	private String mime;
 	private String creator;
 	private String md5Checksum;
-
-	public ImportMetadata(String name, long size, String mime, String creator, String md5Checksum) {
-		super();
-		this.name = name;
-		this.size = size;
-		this.mime = mime;
-		this.creator = creator;
-		this.md5Checksum = md5Checksum;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public long getSize() {
-		return size;
-	}
-
-	public void setSize(long size) {
-		this.size = size;
-	}
-
-	public String getMime() {
-		return mime;
-	}
-
-	public void setMime(String mime) {
-		this.mime = mime;
-	}
-
-	public String getCreator() {
-		return creator;
-	}
-
-	public void setCreator(String creator) {
-		this.creator = creator;
-	}
-
-	public String getMd5Checksum() {
-		return md5Checksum;
-	}
-
-	public void setMd5Checksum(String md5Checksum) {
-		this.md5Checksum = md5Checksum;
-	}
-
 }
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/MdcData.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/MdcData.java
index 816975fa04..e95f6b8073 100644
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/MdcData.java
+++ b/catalog-fe/src/main/java/org/openecomp/sdc/fe/impl/MdcData.java
@@ -1,38 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ * Modifications copyright (c) 2019 Nokia
+ * ================================================================================
+ */
 package org.openecomp.sdc.fe.impl;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
 public class MdcData {
 		private String serviceInstanceID;
 		private String userId;
 		private String remoteAddr;
 		private String localAddr;
 		private Long transactionStartTime;
-
-		public MdcData(String serviceInstanceID, String userId, String remoteAddr, String localAddr, Long transactionStartTime) {
-			super();
-			this.serviceInstanceID = serviceInstanceID;
-			this.userId = userId;
-			this.remoteAddr = remoteAddr;
-			this.localAddr = localAddr;
-			this.transactionStartTime = transactionStartTime;
-		}
-
-		public Long getTransactionStartTime() {
-			return transactionStartTime;
-		}
-
-		public String getUserId() {
-			return userId;
-		}
-
-		public String getRemoteAddr() {
-			return remoteAddr;
-		}
-
-		public String getLocalAddr() {
-			return localAddr;
-		}
-
-		public String getServiceInstanceID() {
-			return serviceInstanceID;
-		}
 	}
\ No newline at end of file
diff --git a/catalog-fe/src/main/java/org/openecomp/sdc/fe/mdc/MdcData.java b/catalog-fe/src/main/java/org/openecomp/sdc/fe/mdc/MdcData.java
deleted file mode 100644
index aa78a89eaf..0000000000
--- a/catalog-fe/src/main/java/org/openecomp/sdc/fe/mdc/MdcData.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.openecomp.sdc.fe.mdc;
-
-public class MdcData {
-    private String serviceInstanceID;
-    private String userId;
-    private String remoteAddr;
-    private String localAddr;
-    private Long transactionStartTime;
-
-    public MdcData(String serviceInstanceID, String userId, String remoteAddr, String localAddr, Long transactionStartTime) {
-        super();
-        this.serviceInstanceID = serviceInstanceID;
-        this.userId = userId;
-        this.remoteAddr = remoteAddr;
-        this.localAddr = localAddr;
-        this.transactionStartTime = transactionStartTime;
-    }
-
-    public Long getTransactionStartTime() {
-        return transactionStartTime;
-    }
-
-    public String getUserId() {
-        return userId;
-    }
-
-    public String getRemoteAddr() {
-        return remoteAddr;
-    }
-
-    public String getLocalAddr() {
-        return localAddr;
-    }
-
-    public String getServiceInstanceID() {
-        return serviceInstanceID;
-    }
-}