SECARSP-295 +Implement AuditTrail reports collector

[platform/core/security/suspicious-activity-monitor.git] / server / samserver / src / main / java / com / samsung / samserver / web / rest / service / vm / Data.java

diff --git a/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/vm/Data.java b/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/vm/Data.java
index 359c681..040851e 100644 (file)
--- a/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/vm/Data.java
+++ b/server/samserver/src/main/java/com/samsung/samserver/web/rest/service/vm/Data.java
@@ -21,7 +21,8 @@ import lombok.*;
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "type", visible = true)
 @JsonSubTypes({
-        @JsonSubTypes.Type(value = Data.DataLogs.class, name = "report"),
+        @JsonSubTypes.Type(value = Data.DataLogs.class, name = "report-old"),
+        @JsonSubTypes.Type(value = Data.DataReports.class, name = "report"),
         @JsonSubTypes.Type(value = Data.DataPolicies.class, name = "state-policy"),
 })
 public interface Data {
@@ -29,7 +30,7 @@ public interface Data {
     String getType();
     List getData();
 
-    @JsonRootName("report")
+    @JsonRootName("report-old")
     @Getter @Setter @ToString
     class DataLogs implements Data{
 
@@ -51,6 +52,28 @@ public interface Data {
         }
     }
 
+    @JsonRootName("report")
+    @Getter @Setter @ToString
+    class DataReports implements Data{
+
+        @NotNull
+        private String type;
+
+        private String ctime;
+
+        @Valid
+        @JsonProperty("data")
+        private List<DReport> reports;
+
+        public String getType(){
+            return type;
+        }
+
+        public List<DReport> getData(){
+            return reports;
+        }
+    }
+
     @JsonRootName("state-policy")
     @Getter @Setter @ToString
     class DataPolicies implements Data{