Resolving warning reported in build - VES Mapper

Changes made to resolve warnings in the build. Change-Id: I03dee6780941881afc65c4b907ade078febb5e39 Issue-ID: DCAEGEN2-604 Signed-off-by: Pooja03 <pm00501616@techmahindra.com>
author: Pooja03 <pm00501616@techmahindra.com> 2019-03-20 19:39:58 +0530
committer: Pooja Malik <PM00501616@techmahindra.com> 2019-03-22 10:09:32 +0000
commit: 5e76fbd802ca4dcf48dac5c9a8f262470a326ef7 (patch)
tree: 0ce8b9549c76ac909c52d503dc0e16820fc09658 /UniversalVesAdapter/src/main
parent: 52f8f061b460c84d03e570958950a2e63a4f6461 (diff)
51 files changed, 391 insertions, 392 deletions
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalMeasurement.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/AdditionalMeasurement.java
index b7d3dce..318e59c 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalMeasurement.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/AdditionalMeasurement.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,15 +17,16 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
 
 
 /**
@@ -33,12 +34,9 @@ import org.apache.commons.lang.builder.ToStringBuilder;
  * 
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
-@JsonPropertyOrder({
-    "name",
-    "hashMap"
-})
+@JsonPropertyOrder({"name", "hashMap"})
 public class AdditionalMeasurement {
-
+    
     /**
      * 
      * (Required)
@@ -47,14 +45,13 @@ public class AdditionalMeasurement {
     @JsonProperty("name")
     private String name;
     /**
-     * an associative array which is an array of key:value pairs
-     * (Required)
+     * an associative array which is an array of key:value pairs (Required)
      * 
      */
     @JsonProperty("hashMap")
     @JsonPropertyDescription("an associative array which is an array of key:value pairs")
     private AlarmAdditionalInformation hashMap;
-
+    
     /**
      * 
      * (Required)
@@ -64,7 +61,7 @@ public class AdditionalMeasurement {
     public String getName() {
         return name;
     }
-
+    
     /**
      * 
      * (Required)
@@ -74,37 +71,35 @@ public class AdditionalMeasurement {
     public void setName(String name) {
         this.name = name;
     }
-
+    
     /**
-     * an associative array which is an array of key:value pairs
-     * (Required)
+     * an associative array which is an array of key:value pairs (Required)
      * 
      */
     @JsonProperty("hashMap")
     public AlarmAdditionalInformation getHashMap() {
         return hashMap;
     }
-
+    
     /**
-     * an associative array which is an array of key:value pairs
-     * (Required)
+     * an associative array which is an array of key:value pairs (Required)
      * 
      */
     @JsonProperty("hashMap")
     public void setHashMap(AlarmAdditionalInformation hashMap) {
         this.hashMap = hashMap;
     }
-
+    
     @Override
     public String toString() {
         return ToStringBuilder.reflectionToString(this);
     }
-
+    
     @Override
     public int hashCode() {
         return new HashCodeBuilder().append(name).append(hashMap).toHashCode();
     }
