From 740a2d24744c0ec34672d2134a94088d4f696d20 Mon Sep 17 00:00:00 2001
From: Nikos Kyriakoulis <kyriakoulis@ece.upatras.gr>
Date: Fri, 11 Apr 2025 14:07:35 +0300
Subject: [PATCH] Added not-null checks for methods applying .toString() to
OffsetDateTime attributes.
---
.../org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java | 2 +-
.../org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java | 2 +-
.../org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java | 2 +-
.../org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java | 2 +-
.../org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java | 2 +-
.../org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java | 2 +-
src/main/java/org/etsi/osl/tmf/pm628/model/Event.java | 4 ++--
src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java | 4 ++--
.../java/org/etsi/osl/tmf/pm628/model/ManagementJobFVO.java | 4 ++--
src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java | 2 +-
src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java | 2 +-
src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java | 4 ++--
src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java | 4 ++--
src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java | 4 ++--
.../java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java | 4 ++--
.../org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java | 4 ++--
.../org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java | 4 ++--
.../java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java | 2 +-
.../java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java | 2 +-
.../java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java | 2 +-
20 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java
index 88e8c4a..d9a89d5 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java
@@ -117,7 +117,7 @@ public class DayOfMonthRecurrence {
@Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("dates")
public String getDatesString() {
- return dates.toString();
+ return (dates != null) ? dates.toString() : null;
}
public void setDates(String dates) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java
index 9929000..40e7c28 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceFVO.java
@@ -111,7 +111,7 @@ public class DayOfMonthRecurrenceFVO {
@Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("dates")
public String getDatesString() {
- return dates.toString();
+ return (dates != null) ? dates.toString() : null;
}
public void setDates(String dates) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java
index 2a7fb44..45256a6 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrenceMVO.java
@@ -111,7 +111,7 @@ public class DayOfMonthRecurrenceMVO {
@Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("dates")
public String getDatesString() {
- return dates.toString();
+ return (dates != null) ? dates.toString() : null;
}
public void setDates(String dates) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java
index 8407b28..5d72ed7 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java
@@ -121,7 +121,7 @@ public class DayOfWeekRecurrence {
@JsonProperty("dates")
public String getDatesString() {
- return dates.toString();
+ return (dates != null) ? dates.toString() : null;
}
public void setDates(String dates) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java
index 2547e73..260e3e7 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceFVO.java
@@ -111,7 +111,7 @@ public class DayOfWeekRecurrenceFVO {
@Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("dates")
public String getDatesString() {
- return dates.toString();
+ return (dates != null) ? dates.toString() : null;
}
public void setDates(String dates) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java
index 8ef4cd4..0921d24 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrenceMVO.java
@@ -111,7 +111,7 @@ public class DayOfWeekRecurrenceMVO {
@Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("dates")
public String getDatesString() {
- return dates.toString();
+ return (dates != null) ? dates.toString() : null;
}
public void setDates(String dates) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Event.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Event.java
index 665df51..2791e1c 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/Event.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Event.java
@@ -296,7 +296,7 @@ public class Event {
@Schema(name = "timeOccurred", description = "The time the event occurred.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("timeOccurred")
public String getTimeOccurredString() {
- return timeOccurred.toString();
+ return (timeOccurred != null) ? timeOccurred.toString() : null;
}
public void setTimeOccurred(String timeOccurred) {
@@ -441,7 +441,7 @@ public class Event {
@JsonProperty("eventTime")
public String getEventTimeString() {
- return eventTime.toString();
+ return (eventTime != null) ? eventTime.toString() : null;
}
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 7428c49..c187efd 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
@@ -128,7 +128,7 @@ public class ManagementJob extends BaseRootEntity {
@Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("creationTime")
public String getCreationTimeStr() {
- return creationTime.toString();
+ return (creationTime != null) ? creationTime.toString() : null;
}
public void setCreationTime(String t) {
@@ -272,7 +272,7 @@ public class ManagementJob extends BaseRootEntity {
@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();
+ return (lastModifiedTime != null) ? lastModifiedTime.toString() : null;
}
public void setLastModifiedTime(String t) {
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 95c6042..1d5c861 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
@@ -220,7 +220,7 @@ public class ManagementJobFVO {
@Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("creationTime")
public String getCreationTimeStr() {
- return creationTime.toString();
+ return (creationTime != null) ? creationTime.toString() : null;
}
public void setCreationTime(String t) {
@@ -363,7 +363,7 @@ public class ManagementJobFVO {
@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();
+ return (lastModifiedTime != null) ? lastModifiedTime.toString() : null;
}
public void setLastModifiedTime(String t) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java
index 78d4db7..97ae6cc 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/NoteFVO.java
@@ -136,7 +136,7 @@ public class NoteFVO {
@Schema(name = "date", example = "2020-11-20T08:00Z", description = "Date of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("date")
public String getDateString() {
- return date.toString();
+ return (date != null) ? date.toString() : null;
}
public void setDate(String date) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java
index f803be3..4848841 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/NoteMVO.java
@@ -158,7 +158,7 @@ public class NoteMVO {
@Schema(name = "date", example = "2020-11-20T08:00Z", description = "Date of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("date")
public String getDateString() {
- return date.toString();
+ return (date != null) ? date.toString() : null;
}
public void setDate(String date) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java
index 98ea10d..81f60f1 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Resource.java
@@ -226,7 +226,7 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
@Schema(name = "endOperatingDate", description = "A date time( DateTime). The date till the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("endOperatingDate")
public String getEndOperatingDateString() {
- return endOperatingDate.toString();
+ return (endOperatingDate != null) ? endOperatingDate.toString() : null;
}
public void setEndOperatingDate(String endOperatingDate) {
@@ -559,7 +559,7 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue
@Schema(name = "startOperatingDate", description = "A date time( DateTime). The date from which the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("startOperatingDate")
public String getStartOperatingDateString() {
- return startOperatingDate.toString();
+ return (startOperatingDate != null) ? startOperatingDate.toString() : null;
}
public void setStartOperatingDate(String startOperatingDate) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java
index a5b50cc..7fa5d26 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceFVO.java
@@ -303,7 +303,7 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
@Schema(name = "endOperatingDate", description = "A date time( DateTime). The date till the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("endOperatingDate")
public String getEndOperatingDateString() {
- return endOperatingDate.toString();
+ return (endOperatingDate != null) ? endOperatingDate.toString() : null;
}
public void setEndOperatingDate(String endOperatingDate) {
@@ -636,7 +636,7 @@ public class ResourceFVO implements ResourceRefOrValueFVO {
@Schema(name = "startOperatingDate", description = "A date time( DateTime). The date from which the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("startOperatingDate")
public String getStartOperatingDateString() {
- return startOperatingDate.toString();
+ return (startOperatingDate != null) ? startOperatingDate.toString() : null;
}
public void setStartOperatingDate(String startOperatingDate) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java
index 694b2c1..6baa14d 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceMVO.java
@@ -303,7 +303,7 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
@Schema(name = "endOperatingDate", description = "A date time( DateTime). The date till the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("endOperatingDate")
public String getEndOperatingDateString() {
- return endOperatingDate.toString();
+ return (endOperatingDate != null) ? endOperatingDate.toString() : null;
}
public void setEndOperatingDate(String endOperatingDate) {
@@ -636,7 +636,7 @@ public class ResourceMVO implements ResourceRefOrValueMVO {
@Schema(name = "startOperatingDate", description = "A date time( DateTime). The date from which the resource is operating", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("startOperatingDate")
public String getStartOperatingDateString() {
- return startOperatingDate.toString();
+ return (startOperatingDate != null) ? startOperatingDate.toString() : null;
}
public void setStartOperatingDate(String startOperatingDate) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java
index 6720bed..c25213d 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java
@@ -87,7 +87,7 @@ public class ScheduleDefinition extends BaseRootEntity {
@JsonProperty("scheduleDefinitionStartTime")
public String getScheduleDefinitionStartTimeString() {
- return scheduleDefinitionStartTime.toString();
+ return (scheduleDefinitionStartTime != null) ? scheduleDefinitionStartTime.toString() : null;
}
@@ -119,7 +119,7 @@ public class ScheduleDefinition extends BaseRootEntity {
@JsonProperty("scheduleDefinitionEndTime")
public String getScheduleDefinitionEndTimeString() {
- return scheduleDefinitionEndTime.toString();
+ return (scheduleDefinitionEndTime != null) ? scheduleDefinitionEndTime.toString() : null;
}
public void setScheduleDefinitionEndTime(String t) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java
index a30f0bf..af6403c 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionFVO.java
@@ -141,7 +141,7 @@ public class ScheduleDefinitionFVO {
@JsonProperty("scheduleDefinitionStartTime")
public String getScheduleDefinitionStartTimeString() {
- return scheduleDefinitionStartTime.toString();
+ return (scheduleDefinitionStartTime != null) ? scheduleDefinitionStartTime.toString() : null;
}
@@ -171,7 +171,7 @@ public class ScheduleDefinitionFVO {
@Schema(name = "scheduleDefinitionEndTime", description = "The End time of the Schedule Definition. If the attribute is empty the Schedule run forever, not having a time constraint.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("scheduleDefinitionEndTime")
public String getScheduleDefinitionEndTimeString() {
- return scheduleDefinitionEndTime.toString();
+ return (scheduleDefinitionEndTime != null) ? scheduleDefinitionEndTime.toString() : null;
}
public void setScheduleDefinitionEndTime(String t) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java
index c4d1a6c..236df25 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ScheduleDefinitionMVO.java
@@ -162,7 +162,7 @@ public class ScheduleDefinitionMVO {
@JsonProperty("scheduleDefinitionStartTime")
public String getScheduleDefinitionStartTimeString() {
- return scheduleDefinitionStartTime.toString();
+ return (scheduleDefinitionStartTime != null) ? scheduleDefinitionStartTime.toString() : null;
}
@@ -195,7 +195,7 @@ public class ScheduleDefinitionMVO {
@Schema(name = "scheduleDefinitionEndTime", description = "The End time of the Schedule Definition. If the attribute is empty the Schedule run forever, not having a time constraint.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("scheduleDefinitionEndTime")
public String getScheduleDefinitionEndTimeString() {
- return scheduleDefinitionEndTime.toString();
+ return (scheduleDefinitionEndTime != null) ? scheduleDefinitionEndTime.toString() : null;
}
public void setScheduleDefinitionEndTime(String t) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java
index b1ebee5..bb04ae8 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecord.java
@@ -133,7 +133,7 @@ public class TrackingRecord extends BaseRootEntity {
@Schema(name = "time", description = "Describes the time at which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("time")
public String getTimeString() {
- return time.toString();
+ return (time != null) ? time.toString() : null;
}
public void setTime(String time) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java
index 3ec65c3..8a92f10 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordFVO.java
@@ -194,7 +194,7 @@ public class TrackingRecordFVO {
@Schema(name = "time", description = "Describes the time at which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("time")
public String getTimeString() {
- return time.toString();
+ return (time != null) ? time.toString() : null;
}
public void setTime(String time) {
diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java
index bd6ec5f..b0ab0cf 100644
--- a/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java
+++ b/src/main/java/org/etsi/osl/tmf/pm628/model/TrackingRecordMVO.java
@@ -197,7 +197,7 @@ public class TrackingRecordMVO {
@Schema(name = "time", description = "Describes the time at which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@JsonProperty("time")
public String getTimeString() {
- return time.toString();
+ return (time != null) ? time.toString() : null;
}
public void setTime(String time) {
--
GitLab