From e24a08945dbedc391abfd15d19fe363f64847c39 Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Sat, 11 Jan 2025 18:43:35 +0200
Subject: [PATCH] fixes for metrico events

---
 .../osl/tmf/pm628/model/ManagementJob.java    | 23 +++++++++++++++++--
 .../osl/tmf/pm628/model/ManagementJobFVO.java | 22 ++++++++++++++++--
 .../MeasurementCollectionJobCreateEvent.java  |  1 -
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java
index f9516f5..702c367 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java
@@ -41,7 +41,6 @@ public class ManagementJob extends BaseRootEntity {
   @JsonProperty("adminState")
   private AdministrativeState adminState;
 
-  @JsonProperty("creationTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime creationTime;
 
@@ -73,7 +72,6 @@ public class ManagementJob extends BaseRootEntity {
   @JsonProperty("jobPriority")
   private Integer jobPriority = 5;
 
-  @JsonProperty("lastModifiedTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime lastModifiedTime;
 
@@ -130,6 +128,17 @@ public class ManagementJob extends BaseRootEntity {
   @Valid 
   @Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("creationTime")
+  public String getCreationTimeStr() {
+    return creationTime.toString();
+  }
+  
+  public void setCreationTime(String t) {
+    if ( t!= null ) {
+        this.creationTime = OffsetDateTime.parse( t );
+    }
+  }
+  
+  
   public OffsetDateTime getCreationTime() {
     return creationTime;
   }
@@ -268,6 +277,16 @@ public class ManagementJob extends BaseRootEntity {
   @Valid 
   @Schema(name = "lastModifiedTime", description = "The last time that a measurement job was modified.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastModifiedTime")
+  public String getLastModifiedTimeStr() {
+    return lastModifiedTime.toString();
+  }
+  
+  public void setLastModifiedTime(String t) {
+    if ( t!= null ) {
+        this.lastModifiedTime = OffsetDateTime.parse( t );
+    }
+  }
+  
   public OffsetDateTime getLastModifiedTime() {
     return lastModifiedTime;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java
index 8ac27c8..cafc616 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java
@@ -55,7 +55,6 @@ public class ManagementJobFVO {
   @JsonProperty("adminState")
   private AdministrativeState adminState;
 
-  @JsonProperty("creationTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime creationTime;
 
@@ -76,7 +75,6 @@ public class ManagementJobFVO {
   @JsonProperty("jobPriority")
   private Integer jobPriority = 5;
 
-  @JsonProperty("lastModifiedTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime lastModifiedTime;
 
@@ -227,6 +225,16 @@ public class ManagementJobFVO {
   @Valid 
   @Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("creationTime")
+  public String getCreationTimeStr() {
+    return creationTime.toString();
+  }
+  
+  public void setCreationTime(String t) {
+    if ( t!= null ) {
+        this.creationTime = OffsetDateTime.parse( t );
+    }
+  }
+  
   public OffsetDateTime getCreationTime() {
     return creationTime;
   }
@@ -365,6 +373,16 @@ public class ManagementJobFVO {
   @Valid 
   @Schema(name = "lastModifiedTime", description = "The last time that a measurement job was modified.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastModifiedTime")
+  public String getLastModifiedTimeStr() {
+    return lastModifiedTime.toString();
+  }
+  
+  public void setLastModifiedTime(String t) {
+    if ( t!= null ) {
+        this.lastModifiedTime = OffsetDateTime.parse( t );
+    }
+  }
+
   public OffsetDateTime getLastModifiedTime() {
     return lastModifiedTime;
   }
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobCreateEvent.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobCreateEvent.java
index 482a5ad..e52b81f 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobCreateEvent.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobCreateEvent.java
@@ -15,7 +15,6 @@ import java.util.Objects;
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-05-15T07:30:16.936523289Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")
 public class MeasurementCollectionJobCreateEvent extends Event{
 
-  @JsonProperty("event")
   private MeasurementCollectionJobCreateEventPayload event;
 
   public MeasurementCollectionJobCreateEvent() {
-- 
GitLab