-
+    
     @Override
     public boolean equals(Object other) {
         if (other == this) {
@@ -116,5 +111,5 @@ public class AdditionalMeasurement {
         AdditionalMeasurement rhs = ((AdditionalMeasurement) other);
         return new EqualsBuilder().append(name, rhs.name).append(hashMap, rhs.hashMap).isEquals();
     }
-
+    
 }
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalObject.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/AdditionalObject.java
index 9b656e2..9f7f871 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalObject.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/AdditionalObject.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalParameter.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/AdditionalParameter.java
index 0a8b8ab..eda4a1b 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AdditionalParameter.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/AdditionalParameter.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AlarmAdditionalInformation.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/AlarmAdditionalInformation.java
index caacd12..afc63f8 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/AlarmAdditionalInformation.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/AlarmAdditionalInformation.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CodecUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/CodecUsageArray.java
index eda48f5..c75279c 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CodecUsageArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/CodecUsageArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CommonEventHeader.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/CommonEventHeader.java
index 48e2c32..a2554f6 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CommonEventHeader.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/CommonEventHeader.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.Date;
 import java.util.HashMap;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CpuUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/CpuUsageArray.java
index 4d075a6..d259abe 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/CpuUsageArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/CpuUsageArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/DiskUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/DiskUsageArray.java
index e505aa6..5f73074 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/DiskUsageArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/DiskUsageArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/EndOfCallVqmSummaries.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/EndOfCallVqmSummaries.java
index 5ddbe43..6fd47fb 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/EndOfCallVqmSummaries.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/EndOfCallVqmSummaries.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Event.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/Event.java
index e2e6265..83ca4f8 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Event.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/Event.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FaultFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/FaultFields.java
index c62bd4c..202317f 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FaultFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/FaultFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FilesystemUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/FilesystemUsageArray.java
index f36ff0f..693bbd5 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/FilesystemUsageArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/FilesystemUsageArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/GtpPerFlowMetrics.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/GtpPerFlowMetrics.java
index e915e5c..c0da0e4 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/GtpPerFlowMetrics.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/GtpPerFlowMetrics.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HeartbeatFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/HeartbeatFields.java
index b650fca..c2f32a1 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HeartbeatFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/HeartbeatFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HugePagesArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/HugePagesArray.java
index 5ffe324..67b63cb 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/HugePagesArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/HugePagesArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/InternalHeaderFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/InternalHeaderFields.java
index 4b34a24..e3b30f8 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/InternalHeaderFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/InternalHeaderFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Ipmi.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/Ipmi.java
index be17bff..4b8fe8e 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/Ipmi.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/Ipmi.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardTemperatureArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiBaseboardTemperatureArray.java
index 1f492a8..6992883 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardTemperatureArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiBaseboardTemperatureArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardVoltageRegulatorArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiBaseboardVoltageRegulatorArray.java
index 0fce2d9..d7a9404 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBaseboardVoltageRegulatorArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiBaseboardVoltageRegulatorArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBatteryArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiBatteryArray.java
index 6c9ab9a..17d29a7 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiBatteryArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiBatteryArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiFanArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiFanArray.java
index c3af417..5b1e110 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiFanArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiFanArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiGlobalAggregateTemperatureMarginArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiGlobalAggregateTemperatureMarginArray.java
index 8c80e35..fd843b3 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiGlobalAggregateTemperatureMarginArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiGlobalAggregateTemperatureMarginArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiHsbpArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiHsbpArray.java
index 751d486..7715879 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiHsbpArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiHsbpArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiNicArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiNicArray.java
index ec84e99..c820319 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiNicArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiNicArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiPowerSupplyArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiPowerSupplyArray.java
index a78ba4a..a3dff4e 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiPowerSupplyArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiPowerSupplyArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiProcessorArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiProcessorArray.java
index e8733fe..829abc1 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/IpmiProcessorArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/IpmiProcessorArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LatencyDistribution.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/LatencyDistribution.java
index 0ca44cd..7bdf886 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LatencyDistribution.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/LatencyDistribution.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LoadArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/LoadArray.java
index 00f5394..5a407c4 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/LoadArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/LoadArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MachineCheckExceptionArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/MachineCheckExceptionArray.java
index fb8c075..47ab244 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MachineCheckExceptionArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/MachineCheckExceptionArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MeasurementFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/MeasurementFields.java
index 2c82fed..a4cd30c 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MeasurementFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/MeasurementFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MemoryUsageArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/MemoryUsageArray.java
index 39f9ea9..a13cc73 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MemoryUsageArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/MemoryUsageArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MobileFlowFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/MobileFlowFields.java
index a29b092..adddaaf 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/MobileFlowFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/MobileFlowFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NicPerformanceArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/NicPerformanceArray.java
index bf5dac6..bb6ea1f 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NicPerformanceArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/NicPerformanceArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NotificationFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/NotificationFields.java
index 973606c..59a50a2 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/NotificationFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/NotificationFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectInstance.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ObjectInstance.java
index 6999537..aab83f0 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectInstance.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ObjectInstance.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectKey.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ObjectKey.java
index e641dc5..b75927b 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ObjectKey.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ObjectKey.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/OtherFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/OtherFields.java
index b38707a..322c023 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/OtherFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/OtherFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/PnfRegistrationFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/PnfRegistrationFields.java
index 3fe8b00..979a1b9 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/PnfRegistrationFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/PnfRegistrationFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessStatsArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ProcessStatsArray.java
index 5e7fe19..3e24c3a 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessStatsArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ProcessStatsArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessorDimmAggregateThermalMarginArray.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ProcessorDimmAggregateThermalMarginArray.java
index 00d8c1b..e5c5de6 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ProcessorDimmAggregateThermalMarginArray.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ProcessorDimmAggregateThermalMarginArray.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SipSignalingFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/SipSignalingFields.java
index 34d4558..9f68b08 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SipSignalingFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/SipSignalingFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/StateChangeFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/StateChangeFields.java
index cf9708f..5aa0626 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/StateChangeFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/StateChangeFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SyslogFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/SyslogFields.java
index c8439e6..ed9f6c9 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/SyslogFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/SyslogFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ThresholdCrossingAlertFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ThresholdCrossingAlertFields.java
index daa9855..ee096e4 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/ThresholdCrossingAlertFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/ThresholdCrossingAlertFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VendorNfNameFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/VendorNfNameFields.java
index f665097..f355cc7 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VendorNfNameFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/VendorNfNameFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VesEvent.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/VesEvent.java
index 9342f0b..b48d50a 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VesEvent.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/VesEvent.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VoiceQualityFields.java b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/VoiceQualityFields.java
index 80572c9..0304b92 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves7_0/VoiceQualityFields.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/dcaegen2/ves/domain/ves70/VoiceQualityFields.java
@@ -2,7 +2,7 @@
 * ============LICENSE_START=======================================================
 * ONAP : DCAE
 * ================================================================================
-* Copyright 2018 TechMahindra
+* Copyright 2019 TechMahindra
 *=================================================================================
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 * limitations under the License.
 * ============LICENSE_END=========================================================
 */
-package org.onap.dcaegen2.ves.domain.ves7_0;
+package org.onap.dcaegen2.ves.domain.ves70;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/adapter/UniversalEventAdapter.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/adapter/UniversalEventAdapter.java
index f17f3a6..484625f 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/adapter/UniversalEventAdapter.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/adapter/UniversalEventAdapter.java
@@ -1,185 +1,185 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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=========================================================
-*/
-package org.onap.universalvesadapter.adapter;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.annotation.PreDestroy;
-
-import org.milyn.Smooks;
-import org.onap.dcaegen2.ves.domain.ves7_0.VesEvent;
-import org.onap.universalvesadapter.exception.ConfigFileSmooksConversionException;
-import org.onap.universalvesadapter.exception.VesException;
-import org.onap.universalvesadapter.service.VESAdapterInitializer;
-import org.onap.universalvesadapter.utils.CollectorConfigPropertyRetrival;
-import org.onap.universalvesadapter.utils.SmooksUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.xml.sax.SAXException;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonSyntaxException;
-
-/**
- * Default implementation of the Generic Adapter
- * 
- * @author kmalbari
- *
- */
-
-@Component
-public class UniversalEventAdapter implements GenericAdapter {
-	 private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
-	 private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
-	 
-	@Value("${defaultConfigFilelocation}")
-	private String defaultConfigFilelocation;
-	private String collectorIdentifierValue;
-	private String collectorIdentifierKey;
-	private Map<String, Smooks> eventToSmooksMapping = new ConcurrentHashMap<>();
-
-	public UniversalEventAdapter() {
-
-	}
-
-	/**
-	 * transforms JSON to VES format and and returns the ves Event
-	 * 
-	 * @param IncomingJason,eventType
-	 * @return ves Event
-	 */
-	@Override
-	public String transform(String incomingJsonString)
-			throws  ConfigFileSmooksConversionException, VesException {
-		String result = "";
-		String configFileData;
-		
-		String identifier[]= CollectorConfigPropertyRetrival.getProperyArray("identifier",defaultConfigFilelocation );
-		String defaultMappingFile="defaultMappingFile-"+Thread.currentThread().getName();
-		try {
-
-				Gson gson = new Gson();
-				JsonObject body = gson.fromJson(incomingJsonString, JsonObject.class);
-				
-				JsonElement results;
-				for(int i=0;i<identifier.length;i++)
-				{
-				JsonObject obj;
-				if((obj=keyObject(body,identifier[i])).has(identifier[i]))
-				{
-					collectorIdentifierKey=identifier[i];
-					 results=obj.get(identifier[i]);
-					 collectorIdentifierValue=results.getAsString();
-					
-				}
-				
-				}
-				//collectorIdentifierValue = collectorIdentifierValue.substring(0, collectorIdentifierValue.length() - 4);
-				if(collectorIdentifierKey.equals("notify OID"))
-				{
-					collectorIdentifierValue = collectorIdentifierValue.substring(0, collectorIdentifierValue.length() - 4);
-				}
-				
-
-				if (VESAdapterInitializer.getMappingFiles().containsKey(collectorIdentifierValue)) {
-					configFileData = VESAdapterInitializer.getMappingFiles().get(collectorIdentifierValue);
-					debugLogger.debug("Using Mapping file as Mapping file is available for collector identifier:{}",collectorIdentifierValue);
-				
-				} else {
-
-					configFileData = VESAdapterInitializer.getMappingFiles().get(defaultMappingFile);
-					
-					debugLogger.debug("Using Default Mapping file as Mapping file is not available for Enterprise Id:{}",collectorIdentifierValue);
-				}
-
-				Smooks smooksTemp = new Smooks(new ByteArrayInputStream(configFileData.getBytes(StandardCharsets.UTF_8)));
-				eventToSmooksMapping.put(collectorIdentifierKey, smooksTemp);
-
-			VesEvent vesEvent = SmooksUtils.getTransformedObjectForInput(smooksTemp,incomingJsonString);
-			debugLogger.info("Incoming json transformed to VES format successfully:"+Thread.currentThread().getName());
-			ObjectMapper objectMapper = new ObjectMapper();
-			result = objectMapper.writeValueAsString(vesEvent);
-			debugLogger.info("Serialized VES json");
-		} catch (JsonProcessingException exception) {
-			throw new VesException("Unable to convert pojo to VES format, Reason :{}", exception);
-		} catch (SAXException | IOException exception) {
-			//Invalid Mapping file
-			exception.printStackTrace();
-			errorLogger.error("Dropping this Trap :{},Reason:{}", incomingJsonString, exception.getMessage()); 
-
-		} catch (JsonSyntaxException exception) {
-			// Invalid Trap
-			errorLogger.error("Dropping this Invalid json Trap :{},  Reason:{}", incomingJsonString, exception);
-		}catch (JsonParseException exception) {
-			// Invalid Trap
-			errorLogger.error("Dropping this Invalid json Trap :{},  Reason:{}", incomingJsonString, exception);
-		} 
-		catch (RuntimeException exception) {
-
-			exception.printStackTrace();
-			errorLogger.error("Dropping this Trap :{},Reason:{}", incomingJsonString, exception.getMessage());
-
-		}
-		return result;
-	}
-
-	/**
-	 * Closes all open smooks' instances before bean is destroyed
-	 */
-	@PreDestroy
-	public void destroy() {
-		for (Smooks smooks : eventToSmooksMapping.values())
-			smooks.close();
-		debugLogger.warn("All Smooks objects closed");
-	}
-	
-	public JsonObject keyObject(JsonObject  object, String searchedKey) {
-	    boolean exists = object.has(searchedKey);
-	    JsonObject jsonObject = object;
-	   
-	    if(!exists) {      
-	        Iterator<?> keys = object.keySet().iterator();
-	        while( keys.hasNext() ) {
-	            String key = (String)keys.next();
-	            if ( object.get(key) instanceof JsonObject ) {
-	            	 
-	            	jsonObject=(JsonObject) object.get(key);
-	            	JsonObject   obj = keyObject(jsonObject, searchedKey);
-	            	exists = obj.has(searchedKey);
-	            }
-	        }
-	    }
-	    
-	    return jsonObject;
-	}
-
-}
+/*
+* ============LICENSE_START=======================================================
+* ONAP : DCAE
+* ================================================================================
+* Copyright 2018-2019 TechMahindra
+*=================================================================================
+* 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=========================================================
+*/
+package org.onap.universalvesadapter.adapter;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.annotation.PreDestroy;
+
+import org.milyn.Smooks;
+import org.onap.dcaegen2.ves.domain.ves70.VesEvent;
+import org.onap.universalvesadapter.exception.ConfigFileSmooksConversionException;
+import org.onap.universalvesadapter.exception.VesException;
+import org.onap.universalvesadapter.service.VESAdapterInitializer;
+import org.onap.universalvesadapter.utils.CollectorConfigPropertyRetrival;
+import org.onap.universalvesadapter.utils.SmooksUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.xml.sax.SAXException;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSyntaxException;
+
+/**
+ * Default implementation of the Generic Adapter
+ * 
+ * @author kmalbari
+ *
+ */
+
+@Component
+public class UniversalEventAdapter implements GenericAdapter {
+	 private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
+	 private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
+	 
+	@Value("${defaultConfigFilelocation}")
+	private String defaultConfigFilelocation;
+	private String collectorIdentifierValue;
+	private String collectorIdentifierKey;
+	private Map<String, Smooks> eventToSmooksMapping = new ConcurrentHashMap<>();
+
+	public UniversalEventAdapter() {
+
+	}
+
+	/**
+	 * transforms JSON to VES format and and returns the ves Event
+	 * 
+	 * @param IncomingJason,eventType
+	 * @return ves Event
+	 */
+	@Override
+	public String transform(String incomingJsonString)
+			throws  ConfigFileSmooksConversionException, VesException {
+		String result = "";
+		String configFileData;
+		
+		String identifier[]= CollectorConfigPropertyRetrival.getProperyArray("identifier",defaultConfigFilelocation );
+		String defaultMappingFile="defaultMappingFile-"+Thread.currentThread().getName();
+		try {
+
+				Gson gson = new Gson();
+				JsonObject body = gson.fromJson(incomingJsonString, JsonObject.class);
+				
+				JsonElement results;
+				for(int i=0;i<identifier.length;i++)
+				{
+				JsonObject obj;
+				if((obj=keyObject(body,identifier[i])).has(identifier[i]))
+				{
+					collectorIdentifierKey=identifier[i];
+					 results=obj.get(identifier[i]);
+					 collectorIdentifierValue=results.getAsString();
+					
+				}
+				
+				}
+				//collectorIdentifierValue = collectorIdentifierValue.substring(0, collectorIdentifierValue.length() - 4);
+				if(collectorIdentifierKey.equals("notify OID"))
+				{
+					collectorIdentifierValue = collectorIdentifierValue.substring(0, collectorIdentifierValue.length() - 4);
+				}
+				
+
+				if (VESAdapterInitializer.getMappingFiles().containsKey(collectorIdentifierValue)) {
+					configFileData = VESAdapterInitializer.getMappingFiles().get(collectorIdentifierValue);
+					debugLogger.debug("Using Mapping file as Mapping file is available for collector identifier:{}",collectorIdentifierValue);
+				
+				} else {
+
+					configFileData = VESAdapterInitializer.getMappingFiles().get(defaultMappingFile);
+					
+					debugLogger.debug("Using Default Mapping file as Mapping file is not available for Enterprise Id:{}",collectorIdentifierValue);
+				}
+
+				Smooks smooksTemp = new Smooks(new ByteArrayInputStream(configFileData.getBytes(StandardCharsets.UTF_8)));
+				eventToSmooksMapping.put(collectorIdentifierKey, smooksTemp);
+
+			VesEvent vesEvent = SmooksUtils.getTransformedObjectForInput(smooksTemp,incomingJsonString);
+			debugLogger.info("Incoming json transformed to VES format successfully:"+Thread.currentThread().getName());
+			ObjectMapper objectMapper = new ObjectMapper();
+			result = objectMapper.writeValueAsString(vesEvent);
+			debugLogger.info("Serialized VES json");
+		} catch (JsonProcessingException exception) {
+			throw new VesException("Unable to convert pojo to VES format, Reason :{}", exception);
+		} catch (SAXException | IOException exception) {
+			//Invalid Mapping file
+			exception.printStackTrace();
+			errorLogger.error("Dropping this Trap :{},Reason:{}", incomingJsonString, exception.getMessage()); 
+
+		} catch (JsonSyntaxException exception) {
+			// Invalid Trap
+			errorLogger.error("Dropping this Invalid json Trap :{},  Reason:{}", incomingJsonString, exception);
+		}catch (JsonParseException exception) {
+			// Invalid Trap
+			errorLogger.error("Dropping this Invalid json Trap :{},  Reason:{}", incomingJsonString, exception);
+		} 
+		catch (RuntimeException exception) {
+
+			exception.printStackTrace();
+			errorLogger.error("Dropping this Trap :{},Reason:{}", incomingJsonString, exception.getMessage());
+
+		}
+		return result;
+	}
+
+	/**
+	 * Closes all open smooks' instances before bean is destroyed
+	 */
+	@PreDestroy
+	public void destroy() {
+		for (Smooks smooks : eventToSmooksMapping.values())
+			smooks.close();
+		debugLogger.warn("All Smooks objects closed");
+	}
+	
+	public JsonObject keyObject(JsonObject  object, String searchedKey) {
+	    boolean exists = object.has(searchedKey);
+	    JsonObject jsonObject = object;
+	   
+	    if(!exists) {      
+	        Iterator<?> keys = object.keySet().iterator();
+	        while( keys.hasNext() ) {
+	            String key = (String)keys.next();
+	            if ( object.get(key) instanceof JsonObject ) {
+	            	 
+	            	jsonObject=(JsonObject) object.get(key);
+	            	JsonObject   obj = keyObject(jsonObject, searchedKey);
+	            	exists = obj.has(searchedKey);
+	            }
+	        }
+	    }
+	    
+	    return jsonObject;
+	}
+
+}
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/SmooksUtils.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/SmooksUtils.java
index 9b341d5..f0fe0ee 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/SmooksUtils.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/SmooksUtils.java
@@ -1,76 +1,76 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : DCAE
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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=========================================================
-*/
-package org.onap.universalvesadapter.utils;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Locale;
-import javax.xml.transform.stream.StreamSource;
-import org.milyn.Smooks;
-import org.milyn.container.ExecutionContext;
-import org.milyn.payload.StringResult;
-import org.onap.dcaegen2.ves.domain.ves7_0.VesEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * Utility methods for smooks module
- * 
- * @author kmalbari
- *
- */
-
-
-public class SmooksUtils {
-
-	
-	 private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
-	 private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");	
-	
-	/**
-	 * converts the incoming json using passed smooks instance and return the pojo representation of VES event
-	 * 
-	 * @param smooks smooks object for the event type
-	 * @param incomingJsonString 
-	 * @return VES json's pojo representation
-	 * @throws IOException
-	 */
-	public static VesEvent getTransformedObjectForInput(Smooks smooks, String incomingJsonString) {
-		
-		debugLogger.info("Transforming incoming json " );
-		ExecutionContext executionContext = smooks.createExecutionContext();
-		debugLogger.info("Context created");
-		Locale defaultLocale = Locale.getDefault();
-        Locale.setDefault(new Locale("en", "IE"));
-
-        StringResult result = new StringResult();
-
-        smooks.filterSource(executionContext, new StreamSource(new ByteArrayInputStream(incomingJsonString.getBytes(StandardCharsets.UTF_8))), result);
-       
-        Locale.setDefault(defaultLocale);
-        VesEvent vesEvent = (VesEvent) executionContext.getBeanContext().getBean("vesEvent");
-        debugLogger.debug("consversion successful to VES Event"); 
-        
-		return vesEvent;
-	}
-
-}
+/*
+* ============LICENSE_START=======================================================
+* ONAP : DCAE
+* ================================================================================
+* Copyright 2018-2019 TechMahindra
+*=================================================================================
+* 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=========================================================
+*/
+package org.onap.universalvesadapter.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import javax.xml.transform.stream.StreamSource;
+import org.milyn.Smooks;
+import org.milyn.container.ExecutionContext;
+import org.milyn.payload.StringResult;
+import org.onap.dcaegen2.ves.domain.ves70.VesEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Utility methods for smooks module
+ * 
+ * @author kmalbari
+ *
+ */
+
+
+public class SmooksUtils {
+
+	
+	 private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
+	 private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");	
+	
+	/**
+	 * converts the incoming json using passed smooks instance and return the pojo representation of VES event
+	 * 
+	 * @param smooks smooks object for the event type
+	 * @param incomingJsonString 
+	 * @return VES json's pojo representation
+	 * @throws IOException
+	 */
+	public static VesEvent getTransformedObjectForInput(Smooks smooks, String incomingJsonString) {
+		
+		debugLogger.info("Transforming incoming json " );
+		ExecutionContext executionContext = smooks.createExecutionContext();
+		debugLogger.info("Context created");
+		Locale defaultLocale = Locale.getDefault();
+        Locale.setDefault(new Locale("en", "IE"));
+
+        StringResult result = new StringResult();
+
+        smooks.filterSource(executionContext, new StreamSource(new ByteArrayInputStream(incomingJsonString.getBytes(StandardCharsets.UTF_8))), result);
+       
+        Locale.setDefault(defaultLocale);
+        VesEvent vesEvent = (VesEvent) executionContext.getBeanContext().getBean("vesEvent");
+        debugLogger.debug("consversion successful to VES Event"); 
+        
+		return vesEvent;
+	}
+
+}
diff --git a/UniversalVesAdapter/src/main/resources/kv.json b/UniversalVesAdapter/src/main/resources/kv.json
index e1b8d2a..c4231cb 100644
--- a/UniversalVesAdapter/src/main/resources/kv.json
+++ b/UniversalVesAdapter/src/main/resources/kv.json
@@ -1,15 +1,15 @@
-{  
-  "app_preferences":{  
-    "collectors":[  
-      {  
-        "identifier":"notification-id",
-        "subscriberTopic":"ONAP-COLLECTOR-RESTCONFTRAP",
-        "mapping-files":[  
-          {  
-            "defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /><\/json:keyMap><\/json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Version._4_0_1<\/jb:expression><jb:expression property='eventType'>'pnfRegistration'<\/jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1<\/jb:expression><jb:expression property='reportingEntityName'>'VESMapper'<\/jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain<\/jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Priority.NORMAL<\/jb:expression><jb:value property='sourceName' data='notification/message/target' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves7_0.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><jb:value property='serialNumber' data='notification/message/content/onu/sn' /><\/jb:bean><\/smooks-resource-list>"
-          }
-        ]
-      }
-    ]
-  }
+{  
+  "app_preferences":{  
+    "collectors":[  
+      {  
+        "identifier":"notification-id",
+        "subscriberTopic":"ONAP-COLLECTOR-RESTCONFTRAP",
+        "mapping-files":[  
+          {  
+            "defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /><\/json:keyMap><\/json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1<\/jb:expression><jb:expression property='eventType'>'pnfRegistration'<\/jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1<\/jb:expression><jb:expression property='reportingEntityName'>'VESMapper'<\/jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain<\/jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMAL<\/jb:expression><jb:value property='sourceName' data='notification/message/target' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><jb:value property='serialNumber' data='notification/message/content/onu/sn' /><\/jb:bean><\/smooks-resource-list>"
+          }
+        ]
+      }
+    ]
+  }
 }
 \ No newline at end of file
diff --git a/UniversalVesAdapter/src/main/resources/kvTest.json b/UniversalVesAdapter/src/main/resources/kvTest.json
index f6c5bac..c4231cb 100644
--- a/UniversalVesAdapter/src/main/resources/kvTest.json
+++ b/UniversalVesAdapter/src/main/resources/kvTest.json
@@ -6,7 +6,7 @@
         "subscriberTopic":"ONAP-COLLECTOR-RESTCONFTRAP",
         "mapping-files":[  
           {  
-            "defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /><\/json:keyMap><\/json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Version._4_0_1<\/jb:expression><jb:expression property='eventType'>'pnfRegistration'<\/jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1<\/jb:expression><jb:expression property='reportingEntityName'>'VESMapper'<\/jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain<\/jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves7_0.CommonEventHeader.Priority.NORMAL<\/jb:expression><jb:value property='sourceName' data='notification/message/target' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves7_0.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves7_0.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><jb:value property='serialNumber' data='notification/message/content/onu/sn' /><\/jb:bean><\/smooks-resource-list>"
+            "defaultMappingFile-ONAP-COLLECTOR-RESTCONFTRAP":"<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /><\/json:keyMap><\/json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1<\/jb:expression><jb:expression property='eventType'>'pnfRegistration'<\/jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1<\/jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1<\/jb:expression><jb:expression property='reportingEntityName'>'VESMapper'<\/jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATION<\/jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain<\/jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1<\/jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMAL<\/jb:expression><jb:value property='sourceName' data='notification/message/target' /><\/jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0<\/jb:expression><jb:value property='serialNumber' data='notification/message/content/onu/sn' /><\/jb:bean><\/smooks-resource-list>"
           }
         ]
       }
author	Pooja03 <pm00501616@techmahindra.com>	2019-03-20 19:39:58 +0530
committer	Pooja Malik <PM00501616@techmahindra.com>	2019-03-22 10:09:32 +0000
commit	5e76fbd802ca4dcf48dac5c9a8f262470a326ef7 (patch)
tree	0ce8b9549c76ac909c52d503dc0e16820fc09658 /UniversalVesAdapter/src/main
parent	52f8f061b460c84d03e570958950a2e63a4f6461 (diff)