3 files changed, 6 insertions, 49 deletions
diff --git a/src/main/java/org/onap/a1pesimulator/data/ves/Event.java b/src/main/java/org/onap/a1pesimulator/data/ves/Event.java
deleted file mode 100644
index ded1848..0000000
--- a/src/main/java/org/onap/a1pesimulator/data/ves/Event.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2021 Samsung Electronics
- * 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
- */
-
-package org.onap.a1pesimulator.data.ves;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@JsonTypeName("event")
-@JsonTypeInfo(include = As.WRAPPER_OBJECT, use = Id.NAME)
-@JsonInclude(JsonInclude.Include.NON_NULL)
-public class Event {
-
-    private CommonEventHeader commonEventHeader;
-    private FaultFields faultFields;
-
-    private MeasurementFields measurementFields;
-}
diff --git a/src/main/java/org/onap/a1pesimulator/data/ves/GlobalVesConfiguration.java b/src/main/java/org/onap/a1pesimulator/data/ves/GlobalVesConfiguration.java
index 7532573..2d51a50 100644
--- a/src/main/java/org/onap/a1pesimulator/data/ves/GlobalVesConfiguration.java
+++ b/src/main/java/org/onap/a1pesimulator/data/ves/GlobalVesConfiguration.java
@@ -21,5 +21,5 @@ import lombok.Getter;
 public class GlobalVesConfiguration {
 
     private Integer interval;
-    private Event event;
+    private VesEvent event;
 }
diff --git a/src/main/java/org/onap/a1pesimulator/data/ves/RanPeriodicVesEvent.java b/src/main/java/org/onap/a1pesimulator/data/ves/VesEvent.java
index 908f66b..3655ede 100644
--- a/src/main/java/org/onap/a1pesimulator/data/ves/RanPeriodicVesEvent.java
+++ b/src/main/java/org/onap/a1pesimulator/data/ves/VesEvent.java
@@ -13,17 +13,13 @@
 
 package org.onap.a1pesimulator.data.ves;
 
-import java.util.concurrent.ScheduledFuture;
-import lombok.Builder;
+import org.onap.a1pesimulator.data.Event;
+
 import lombok.Data;
-import org.onap.a1pesimulator.service.ves.RanSendVesRunnable;
 
 @Data
-@Builder
-public class RanPeriodicVesEvent {
+public class VesEvent extends Event {
 
-    private Event event;
-    private Integer interval;
-    private ScheduledFuture<?> scheduledFuture;
-    private RanSendVesRunnable sendVesRunnable;
+    private FaultFields faultFields;
+    private MeasurementFields measurementFields;
 }