From 72b50dc83165e1f54ef78d211c75edeefc957e91 Mon Sep 17 00:00:00 2001 From: Nikos Kyriakoulis Date: Mon, 27 Jan 2025 12:11:16 +0200 Subject: [PATCH 1/4] Removed duplicate JsonProperty annotations for OffsetDateTime attributes and implemented methods to get and set them as Strings. --- .../pm628/model/DayOfMonthRecurrenceFVO.java | 11 +++++++++- .../pm628/model/DayOfMonthRecurrenceMVO.java | 11 +++++++++- .../pm628/model/DayOfWeekRecurrenceFVO.java | 11 +++++++++- .../pm628/model/DayOfWeekRecurrenceMVO.java | 11 +++++++++- .../org/etsi/osl/tmf/pm628/model/Event.java | 11 +++++++++- .../org/etsi/osl/tmf/pm628/model/NoteFVO.java | 11 +++++++++- .../org/etsi/osl/tmf/pm628/model/NoteMVO.java | 11 +++++++++- .../etsi/osl/tmf/pm628/model/Resource.java | 22 +++++++++++++++++-- .../etsi/osl/tmf/pm628/model/ResourceFVO.java | 22 +++++++++++++++++-- .../etsi/osl/tmf/pm628/model/ResourceMVO.java | 22 +++++++++++++++++-- .../osl/tmf/pm628/model/TrackingRecord.java | 11 +++++++++- .../tmf/pm628/model/TrackingRecordFVO.java | 11 +++++++++- .../tmf/pm628/model/TrackingRecordMVO.java | 11 +++++++++- 13 files changed, 160 insertions(+), 16 deletions(-) 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 1cee0eb..b9d2fa9 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 @@ -27,7 +27,6 @@ public class DayOfMonthRecurrenceFVO { @JsonProperty("@schemaLocation") private String schemaLocation; - @JsonProperty("dates") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dates; @@ -114,6 +113,16 @@ public class DayOfMonthRecurrenceFVO { @Valid @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dates") + public String getDatesString() { + return dates.toString(); + } + + public void setDates(String dates) { + if ( dates!= null ) { + this.dates = OffsetDateTime.parse( dates ); + } + } + public OffsetDateTime getDates() { return 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 0a8506a..c90596c 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 @@ -27,7 +27,6 @@ public class DayOfMonthRecurrenceMVO { @JsonProperty("@schemaLocation") private String schemaLocation; - @JsonProperty("dates") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dates; @@ -114,6 +113,16 @@ public class DayOfMonthRecurrenceMVO { @Valid @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dates") + public String getDatesString() { + return dates.toString(); + } + + public void setDates(String dates) { + if ( dates!= null ) { + this.dates = OffsetDateTime.parse( dates ); + } + } + public OffsetDateTime getDates() { return 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 33c5794..5219ff6 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 @@ -27,7 +27,6 @@ public class DayOfWeekRecurrenceFVO { @JsonProperty("@schemaLocation") private String schemaLocation; - @JsonProperty("dates") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dates; @@ -114,6 +113,16 @@ public class DayOfWeekRecurrenceFVO { @Valid @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dates") + public String getDatesString() { + return dates.toString(); + } + + public void setDates(String dates) { + if ( dates!= null ) { + this.dates = OffsetDateTime.parse( dates ); + } + } + public OffsetDateTime getDates() { return 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 2ef8783..430a1da 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 @@ -27,7 +27,6 @@ public class DayOfWeekRecurrenceMVO { @JsonProperty("@schemaLocation") private String schemaLocation; - @JsonProperty("dates") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime dates; @@ -114,6 +113,16 @@ public class DayOfWeekRecurrenceMVO { @Valid @Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("dates") + public String getDatesString() { + return dates.toString(); + } + + public void setDates(String dates) { + if ( dates!= null ) { + this.dates = OffsetDateTime.parse( dates ); + } + } + public OffsetDateTime getDates() { return 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 15be3c3..bfaa3b6 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 @@ -52,7 +52,6 @@ public class Event { @JsonProperty("priority") protected String priority; - @JsonProperty("timeOccurred") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) protected OffsetDateTime timeOccurred; @@ -306,6 +305,16 @@ public class Event { @Valid @Schema(name = "timeOccurred", description = "The time the event occurred.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) @JsonProperty("timeOccurred") + public String getTimeOccurredString() { + return timeOccurred.toString(); + } + + public void setTimeOccurred(String timeOccurred) { + if ( timeOccurred!= null ) { + this.timeOccurred = OffsetDateTime.parse( timeOccurred ); + } + } + public OffsetDateTime getTimeOccurred() { return timeOccurred; } 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 6d4d7dd..a958a29 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 @@ -30,7 +30,6 @@ public class NoteFVO { @JsonProperty("author") private String author; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime date; @@ -140,6 +139,16 @@ public class NoteFVO { @Valid @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(); + } + + public void setDate(String date) { + if ( date!= null ) { + this.date = OffsetDateTime.parse( date ); + } + } + public OffsetDateTime getDate() { return 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 7785c14..4add4b4 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 @@ -33,7 +33,6 @@ public class NoteMVO { @JsonProperty("author") private String author; - @JsonProperty("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime date; @@ -163,6 +162,16 @@ public class NoteMVO { @Valid @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(); + } + + public void setDate(String date) { + if ( date!= null ) { + this.date = OffsetDateTime.parse( date ); + } + } + public OffsetDateTime getDate() { return 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 01cd210..6fa86c5 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 @@ -49,7 +49,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue @JsonProperty("description") private String description; - @JsonProperty("endOperatingDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime endOperatingDate; @@ -137,7 +136,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue @JoinColumn(name = "res_spec_id") private ResourceSpecificationRef resourceSpecification; - @JsonProperty("startOperatingDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime startOperatingDate; @@ -229,6 +227,16 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue @Valid @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(); + } + + public void setEndOperatingDate(String endOperatingDate) { + if ( endOperatingDate!= null ) { + this.endOperatingDate = OffsetDateTime.parse( endOperatingDate ); + } + } + public OffsetDateTime getEndOperatingDate() { return endOperatingDate; } @@ -565,6 +573,16 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue @Valid @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(); + } + + public void setStartOperatingDate(String startOperatingDate) { + if ( startOperatingDate!= null ) { + this.startOperatingDate = OffsetDateTime.parse( startOperatingDate ); + } + } + public OffsetDateTime getStartOperatingDate() { return 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 9956563..e0339b3 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 @@ -61,7 +61,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { @JsonProperty("name") private String name; - @JsonProperty("endOperatingDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime endOperatingDate; @@ -111,7 +110,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { @JsonProperty("resourceSpecification") private ResourceSpecificationRefFVO resourceSpecification; - @JsonProperty("startOperatingDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime startOperatingDate; @@ -312,6 +310,16 @@ public class ResourceFVO implements ResourceRefOrValueFVO { @Valid @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(); + } + + public void setEndOperatingDate(String endOperatingDate) { + if ( endOperatingDate!= null ) { + this.endOperatingDate = OffsetDateTime.parse( endOperatingDate ); + } + } + public OffsetDateTime getEndOperatingDate() { return endOperatingDate; } @@ -648,6 +656,16 @@ public class ResourceFVO implements ResourceRefOrValueFVO { @Valid @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(); + } + + public void setStartOperatingDate(String startOperatingDate) { + if ( startOperatingDate!= null ) { + this.startOperatingDate = OffsetDateTime.parse( startOperatingDate ); + } + } + public OffsetDateTime getStartOperatingDate() { return 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 59d1aee..b932345 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 @@ -61,7 +61,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { @JsonProperty("name") private String name; - @JsonProperty("endOperatingDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime endOperatingDate; @@ -111,7 +110,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { @JsonProperty("resourceSpecification") private ResourceSpecificationRefMVO resourceSpecification; - @JsonProperty("startOperatingDate") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime startOperatingDate; @@ -312,6 +310,16 @@ public class ResourceMVO implements ResourceRefOrValueMVO { @Valid @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(); + } + + public void setEndOperatingDate(String endOperatingDate) { + if ( endOperatingDate!= null ) { + this.endOperatingDate = OffsetDateTime.parse( endOperatingDate ); + } + } + public OffsetDateTime getEndOperatingDate() { return endOperatingDate; } @@ -648,6 +656,16 @@ public class ResourceMVO implements ResourceRefOrValueMVO { @Valid @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(); + } + + public void setStartOperatingDate(String startOperatingDate) { + if ( startOperatingDate!= null ) { + this.startOperatingDate = OffsetDateTime.parse( startOperatingDate ); + } + } + public OffsetDateTime getStartOperatingDate() { return startOperatingDate; } 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 2eaa08a..8ba4ada 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 @@ -38,7 +38,6 @@ public class TrackingRecord extends BaseRootEntity { @JsonProperty("systemId") private String systemId; - @JsonProperty("time") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime time; @@ -136,6 +135,16 @@ public class TrackingRecord extends BaseRootEntity { @Valid @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(); + } + + public void setTime(String time) { + if ( time!= null ) { + this.time = OffsetDateTime.parse( time ); + } + } + public OffsetDateTime getTime() { return 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 36b881d..068496f 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 @@ -42,7 +42,6 @@ public class TrackingRecordFVO { @JsonProperty("systemId") private String systemId; - @JsonProperty("time") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime time; @@ -200,6 +199,16 @@ public class TrackingRecordFVO { @Valid @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(); + } + + public void setTime(String time) { + if ( time!= null ) { + this.time = OffsetDateTime.parse( time ); + } + } + public OffsetDateTime getTime() { return 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 64be0fb..5078274 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 @@ -42,7 +42,6 @@ public class TrackingRecordMVO { @JsonProperty("systemId") private String systemId; - @JsonProperty("time") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private OffsetDateTime time; @@ -203,6 +202,16 @@ public class TrackingRecordMVO { @Valid @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(); + } + + public void setTime(String time) { + if ( time!= null ) { + this.time = OffsetDateTime.parse( time ); + } + } + public OffsetDateTime getTime() { return time; } -- GitLab From 5a1f4d69031a1066602e1363733795960eff740f Mon Sep 17 00:00:00 2001 From: Nikos Kyriakoulis Date: Tue, 4 Feb 2025 11:42:22 +0200 Subject: [PATCH 2/4] Removed duplicate @JsonProperty annotations. --- .../osl/tmf/pm628/model/AttachmentRefFVO.java | 9 ------- .../osl/tmf/pm628/model/AttachmentRefMVO.java | 9 ------- .../osl/tmf/pm628/model/Characteristic.java | 2 -- .../tmf/pm628/model/CharacteristicFVO.java | 6 ----- .../tmf/pm628/model/CharacteristicMVO.java | 7 ------ .../model/CharacteristicRelationship.java | 1 - .../model/CharacteristicRelationshipFVO.java | 5 ---- .../model/CharacteristicRelationshipMVO.java | 5 ---- .../osl/tmf/pm628/model/CompressionType.java | 1 - .../tmf/pm628/model/DataAccessEndpoint.java | 3 --- .../pm628/model/DataAccessEndpointFVO.java | 3 --- .../pm628/model/DataAccessEndpointMVO.java | 3 --- .../tmf/pm628/model/DataFilterAttribute.java | 1 - .../model/DataFilterAttributeStringArray.java | 1 - .../osl/tmf/pm628/model/DataFilterMap.java | 4 --- .../osl/tmf/pm628/model/DataFilterMapFVO.java | 4 --- .../tmf/pm628/model/DataFilterMapItem.java | 2 -- .../tmf/pm628/model/DataFilterMapItemFVO.java | 2 -- .../tmf/pm628/model/DataFilterMapItemMVO.java | 4 +-- .../osl/tmf/pm628/model/DataFilterMapMVO.java | 4 --- .../tmf/pm628/model/DataFilterTemplate.java | 6 ----- .../pm628/model/DataFilterTemplateFVO.java | 5 ---- .../pm628/model/DataFilterTemplateMVO.java | 6 ----- .../tmf/pm628/model/DayOfMonthRecurrence.java | 3 --- .../pm628/model/DayOfMonthRecurrenceFVO.java | 3 --- .../pm628/model/DayOfMonthRecurrenceMVO.java | 3 --- .../tmf/pm628/model/DayOfWeekRecurrence.java | 3 --- .../pm628/model/DayOfWeekRecurrenceFVO.java | 3 --- .../pm628/model/DayOfWeekRecurrenceMVO.java | 3 --- .../etsi/osl/tmf/pm628/model/Duration.java | 2 -- .../org/etsi/osl/tmf/pm628/model/Event.java | 17 ------------- .../tmf/pm628/model/ExternalIdentifier.java | 6 ----- .../pm628/model/ExternalIdentifierFVO.java | 5 ---- .../pm628/model/ExternalIdentifierMVO.java | 6 ----- .../org/etsi/osl/tmf/pm628/model/Feature.java | 5 ---- .../etsi/osl/tmf/pm628/model/FeatureFVO.java | 9 ------- .../etsi/osl/tmf/pm628/model/FeatureMVO.java | 10 -------- .../pm628/model/FeatureRelationshipFVO.java | 9 ------- .../pm628/model/FeatureRelationshipMVO.java | 9 ------- .../osl/tmf/pm628/model/FileTransferData.java | 8 ------ .../tmf/pm628/model/FileTransferDataFVO.java | 8 ------ .../tmf/pm628/model/FileTransferDataMVO.java | 8 ------ .../etsi/osl/tmf/pm628/model/IntentRef.java | 7 ------ .../osl/tmf/pm628/model/IntentRefFVO.java | 7 ------ .../osl/tmf/pm628/model/IntentRefMVO.java | 7 ------ .../osl/tmf/pm628/model/LogicalResource.java | 1 - .../tmf/pm628/model/LogicalResourceFVO.java | 1 - .../tmf/pm628/model/LogicalResourceMVO.java | 1 - .../osl/tmf/pm628/model/ManagementJob.java | 7 ------ .../osl/tmf/pm628/model/ManagementJobFVO.java | 14 +---------- .../osl/tmf/pm628/model/ManagementJobMVO.java | 8 ------ .../pm628/model/MeasurementCollectionJob.java | 5 ---- .../model/MeasurementCollectionJobFVO.java | 5 ---- .../model/MeasurementCollectionJobMVO.java | 5 ---- .../model/MeasurementCollectionJobRef.java | 7 ------ .../osl/tmf/pm628/model/MeasurementJob.java | 8 ------ .../tmf/pm628/model/MeasurementJobFVO.java | 8 ------ .../tmf/pm628/model/MeasurementJobMVO.java | 6 ----- .../pm628/model/MonitoredClassCriteria.java | 5 ---- .../model/MonitoredClassCriteriaFVO.java | 5 ---- .../model/MonitoredInstancesCriteria.java | 4 --- .../model/MonitoredInstancesCriteriaFVO.java | 4 --- .../MonthlyScheduleDayOfWeekDefinition.java | 5 ---- ...MonthlyScheduleDayOfWeekDefinitionFVO.java | 5 ---- ...MonthlyScheduleDayOfWeekDefinitionMVO.java | 5 ---- .../org/etsi/osl/tmf/pm628/model/NoteFVO.java | 5 ---- .../org/etsi/osl/tmf/pm628/model/NoteMVO.java | 6 ----- .../etsi/osl/tmf/pm628/model/PackingType.java | 1 - .../etsi/osl/tmf/pm628/model/PartyRef.java | 1 - .../etsi/osl/tmf/pm628/model/PartyRefFVO.java | 7 ------ .../etsi/osl/tmf/pm628/model/PartyRefMVO.java | 7 ------ .../osl/tmf/pm628/model/PartyRoleRef.java | 3 --- .../osl/tmf/pm628/model/PartyRoleRefFVO.java | 9 ------- .../osl/tmf/pm628/model/PartyRoleRefMVO.java | 9 ------- ...erformanceIndicatorGroupSpecification.java | 2 -- ...ormanceIndicatorGroupSpecificationFVO.java | 6 ----- ...ormanceIndicatorGroupSpecificationMVO.java | 7 ------ ...ormanceIndicatorGroupSpecificationRef.java | 2 -- .../PerformanceIndicatorSpecRelationship.java | 3 --- ...rformanceIndicatorSpecRelationshipFVO.java | 8 ------ ...rformanceIndicatorSpecRelationshipMVO.java | 8 ------ .../PerformanceIndicatorSpecification.java | 10 -------- .../PerformanceIndicatorSpecificationFVO.java | 16 ------------ .../PerformanceIndicatorSpecificationMVO.java | 17 +------------ .../PerformanceIndicatorSpecificationRef.java | 2 -- ...rformanceIndicatorSpecificationRefFVO.java | 8 ------ ...rformanceIndicatorSpecificationRefMVO.java | 9 +------ .../etsi/osl/tmf/pm628/model/PlaceRefFVO.java | 7 ------ .../etsi/osl/tmf/pm628/model/PlaceRefMVO.java | 7 ------ .../etsi/osl/tmf/pm628/model/PolicyRef.java | 2 -- .../osl/tmf/pm628/model/PolicyRefFVO.java | 8 ------ .../osl/tmf/pm628/model/PolicyRefMVO.java | 8 ------ .../tmf/pm628/model/ProtocolTransferData.java | 1 - .../pm628/model/ProtocolTransferDataFVO.java | 1 - .../pm628/model/ProtocolTransferDataMVO.java | 1 - .../model/RelatedPartyRefOrPartyRoleRef.java | 5 ---- .../RelatedPartyRefOrPartyRoleRefFVO.java | 5 ---- .../RelatedPartyRefOrPartyRoleRefMVO.java | 5 ---- .../osl/tmf/pm628/model/RelatedPlaceRef.java | 5 ---- .../tmf/pm628/model/RelatedPlaceRefFVO.java | 5 ---- .../tmf/pm628/model/RelatedPlaceRefMVO.java | 5 ---- .../pm628/model/RelatedResourceOrderItem.java | 9 ------- .../model/RelatedResourceOrderItemFVO.java | 9 ------- .../model/RelatedResourceOrderItemMVO.java | 9 ------- .../etsi/osl/tmf/pm628/model/Resource.java | 19 -------------- .../etsi/osl/tmf/pm628/model/ResourceFVO.java | 25 ------------------- .../etsi/osl/tmf/pm628/model/ResourceMVO.java | 25 ------------------- .../etsi/osl/tmf/pm628/model/ResourceRef.java | 1 - .../osl/tmf/pm628/model/ResourceRefFVO.java | 7 ------ .../osl/tmf/pm628/model/ResourceRefMVO.java | 7 ------ .../tmf/pm628/model/ResourceRelationship.java | 6 ----- .../pm628/model/ResourceRelationshipFVO.java | 6 ----- .../pm628/model/ResourceRelationshipMVO.java | 7 ------ .../model/ResourceSpecificationRefFVO.java | 8 ------ .../model/ResourceSpecificationRefMVO.java | 8 ------ .../tmf/pm628/model/ScheduleDefinition.java | 4 --- .../pm628/model/ScheduleDefinitionFVO.java | 10 +++----- .../pm628/model/ScheduleDefinitionMVO.java | 8 ------ .../osl/tmf/pm628/model/TrackingRecord.java | 4 --- .../tmf/pm628/model/TrackingRecordFVO.java | 7 ------ .../tmf/pm628/model/TrackingRecordMVO.java | 8 ------ 121 files changed, 8 insertions(+), 733 deletions(-) diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefFVO.java index 1990d07..8251d95 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefFVO.java @@ -64,7 +64,6 @@ public class AttachmentRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getAtType() { return type; } @@ -84,7 +83,6 @@ public class AttachmentRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -104,7 +102,6 @@ public class AttachmentRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class AttachmentRefFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -144,7 +140,6 @@ public class AttachmentRefFVO { */ @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -164,7 +159,6 @@ public class AttachmentRefFVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -184,7 +178,6 @@ public class AttachmentRefFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -204,7 +197,6 @@ public class AttachmentRefFVO { */ @Schema(name = "description", description = "A narrative text describing the content of the attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -224,7 +216,6 @@ public class AttachmentRefFVO { */ @Schema(name = "url", description = "Link to the attachment media/content", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("url") public String getUrl() { return url; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefMVO.java index 3c2edba..c934c5e 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/AttachmentRefMVO.java @@ -64,7 +64,6 @@ public class AttachmentRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -84,7 +83,6 @@ public class AttachmentRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getAtBaseType() { return baseType; } @@ -104,7 +102,6 @@ public class AttachmentRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class AttachmentRefMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -144,7 +140,6 @@ public class AttachmentRefMVO { */ @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -164,7 +159,6 @@ public class AttachmentRefMVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -184,7 +178,6 @@ public class AttachmentRefMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -204,7 +197,6 @@ public class AttachmentRefMVO { */ @Schema(name = "description", description = "A narrative text describing the content of the attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -224,7 +216,6 @@ public class AttachmentRefMVO { */ @Schema(name = "url", description = "Link to the attachment media/content", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("url") public String getUrl() { return url; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Characteristic.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Characteristic.java index 5c4f887..df528a4 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/Characteristic.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Characteristic.java @@ -55,7 +55,6 @@ public class Characteristic extends BaseRootNamedEntity { */ @Schema(name = "valueType", description = "Data type of the value of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("valueType") public String getValueType() { return valueType; } @@ -83,7 +82,6 @@ public class Characteristic extends BaseRootNamedEntity { */ @Valid @Schema(name = "characteristicRelationship", description = "Collection of characteristic relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("characteristicRelationship") public List getCharacteristicRelationship() { return characteristicRelationship; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicFVO.java index 912ae24..3acffe8 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicFVO.java @@ -59,7 +59,6 @@ public class CharacteristicFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class CharacteristicFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class CharacteristicFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class CharacteristicFVO { */ @Schema(name = "name", description = "Name of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -139,7 +135,6 @@ public class CharacteristicFVO { */ @Schema(name = "valueType", description = "Data type of the value of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("valueType") public String getValueType() { return valueType; } @@ -167,7 +162,6 @@ public class CharacteristicFVO { */ @Valid @Schema(name = "characteristicRelationship", description = "Collection of characteristic relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("characteristicRelationship") public List getCharacteristicRelationship() { return characteristicRelationship; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java index bccda46..ca8aee8 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicMVO.java @@ -62,7 +62,6 @@ public class CharacteristicMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -82,7 +81,6 @@ public class CharacteristicMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -102,7 +100,6 @@ public class CharacteristicMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -122,7 +119,6 @@ public class CharacteristicMVO { */ @Schema(name = "uuid", description = "Unique identifier of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -142,7 +138,6 @@ public class CharacteristicMVO { */ @Schema(name = "name", description = "Name of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -162,7 +157,6 @@ public class CharacteristicMVO { */ @Schema(name = "valueType", description = "Data type of the value of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("valueType") public String getValueType() { return valueType; } @@ -190,7 +184,6 @@ public class CharacteristicMVO { */ @Valid @Schema(name = "characteristicRelationship", description = "Collection of characteristic relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("characteristicRelationship") public List getCharacteristicRelationship() { return characteristicRelationship; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationship.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationship.java index de47f79..9e5f717 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationship.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationship.java @@ -47,7 +47,6 @@ public class CharacteristicRelationship extends BaseRootEntity { */ @Schema(name = "relationshipType", description = "The type of relationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipFVO.java index c34c454..62e378a 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipFVO.java @@ -54,7 +54,6 @@ public class CharacteristicRelationshipFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -74,7 +73,6 @@ public class CharacteristicRelationshipFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -94,7 +92,6 @@ public class CharacteristicRelationshipFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -114,7 +111,6 @@ public class CharacteristicRelationshipFVO { */ @NotNull @Schema(name = "uuid", description = "Unique identifier of the characteristic", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -134,7 +130,6 @@ public class CharacteristicRelationshipFVO { */ @NotNull @Schema(name = "relationshipType", description = "The type of relationship", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipMVO.java index 7e9848c..347b3c8 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CharacteristicRelationshipMVO.java @@ -52,7 +52,6 @@ public class CharacteristicRelationshipMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -72,7 +71,6 @@ public class CharacteristicRelationshipMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -92,7 +90,6 @@ public class CharacteristicRelationshipMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -112,7 +109,6 @@ public class CharacteristicRelationshipMVO { */ @Schema(name = "uuid", description = "Unique identifier of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -132,7 +128,6 @@ public class CharacteristicRelationshipMVO { */ @Schema(name = "relationshipType", description = "The type of relationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/CompressionType.java b/src/main/java/org/etsi/osl/tmf/pm628/model/CompressionType.java index c3818df..5e973b0 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/CompressionType.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/CompressionType.java @@ -31,7 +31,6 @@ public class CompressionType { */ @Valid @Schema(name = "compressionEnumType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("compressionEnumType") public CompressionEnumType getCompressionEnumType() { return compressionEnumType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpoint.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpoint.java index df95ffd..3d58b69 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpoint.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpoint.java @@ -60,7 +60,6 @@ public class DataAccessEndpoint extends LogicalResource { */ @Valid @Schema(name = "uri", description = "URI for using the data access API", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uri") public URI getUri() { return uri; } @@ -80,7 +79,6 @@ public class DataAccessEndpoint extends LogicalResource { */ @Valid @Schema(name = "uriQueryFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uriQueryFilter") public DataFilterMap getUriQueryFilter() { return uriQueryFilter; } @@ -100,7 +98,6 @@ public class DataAccessEndpoint extends LogicalResource { */ @Schema(name = "apiType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("apiType") public String getApiType() { return apiType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointFVO.java index 3637fc7..c7765fd 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointFVO.java @@ -53,7 +53,6 @@ public class DataAccessEndpointFVO extends LogicalResourceFVO { */ @Valid @Schema(name = "uri", description = "URI for using the data access API", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uri") public URI getUri() { return uri; } @@ -73,7 +72,6 @@ public class DataAccessEndpointFVO extends LogicalResourceFVO { */ @Valid @Schema(name = "uriQueryFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uriQueryFilter") public DataFilterMapFVO getUriQueryFilter() { return uriQueryFilter; } @@ -93,7 +91,6 @@ public class DataAccessEndpointFVO extends LogicalResourceFVO { */ @Schema(name = "apiType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("apiType") public String getApiType() { return apiType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointMVO.java index 0cd9a04..11bd8b1 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataAccessEndpointMVO.java @@ -53,7 +53,6 @@ public class DataAccessEndpointMVO extends LogicalResourceMVO { */ @Valid @Schema(name = "uri", description = "URI for using the data access API", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uri") public URI getUri() { return uri; } @@ -73,7 +72,6 @@ public class DataAccessEndpointMVO extends LogicalResourceMVO { */ @Valid @Schema(name = "uriQueryFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uriQueryFilter") public DataFilterMapMVO getUriQueryFilter() { return uriQueryFilter; } @@ -93,7 +91,6 @@ public class DataAccessEndpointMVO extends LogicalResourceMVO { */ @Schema(name = "apiType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("apiType") public String getApiType() { return apiType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttribute.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttribute.java index 5eab513..b207241 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttribute.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttribute.java @@ -40,7 +40,6 @@ public class DataFilterAttribute { */ @Schema(name = "valueType", description = "Data type of the value of the attribute", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("valueType") public String getValueType() { return valueType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttributeStringArray.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttributeStringArray.java index 12cc0dd..5b3215e 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttributeStringArray.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterAttributeStringArray.java @@ -43,7 +43,6 @@ public class DataFilterAttributeStringArray extends DataFilterAttribute { */ @Schema(name = "value", example = "[\"Dallas\",\"Houston\",\"Paris\"]", description = "an array of field names", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("value") public List getValue() { return value; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMap.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMap.java index 5084ad5..444ac3b 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMap.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMap.java @@ -57,7 +57,6 @@ public class DataFilterMap { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -77,7 +76,6 @@ public class DataFilterMap { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -97,7 +95,6 @@ public class DataFilterMap { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -126,7 +123,6 @@ public class DataFilterMap { */ @Valid @Schema(name = "mappings", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("mappings") public List<@Valid DataFilterMapItem> getMappings() { return mappings; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapFVO.java index 66a2646..7b97e94 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapFVO.java @@ -53,7 +53,6 @@ public class DataFilterMapFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -73,7 +72,6 @@ public class DataFilterMapFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -93,7 +91,6 @@ public class DataFilterMapFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class DataFilterMapFVO { */ @Valid @Schema(name = "mappings", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("mappings") public List<@Valid DataFilterMapItemFVO> getMappings() { return mappings; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItem.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItem.java index cb84be0..ee8f2ed 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItem.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItem.java @@ -36,7 +36,6 @@ public class DataFilterMapItem { */ @Valid @Schema(name = "filterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("filterTemplate") public DataFilterTemplate getFilterTemplate() { return filterTemplate; } @@ -56,7 +55,6 @@ public class DataFilterMapItem { */ @Valid @Schema(name = "stringArray", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("stringArray") public DataFilterAttributeStringArray getStringArray() { return stringArray; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemFVO.java index 90fb5e9..0ea073a 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemFVO.java @@ -34,7 +34,6 @@ public class DataFilterMapItemFVO { */ @Valid @Schema(name = "filterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("filterTemplate") public DataFilterTemplateFVO getFilterTemplate() { return filterTemplate; } @@ -54,7 +53,6 @@ public class DataFilterMapItemFVO { */ @Valid @Schema(name = "stringArray", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("stringArray") public DataFilterAttributeStringArray getStringArray() { return stringArray; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemMVO.java index f7d1739..c765f59 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapItemMVO.java @@ -17,8 +17,10 @@ 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 DataFilterMapItemMVO { + @JsonProperty("filterTemplate") private DataFilterTemplateMVO filterTemplate; + @JsonProperty("stringArray") private DataFilterAttributeStringArray stringArray; public DataFilterMapItemMVO filterTemplate(DataFilterTemplateMVO filterTemplate) { @@ -32,7 +34,6 @@ public class DataFilterMapItemMVO { */ @Valid @Schema(name = "filterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("filterTemplate") public DataFilterTemplateMVO getFilterTemplate() { return filterTemplate; } @@ -52,7 +53,6 @@ public class DataFilterMapItemMVO { */ @Valid @Schema(name = "stringArray", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("stringArray") public DataFilterAttributeStringArray getStringArray() { return stringArray; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapMVO.java index f7eed3d..433e4f0 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterMapMVO.java @@ -53,7 +53,6 @@ public class DataFilterMapMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -73,7 +72,6 @@ public class DataFilterMapMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -93,7 +91,6 @@ public class DataFilterMapMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class DataFilterMapMVO { */ @Valid @Schema(name = "mappings", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("mappings") public List<@Valid DataFilterMapItemMVO> getMappings() { return mappings; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplate.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplate.java index 5c02028..f2e6138 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplate.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplate.java @@ -61,7 +61,6 @@ public class DataFilterTemplate { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -81,7 +80,6 @@ public class DataFilterTemplate { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -101,7 +99,6 @@ public class DataFilterTemplate { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class DataFilterTemplate { */ @Schema(name = "id", example = "6c088cf7f1bc", description = "Unique identifier of this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -141,7 +137,6 @@ public class DataFilterTemplate { */ @Valid @Schema(name = "href", example = "https://host/dataFilerTemplate/6c088cf7f1bc", description = "Hyperlink reference to this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -161,7 +156,6 @@ public class DataFilterTemplate { */ @Schema(name = "name", description = "Name given to this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateFVO.java index ecd0fc6..b70a760 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateFVO.java @@ -55,7 +55,6 @@ public class DataFilterTemplateFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -75,7 +74,6 @@ public class DataFilterTemplateFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -95,7 +93,6 @@ public class DataFilterTemplateFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -129,7 +126,6 @@ public class DataFilterTemplateFVO { */ @Schema(name = "name", description = "Name given to this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -149,7 +145,6 @@ public class DataFilterTemplateFVO { */ @Schema(name = "description", description = "Description of this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateMVO.java index 98162e0..1b6b24f 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/DataFilterTemplateMVO.java @@ -58,7 +58,6 @@ public class DataFilterTemplateMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -78,7 +77,6 @@ public class DataFilterTemplateMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -98,7 +96,6 @@ public class DataFilterTemplateMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -132,7 +129,6 @@ public class DataFilterTemplateMVO { */ @Schema(name = "id", example = "6c088cf7f1bc", description = "Unique identifier of this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -152,7 +148,6 @@ public class DataFilterTemplateMVO { */ @Schema(name = "name", description = "Name given to this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -172,7 +167,6 @@ public class DataFilterTemplateMVO { */ @Schema(name = "description", description = "Description of this DataFilterTemplate", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } 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 ef8d3d5..88e8c4a 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 @@ -58,7 +58,6 @@ public class DayOfMonthRecurrence { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -78,7 +77,6 @@ public class DayOfMonthRecurrence { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -98,7 +96,6 @@ public class DayOfMonthRecurrence { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } 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 b9d2fa9..9929000 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 @@ -52,7 +52,6 @@ public class DayOfMonthRecurrenceFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -72,7 +71,6 @@ public class DayOfMonthRecurrenceFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -92,7 +90,6 @@ public class DayOfMonthRecurrenceFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } 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 c90596c..2a7fb44 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 @@ -52,7 +52,6 @@ public class DayOfMonthRecurrenceMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -72,7 +71,6 @@ public class DayOfMonthRecurrenceMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -92,7 +90,6 @@ public class DayOfMonthRecurrenceMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } 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 b8bfefe..8407b28 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 @@ -58,7 +58,6 @@ public class DayOfWeekRecurrence { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -78,7 +77,6 @@ public class DayOfWeekRecurrence { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -98,7 +96,6 @@ public class DayOfWeekRecurrence { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } 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 5219ff6..2547e73 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 @@ -52,7 +52,6 @@ public class DayOfWeekRecurrenceFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -72,7 +71,6 @@ public class DayOfWeekRecurrenceFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -92,7 +90,6 @@ public class DayOfWeekRecurrenceFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } 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 430a1da..8ef4cd4 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 @@ -52,7 +52,6 @@ public class DayOfWeekRecurrenceMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -72,7 +71,6 @@ public class DayOfWeekRecurrenceMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -92,7 +90,6 @@ public class DayOfWeekRecurrenceMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Duration.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Duration.java index 65323de..6c2814f 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/Duration.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Duration.java @@ -33,7 +33,6 @@ public class Duration { */ @Schema(name = "amount", description = "Time interval (number of seconds, minutes, hours, etc.)", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("amount") public Integer getAmount() { return amount; } @@ -53,7 +52,6 @@ public class Duration { */ @Schema(name = "units", description = "Unit of time (seconds, minutes, hours, etc.)", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("units") public String getUnits() { return units; } 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 bfaa3b6..665df51 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 @@ -104,7 +104,6 @@ public class Event { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -124,7 +123,6 @@ public class Event { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -144,7 +142,6 @@ public class Event { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -164,7 +161,6 @@ public class Event { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -184,7 +180,6 @@ public class Event { */ @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -204,7 +199,6 @@ public class Event { */ @Schema(name = "correlationId", description = "The correlation id for this event.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("correlationId") public String getCorrelationId() { return correlationId; } @@ -224,7 +218,6 @@ public class Event { */ @Schema(name = "domain", description = "The domain of the event.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("domain") public String getDomain() { return domain; } @@ -244,7 +237,6 @@ public class Event { */ @Schema(name = "title", description = "The title of the event.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("title") public String getTitle() { return title; } @@ -264,7 +256,6 @@ public class Event { */ @Schema(name = "description", description = "An explanation of the event.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -284,7 +275,6 @@ public class Event { */ @Schema(name = "priority", description = "A priority.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("priority") public String getPriority() { return priority; } @@ -334,7 +324,6 @@ public class Event { */ @Valid @Schema(name = "source", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("source") public EntityRef getSource() { return source; } @@ -354,7 +343,6 @@ public class Event { */ @Valid @Schema(name = "reportingSystem", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("reportingSystem") public EntityRef getReportingSystem() { return reportingSystem; } @@ -382,7 +370,6 @@ public class Event { */ @Valid @Schema(name = "relatedParty", description = "Collection of related parties", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relatedParty") public List getRelatedParty() { return relatedParty; } @@ -410,7 +397,6 @@ public class Event { */ @Valid @Schema(name = "analyticCharacteristic", description = "Collection of analytic characteristics", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("analyticCharacteristic") public List getAnalyticCharacteristic() { return analyticCharacteristic; } @@ -430,7 +416,6 @@ public class Event { */ @Schema(name = "eventId", description = "The identifier of the notification.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("eventId") public String getEventId() { return eventId; } @@ -481,7 +466,6 @@ public class Event { */ @Schema(name = "eventType", description = "The type of the notification.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("eventType") public String getEventType() { return eventType; } @@ -501,7 +485,6 @@ public class Event { */ @Schema(name = "event", description = "The event linked to the involved resource object", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("event") public Object getEvent() { return event; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifier.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifier.java index fad2bfc..00e31a2 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifier.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifier.java @@ -64,7 +64,6 @@ public class ExternalIdentifier { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -84,7 +83,6 @@ public class ExternalIdentifier { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -104,7 +102,6 @@ public class ExternalIdentifier { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class ExternalIdentifier { */ @Schema(name = "owner", example = "MagentoCommerce", description = "Name of the external system that owns the entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("owner") public String getOwner() { return owner; } @@ -144,7 +140,6 @@ public class ExternalIdentifier { */ @Schema(name = "externalIdentifierType", example = "ProductOrder", description = "Type of the identification, typically would be the type of the entity within the external system", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("externalIdentifierType") public String getExternalIdentifierType() { return externalIdentifierType; } @@ -164,7 +159,6 @@ public class ExternalIdentifier { */ @Schema(name = "id", description = "identification of the entity within the external system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierFVO.java index 41f0164..924cc9f 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierFVO.java @@ -52,7 +52,6 @@ public class ExternalIdentifierFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -72,7 +71,6 @@ public class ExternalIdentifierFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -92,7 +90,6 @@ public class ExternalIdentifierFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -112,7 +109,6 @@ public class ExternalIdentifierFVO { */ @Schema(name = "owner", example = "MagentoCommerce", description = "Name of the external system that owns the entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("owner") public String getOwner() { return owner; } @@ -132,7 +128,6 @@ public class ExternalIdentifierFVO { */ @Schema(name = "externalIdentifierType", example = "ProductOrder", description = "Type of the identification, typically would be the type of the entity within the external system", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("externalIdentifierType") public String getExternalIdentifierType() { return externalIdentifierType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierMVO.java index 642f5d3..cda745b 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ExternalIdentifierMVO.java @@ -55,7 +55,6 @@ public class ExternalIdentifierMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -75,7 +74,6 @@ public class ExternalIdentifierMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -95,7 +93,6 @@ public class ExternalIdentifierMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -115,7 +112,6 @@ public class ExternalIdentifierMVO { */ @Schema(name = "owner", example = "MagentoCommerce", description = "Name of the external system that owns the entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("owner") public String getOwner() { return owner; } @@ -135,7 +131,6 @@ public class ExternalIdentifierMVO { */ @Schema(name = "externalIdentifierType", example = "ProductOrder", description = "Type of the identification, typically would be the type of the entity within the external system", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("externalIdentifierType") public String getExternalIdentifierType() { return externalIdentifierType; } @@ -155,7 +150,6 @@ public class ExternalIdentifierMVO { */ @Schema(name = "id", description = "identification of the entity within the external system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/Feature.java b/src/main/java/org/etsi/osl/tmf/pm628/model/Feature.java index d03fd8e..01c7b11 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/Feature.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/Feature.java @@ -79,7 +79,6 @@ public class Feature extends BaseRootNamedEntity { */ @Schema(name = "isBundle", description = "True if this is a feature group. Default is false.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("isBundle") public Boolean getIsBundle() { return isBundle; } @@ -107,7 +106,6 @@ public class Feature extends BaseRootNamedEntity { */ @Valid @Schema(name = "featureRelationship", description = "Collection of feature relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("featureRelationship") public List getFeatureRelationship() { return featureRelationship; } @@ -135,7 +133,6 @@ public class Feature extends BaseRootNamedEntity { */ @Valid @Schema(name = "featureCharacteristic", description = "This is a list of Characteristics for a particular feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("featureCharacteristic") public List getFeatureCharacteristic() { return featureCharacteristic; } @@ -163,7 +160,6 @@ public class Feature extends BaseRootNamedEntity { */ @Valid @Schema(name = "policyConstraint", description = "Reference to manage a list of feature specification policy constraints", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("policyConstraint") public List getPolicyConstraint() { return policyConstraint; } @@ -183,7 +179,6 @@ public class Feature extends BaseRootNamedEntity { */ @Schema(name = "isEnabled", description = "True if this feature is enabled. Default is true.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("isEnabled") public Boolean getIsEnabled() { return isEnabled; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureFVO.java index 401bd5c..aa4f8c5 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureFVO.java @@ -70,7 +70,6 @@ public class FeatureFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -90,7 +89,6 @@ public class FeatureFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -110,7 +108,6 @@ public class FeatureFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -130,7 +127,6 @@ public class FeatureFVO { */ @Schema(name = "isBundle", description = "True if this is a feature group. Default is false.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("isBundle") public Boolean getIsBundle() { return isBundle; } @@ -158,7 +154,6 @@ public class FeatureFVO { */ @Valid @Schema(name = "featureRelationship", description = "Collection of feature relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("featureRelationship") public List getFeatureRelationship() { return featureRelationship; } @@ -186,7 +181,6 @@ public class FeatureFVO { */ @Valid @Schema(name = "featureCharacteristic", description = "This is a list of Characteristics for a particular feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("featureCharacteristic") public List getFeatureCharacteristic() { return featureCharacteristic; } @@ -214,7 +208,6 @@ public class FeatureFVO { */ @Valid @Schema(name = "policyConstraint", description = "Reference to manage a list of feature specification policy constraints", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("policyConstraint") public List getPolicyConstraint() { return policyConstraint; } @@ -234,7 +227,6 @@ public class FeatureFVO { */ @Schema(name = "isEnabled", description = "True if this feature is enabled. Default is true.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("isEnabled") public Boolean getIsEnabled() { return isEnabled; } @@ -254,7 +246,6 @@ public class FeatureFVO { */ @Schema(name = "name", description = "This is the name for the feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureMVO.java index 91dd2e5..e2ac273 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureMVO.java @@ -74,7 +74,6 @@ public class FeatureMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -94,7 +93,6 @@ public class FeatureMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -114,7 +112,6 @@ public class FeatureMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -134,7 +131,6 @@ public class FeatureMVO { */ @Schema(name = "isBundle", description = "True if this is a feature group. Default is false.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("isBundle") public Boolean getIsBundle() { return isBundle; } @@ -162,7 +158,6 @@ public class FeatureMVO { */ @Valid @Schema(name = "featureRelationship", description = "Collection of feature relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("featureRelationship") public List getFeatureRelationship() { return featureRelationship; } @@ -190,7 +185,6 @@ public class FeatureMVO { */ @Valid @Schema(name = "featureCharacteristic", description = "This is a list of Characteristics for a particular feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("featureCharacteristic") public List getFeatureCharacteristic() { return featureCharacteristic; } @@ -218,7 +212,6 @@ public class FeatureMVO { */ @Valid @Schema(name = "policyConstraint", description = "Reference to manage a list of feature specification policy constraints", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("policyConstraint") public List getPolicyConstraint() { return policyConstraint; } @@ -238,7 +231,6 @@ public class FeatureMVO { */ @Schema(name = "isEnabled", description = "True if this feature is enabled. Default is true.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("isEnabled") public Boolean getIsEnabled() { return isEnabled; } @@ -258,7 +250,6 @@ public class FeatureMVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -278,7 +269,6 @@ public class FeatureMVO { */ @NotNull @Schema(name = "name", description = "This is the name for the feature.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("name") public String getName() { return name; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipFVO.java index d218d13..ef10275 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipFVO.java @@ -109,7 +109,6 @@ public class FeatureRelationshipFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -129,7 +128,6 @@ public class FeatureRelationshipFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -149,7 +147,6 @@ public class FeatureRelationshipFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getAtSchemaLocation() { return schemaLocation; } @@ -169,7 +166,6 @@ public class FeatureRelationshipFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -189,7 +185,6 @@ public class FeatureRelationshipFVO { */ @NotNull @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -209,7 +204,6 @@ public class FeatureRelationshipFVO { */ @Schema(name = "name", description = "This is the name of the target feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -229,7 +223,6 @@ public class FeatureRelationshipFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -249,7 +242,6 @@ public class FeatureRelationshipFVO { */ @NotNull @Schema(name = "relationshipType", description = "This is the type of the feature relationship.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("relationshipType") public RelationshipTypeEnum getRelationshipType() { return relationshipType; } @@ -269,7 +261,6 @@ public class FeatureRelationshipFVO { */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipMVO.java index ba40a72..68a8f5c 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FeatureRelationshipMVO.java @@ -109,7 +109,6 @@ public class FeatureRelationshipMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -129,7 +128,6 @@ public class FeatureRelationshipMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -149,7 +147,6 @@ public class FeatureRelationshipMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -169,7 +166,6 @@ public class FeatureRelationshipMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -189,7 +185,6 @@ public class FeatureRelationshipMVO { */ @NotNull @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -209,7 +204,6 @@ public class FeatureRelationshipMVO { */ @Schema(name = "name", description = "This is the name of the target feature.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -229,7 +223,6 @@ public class FeatureRelationshipMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -249,7 +242,6 @@ public class FeatureRelationshipMVO { */ @NotNull @Schema(name = "relationshipType", description = "This is the type of the feature relationship.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("relationshipType") public RelationshipTypeEnum getRelationshipType() { return relationshipType; } @@ -269,7 +261,6 @@ public class FeatureRelationshipMVO { */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferData.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferData.java index b5cc6a9..b02b46c 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferData.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferData.java @@ -74,7 +74,6 @@ public class FileTransferData extends ProtocolTransferData { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -94,7 +93,6 @@ public class FileTransferData extends ProtocolTransferData { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -114,7 +112,6 @@ public class FileTransferData extends ProtocolTransferData { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -134,7 +131,6 @@ public class FileTransferData extends ProtocolTransferData { */ @Valid @Schema(name = "fileLocation", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileLocation") public URI getFileLocation() { return fileLocation; } @@ -154,7 +150,6 @@ public class FileTransferData extends ProtocolTransferData { */ @Schema(name = "fileFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileFormat") public String getFileFormat() { return fileFormat; } @@ -174,7 +169,6 @@ public class FileTransferData extends ProtocolTransferData { */ @Valid @Schema(name = "compressionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("compressionType") public CompressionType getCompressionType() { return compressionType; } @@ -194,7 +188,6 @@ public class FileTransferData extends ProtocolTransferData { */ @Valid @Schema(name = "retentionPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("retentionPeriod") public Duration getRetentionPeriod() { return retentionPeriod; } @@ -214,7 +207,6 @@ public class FileTransferData extends ProtocolTransferData { */ @Valid @Schema(name = "packingType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("packingType") public PackingType getPackingType() { return packingType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataFVO.java index 584093e..3b76848 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataFVO.java @@ -64,7 +64,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -84,7 +83,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -104,7 +102,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO { */ @Valid @Schema(name = "fileLocation", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileLocation") public URI getFileLocation() { return fileLocation; } @@ -144,7 +140,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO { */ @Schema(name = "fileFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileFormat") public String getFileFormat() { return fileFormat; } @@ -164,7 +159,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO { */ @Valid @Schema(name = "compressionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("compressionType") public CompressionType getCompressionType() { return compressionType; } @@ -184,7 +178,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO { */ @Valid @Schema(name = "retentionPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("retentionPeriod") public Duration getRetentionPeriod() { return retentionPeriod; } @@ -204,7 +197,6 @@ public class FileTransferDataFVO extends ProtocolTransferDataFVO { */ @Valid @Schema(name = "packingType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("packingType") public PackingType getPackingType() { return packingType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataMVO.java index 045e75b..8228525 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/FileTransferDataMVO.java @@ -64,7 +64,6 @@ public class FileTransferDataMVO extends ProtocolTransferData { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -84,7 +83,6 @@ public class FileTransferDataMVO extends ProtocolTransferData { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -104,7 +102,6 @@ public class FileTransferDataMVO extends ProtocolTransferData { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class FileTransferDataMVO extends ProtocolTransferData { */ @Valid @Schema(name = "fileLocation", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileLocation") public URI getFileLocation() { return fileLocation; } @@ -144,7 +140,6 @@ public class FileTransferDataMVO extends ProtocolTransferData { */ @Schema(name = "fileFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileFormat") public String getFileFormat() { return fileFormat; } @@ -164,7 +159,6 @@ public class FileTransferDataMVO extends ProtocolTransferData { */ @Valid @Schema(name = "compressionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("compressionType") public CompressionType getCompressionType() { return compressionType; } @@ -184,7 +178,6 @@ public class FileTransferDataMVO extends ProtocolTransferData { */ @Valid @Schema(name = "retentionPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("retentionPeriod") public Duration getRetentionPeriod() { return retentionPeriod; } @@ -204,7 +197,6 @@ public class FileTransferDataMVO extends ProtocolTransferData { */ @Valid @Schema(name = "packingType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("packingType") public PackingType getPackingType() { return packingType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRef.java index 9695005..6568b48 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRef.java @@ -70,7 +70,6 @@ public class IntentRef { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -90,7 +89,6 @@ public class IntentRef { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -110,7 +108,6 @@ public class IntentRef { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -130,7 +127,6 @@ public class IntentRef { */ @Schema(name = "href", description = "The URI of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -150,7 +146,6 @@ public class IntentRef { */ @NotNull @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -170,7 +165,6 @@ public class IntentRef { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -190,7 +184,6 @@ public class IntentRef { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefFVO.java index da9f4a5..d79cef3 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefFVO.java @@ -59,7 +59,6 @@ public class IntentRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class IntentRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class IntentRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class IntentRefFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -139,7 +135,6 @@ public class IntentRefFVO { */ @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -159,7 +154,6 @@ public class IntentRefFVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -179,7 +173,6 @@ public class IntentRefFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefMVO.java index 37c224d..075cc95 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/IntentRefMVO.java @@ -59,7 +59,6 @@ public class IntentRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class IntentRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class IntentRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class IntentRefMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -139,7 +135,6 @@ public class IntentRefMVO { */ @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -159,7 +154,6 @@ public class IntentRefMVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -179,7 +173,6 @@ public class IntentRefMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResource.java b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResource.java index a3340ce..2bd0998 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResource.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResource.java @@ -52,7 +52,6 @@ public class LogicalResource extends Resource { */ @Schema(name = "value", description = "the value of the logical resource. E.g '0746712345' for MSISDN's", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("value") public String getValue() { return value; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceFVO.java index 95eecfd..469b427 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceFVO.java @@ -56,7 +56,6 @@ public class LogicalResourceFVO extends ResourceFVO { */ @Schema(name = "value", description = "the value of the logical resource. E.g '0746712345' for MSISDN's", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("value") public String getValue() { return value; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceMVO.java index 0838d54..4b412ac 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/LogicalResourceMVO.java @@ -56,7 +56,6 @@ public class LogicalResourceMVO extends ResourceMVO { */ @Schema(name = "value", description = "the value of the logical resource. E.g '0746712345' for MSISDN's", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("value") public String getValue() { return value; } 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 702c367..7428c49 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 @@ -107,7 +107,6 @@ public class ManagementJob extends BaseRootEntity { */ @Valid @Schema(name = "adminState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("adminState") public AdministrativeState getAdminState() { return adminState; } @@ -158,7 +157,6 @@ public class ManagementJob extends BaseRootEntity { */ @Valid @Schema(name = "executionState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("executionState") public ExecutionStateType getExecutionState() { return executionState; } @@ -186,7 +184,6 @@ public class ManagementJob extends BaseRootEntity { */ @Valid @Size(min = 0) @Schema(name = "fileTransferData", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileTransferData") public List getFileTransferData() { return fileTransferData; } @@ -214,7 +211,6 @@ public class ManagementJob extends BaseRootEntity { */ @Valid @Size(min = 0) @Schema(name = "dataAccessEndpoint", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("dataAccessEndpoint") public List getDataAccessEndpoint() { return dataAccessEndpoint; } @@ -234,7 +230,6 @@ public class ManagementJob extends BaseRootEntity { */ @Schema(name = "jobId", description = "The ID of the management job.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobId") public String getJobId() { return jobId; } @@ -256,7 +251,6 @@ public class ManagementJob extends BaseRootEntity { */ @Min(1) @Max(10) @Schema(name = "jobPriority", description = "The priority of the management job. The way the management application will use the JobPriority to schedule job execution is application specific and outside the scope. Integer, limited to a range of 1 to 10.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobPriority") public Integer getJobPriority() { return jobPriority; } @@ -314,7 +308,6 @@ public class ManagementJob extends BaseRootEntity { */ @Valid @Size(max = 1) @Schema(name = "scheduleDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("scheduleDefinition") public List getScheduleDefinition() { return scheduleDefinition; } 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 cafc616..95c6042 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 @@ -102,9 +102,8 @@ public class ManagementJobFVO { * When sub-classing, this defines the sub-class Extensible name * @return atType */ - @NotNull + @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -124,7 +123,6 @@ public class ManagementJobFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -144,7 +142,6 @@ public class ManagementJobFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -164,7 +161,6 @@ public class ManagementJobFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -184,7 +180,6 @@ public class ManagementJobFVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -204,7 +199,6 @@ public class ManagementJobFVO { */ @Valid @Schema(name = "adminState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("adminState") public AdministrativeState getAdminState() { return adminState; } @@ -254,7 +248,6 @@ public class ManagementJobFVO { */ @Valid @Schema(name = "executionState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("executionState") public ExecutionStateType getExecutionState() { return executionState; } @@ -282,7 +275,6 @@ public class ManagementJobFVO { */ @Valid @Size(min = 0) @Schema(name = "fileTransferData", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileTransferData") public List getFileTransferData() { return fileTransferData; } @@ -310,7 +302,6 @@ public class ManagementJobFVO { */ @Valid @Size(min = 0) @Schema(name = "dataAccessEndpoint", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("dataAccessEndpoint") public List getDataAccessEndpoint() { return dataAccessEndpoint; } @@ -330,7 +321,6 @@ public class ManagementJobFVO { */ @Schema(name = "jobId", description = "The ID of the management job.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobId") public String getJobId() { return jobId; } @@ -352,7 +342,6 @@ public class ManagementJobFVO { */ @Min(1) @Max(10) @Schema(name = "jobPriority", description = "The priority of the management job. The way the management application will use the JobPriority to schedule job execution is application specific and outside the scope. Integer, limited to a range of 1 to 10.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobPriority") public Integer getJobPriority() { return jobPriority; } @@ -410,7 +399,6 @@ public class ManagementJobFVO { */ @Valid @Size(max = 1) @Schema(name = "scheduleDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("scheduleDefinition") public List getScheduleDefinition() { return scheduleDefinition; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java index fce75a1..bc99e22 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJobMVO.java @@ -88,7 +88,6 @@ public class ManagementJobMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -108,7 +107,6 @@ public class ManagementJobMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -128,7 +126,6 @@ public class ManagementJobMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -148,7 +145,6 @@ public class ManagementJobMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -168,7 +164,6 @@ public class ManagementJobMVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -196,7 +191,6 @@ public class ManagementJobMVO { */ @Valid @Size(min = 0) @Schema(name = "fileTransferData", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("fileTransferData") public List getFileTransferData() { return fileTransferData; } @@ -224,7 +218,6 @@ public class ManagementJobMVO { */ @Valid @Size(min = 0) @Schema(name = "dataAccessEndpoint", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("dataAccessEndpoint") public List getDataAccessEndpoint() { return dataAccessEndpoint; } @@ -252,7 +245,6 @@ public class ManagementJobMVO { */ @Valid @Size(max = 1) @Schema(name = "scheduleDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("scheduleDefinition") public List getScheduleDefinition() { return scheduleDefinition; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java index 308dc32..3b93280 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJob.java @@ -75,7 +75,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea */ @Schema(name = "outputFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("outputFormat") public String getOutputFormat() { return outputFormat; } @@ -95,7 +94,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea */ @Valid @Schema(name = "reportingPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("reportingPeriod") public ReportingPeriod getReportingPeriod() { return reportingPeriod; } @@ -115,7 +113,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea */ @Valid @Schema(name = "jobCollectionFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobCollectionFilter") public DataFilterMap getJobCollectionFilter() { return jobCollectionFilter; } @@ -135,7 +132,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea */ @Valid @Schema(name = "searchTaskFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("searchTaskFilter") public DataFilterMap getSearchTaskFilter() { return searchTaskFilter; } @@ -155,7 +151,6 @@ public class MeasurementCollectionJob extends MeasurementJob implements PatchMea */ @Schema(name = "jobOnDemand", description = "True if the job is a single job to be executed immediately in which case the reportingPeriod and scheduleDefinition would not be applicable, false otherwise", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobOnDemand") public Boolean getJobOnDemand() { return jobOnDemand; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobFVO.java index 9da9af1..69d243c 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobFVO.java @@ -54,7 +54,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO { */ @Schema(name = "outputFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("outputFormat") public String getOutputFormat() { return outputFormat; } @@ -74,7 +73,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO { */ @Valid @Schema(name = "reportingPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("reportingPeriod") public ReportingPeriod getReportingPeriod() { return reportingPeriod; } @@ -94,7 +92,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO { */ @Valid @Schema(name = "jobCollectionFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobCollectionFilter") public DataFilterMapFVO getJobCollectionFilter() { return jobCollectionFilter; } @@ -114,7 +111,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO { */ @Valid @Schema(name = "searchTaskFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("searchTaskFilter") public DataFilterMapFVO getSearchTaskFilter() { return searchTaskFilter; } @@ -134,7 +130,6 @@ public class MeasurementCollectionJobFVO extends MeasurementJobFVO { */ @Schema(name = "jobOnDemand", description = "True if the job is a single job to be executed immediately in which case the reportingPeriod and scheduleDefinition would not be applicable, false otherwise", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobOnDemand") public Boolean getJobOnDemand() { return jobOnDemand; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMVO.java index 9ac755d..3fe46ef 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobMVO.java @@ -53,7 +53,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO { */ @Schema(name = "outputFormat", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("outputFormat") public String getOutputFormat() { return outputFormat; } @@ -73,7 +72,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO { */ @Valid @Schema(name = "reportingPeriod", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("reportingPeriod") public ReportingPeriod getReportingPeriod() { return reportingPeriod; } @@ -93,7 +91,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO { */ @Valid @Schema(name = "jobCollectionFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobCollectionFilter") public DataFilterMapMVO getJobCollectionFilter() { return jobCollectionFilter; } @@ -113,7 +110,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO { */ @Valid @Schema(name = "searchTaskFilter", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("searchTaskFilter") public DataFilterMapMVO getSearchTaskFilter() { return searchTaskFilter; } @@ -133,7 +129,6 @@ public class MeasurementCollectionJobMVO extends MeasurementJobMVO { */ @Schema(name = "jobOnDemand", description = "True if the job is a single job to be executed immediately in which case the reportingPeriod and scheduleDefinition would not be applicable, false otherwise", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("jobOnDemand") public Boolean getJobOnDemand() { return jobOnDemand; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobRef.java index 2a2bfff..c71b618 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementCollectionJobRef.java @@ -60,7 +60,6 @@ public class MeasurementCollectionJobRef { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -80,7 +79,6 @@ public class MeasurementCollectionJobRef { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -100,7 +98,6 @@ public class MeasurementCollectionJobRef { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -120,7 +117,6 @@ public class MeasurementCollectionJobRef { */ @Schema(name = "href", description = "The URI of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -140,7 +136,6 @@ public class MeasurementCollectionJobRef { */ @NotNull @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -160,7 +155,6 @@ public class MeasurementCollectionJobRef { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -180,7 +174,6 @@ public class MeasurementCollectionJobRef { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java index c6056eb..9e9f70b 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java @@ -110,7 +110,6 @@ public class MeasurementJob extends ManagementJob { */ @Schema(name = "consumingApplicationId", description = "The identifier of the application that consumes performance indicators.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("consumingApplicationId") public String getConsumingApplicationId() { return consumingApplicationId; } @@ -130,7 +129,6 @@ public class MeasurementJob extends ManagementJob { */ @Schema(name = "producingApplicationId", description = "The identifier of the application that produces performance indicators.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("producingApplicationId") public String getProducingApplicationId() { return producingApplicationId; } @@ -150,7 +148,6 @@ public class MeasurementJob extends ManagementJob { */ @Valid @Schema(name = "granularity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("granularity") public Granularity getGranularity() { return granularity; } @@ -178,7 +175,6 @@ public class MeasurementJob extends ManagementJob { */ @Valid @Size(min = 0) @Schema(name = "performanceIndicatorGroupSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorGroupSpecification") public List getPerformanceIndicatorGroupSpecification() { return performanceIndicatorGroupSpecification; } @@ -206,7 +202,6 @@ public class MeasurementJob extends ManagementJob { */ @Valid @Size(min = 0) @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorSpecification") public List<@Valid PerformanceIndicatorSpecificationRefOrValue> getPerformanceIndicatorSpecification() { return performanceIndicatorSpecification; } @@ -234,7 +229,6 @@ public class MeasurementJob extends ManagementJob { */ @Valid @Size(min = 0) @Schema(name = "trackingRecord", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("trackingRecord") public List getTrackingRecord() { return trackingRecord; } @@ -254,7 +248,6 @@ public class MeasurementJob extends ManagementJob { */ @Valid @Schema(name = "monitoredInstancesCriteria", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("monitoredInstancesCriteria") public MonitoredInstancesCriteria getMonitoredInstancesCriteria() { return monitoredInstancesCriteria; } @@ -274,7 +267,6 @@ public class MeasurementJob extends ManagementJob { */ @Valid @Schema(name = "monitoredClassCriteria", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("monitoredClassCriteria") public MonitoredClassCriteria getMonitoredClassCriteria() { return monitoredClassCriteria; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobFVO.java index 4c321c7..dd09543 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobFVO.java @@ -84,7 +84,6 @@ public class MeasurementJobFVO extends ManagementJobFVO { */ @NotNull @Schema(name = "consumingApplicationId", description = "The identifier of the application that consumes performance indicators.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("consumingApplicationId") public String getConsumingApplicationId() { return consumingApplicationId; } @@ -104,7 +103,6 @@ public class MeasurementJobFVO extends ManagementJobFVO { */ @NotNull @Schema(name = "producingApplicationId", description = "The identifier of the application that produces performance indicators.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("producingApplicationId") public String getProducingApplicationId() { return producingApplicationId; } @@ -124,7 +122,6 @@ public class MeasurementJobFVO extends ManagementJobFVO { */ @Valid @Schema(name = "granularity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("granularity") public Granularity getGranularity() { return granularity; } @@ -152,7 +149,6 @@ public class MeasurementJobFVO extends ManagementJobFVO { */ @Valid @Size(min = 0) @Schema(name = "performanceIndicatorGroupSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorGroupSpecification") public List getPerformanceIndicatorGroupSpecification() { return performanceIndicatorGroupSpecification; } @@ -180,7 +176,6 @@ public class MeasurementJobFVO extends ManagementJobFVO { */ @NotNull @Valid @Size(min = 0) @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("performanceIndicatorSpecification") public List<@Valid PerformanceIndicatorSpecificationRefOrValueFVO> getPerformanceIndicatorSpecification() { return performanceIndicatorSpecification; } @@ -208,7 +203,6 @@ public class MeasurementJobFVO extends ManagementJobFVO { */ @Valid @Size(min = 0) @Schema(name = "trackingRecord", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("trackingRecord") public List getTrackingRecord() { return trackingRecord; } @@ -228,7 +222,6 @@ public class MeasurementJobFVO extends ManagementJobFVO { */ @Valid @Schema(name = "monitoredInstancesCriteria", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("monitoredInstancesCriteria") public MonitoredInstancesCriteriaFVO getMonitoredInstancesCriteria() { return monitoredInstancesCriteria; } @@ -248,7 +241,6 @@ public class MeasurementJobFVO extends ManagementJobFVO { */ @Valid @Schema(name = "monitoredClassCriteria", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("monitoredClassCriteria") public MonitoredClassCriteriaFVO getMonitoredClassCriteria() { return monitoredClassCriteria; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java index 02d6e76..b971db1 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJobMVO.java @@ -73,7 +73,6 @@ public class MeasurementJobMVO extends ManagementJobMVO { */ @Schema(name = "consumingApplicationId", description = "The identifier of the application that consumes performance indicators.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("consumingApplicationId") public String getConsumingApplicationId() { return consumingApplicationId; } @@ -93,7 +92,6 @@ public class MeasurementJobMVO extends ManagementJobMVO { */ @Schema(name = "producingApplicationId", description = "The identifier of the application that produces performance indicators.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("producingApplicationId") public String getProducingApplicationId() { return producingApplicationId; } @@ -113,7 +111,6 @@ public class MeasurementJobMVO extends ManagementJobMVO { */ @Valid @Schema(name = "granularity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("granularity") public Granularity getGranularity() { return granularity; } @@ -141,7 +138,6 @@ public class MeasurementJobMVO extends ManagementJobMVO { */ @Valid @Size(min = 0) @Schema(name = "performanceIndicatorGroupSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorGroupSpecification") public List getPerformanceIndicatorGroupSpecification() { return performanceIndicatorGroupSpecification; } @@ -169,7 +165,6 @@ public class MeasurementJobMVO extends ManagementJobMVO { */ @Valid @Size(min = 0) @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorSpecification") public List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> getPerformanceIndicatorSpecification() { return performanceIndicatorSpecification; } @@ -197,7 +192,6 @@ public class MeasurementJobMVO extends ManagementJobMVO { */ @Valid @Size(min = 0) @Schema(name = "trackingRecord", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("trackingRecord") public List getTrackingRecord() { return trackingRecord; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteria.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteria.java index 92e98bb..a059583 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteria.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteria.java @@ -58,7 +58,6 @@ public class MonitoredClassCriteria { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -78,7 +77,6 @@ public class MonitoredClassCriteria { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -98,7 +96,6 @@ public class MonitoredClassCriteria { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -118,7 +115,6 @@ public class MonitoredClassCriteria { */ @Schema(name = "monitoredObjectClass", description = "A monitored object class for specifying the set of instances that are referenced by a PM query.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("monitoredObjectClass") public String getMonitoredObjectClass() { return monitoredObjectClass; } @@ -138,7 +134,6 @@ public class MonitoredClassCriteria { */ @Schema(name = "objectInstanceFilter", description = "A filter that can be used in conjunction with the monitored object class for specifying the set of instances that are referenced by a PM query.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("objectInstanceFilter") public String getObjectInstanceFilter() { return objectInstanceFilter; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteriaFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteriaFVO.java index 436acd3..e489dd8 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteriaFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredClassCriteriaFVO.java @@ -52,7 +52,6 @@ public class MonitoredClassCriteriaFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -72,7 +71,6 @@ public class MonitoredClassCriteriaFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -92,7 +90,6 @@ public class MonitoredClassCriteriaFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -112,7 +109,6 @@ public class MonitoredClassCriteriaFVO { */ @Schema(name = "monitoredObjectClass", description = "A monitored object class for specifying the set of instances that are referenced by a PM query.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("monitoredObjectClass") public String getMonitoredObjectClass() { return monitoredObjectClass; } @@ -132,7 +128,6 @@ public class MonitoredClassCriteriaFVO { */ @Schema(name = "objectInstanceFilter", description = "A filter that can be used in conjunction with the monitored object class for specifying the set of instances that are referenced by a PM query.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("objectInstanceFilter") public String getObjectInstanceFilter() { return objectInstanceFilter; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteria.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteria.java index 722b6eb..2adc9d8 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteria.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteria.java @@ -60,7 +60,6 @@ public class MonitoredInstancesCriteria { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -80,7 +79,6 @@ public class MonitoredInstancesCriteria { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -100,7 +98,6 @@ public class MonitoredInstancesCriteria { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -128,7 +125,6 @@ public class MonitoredInstancesCriteria { */ @Size(min = 0) @Schema(name = "monitoredObjectInstances", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("monitoredObjectInstances") public List getMonitoredObjectInstances() { return monitoredObjectInstances; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteriaFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteriaFVO.java index d91d0f7..508f29c 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteriaFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonitoredInstancesCriteriaFVO.java @@ -54,7 +54,6 @@ public class MonitoredInstancesCriteriaFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -74,7 +73,6 @@ public class MonitoredInstancesCriteriaFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -94,7 +92,6 @@ public class MonitoredInstancesCriteriaFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -122,7 +119,6 @@ public class MonitoredInstancesCriteriaFVO { */ @Size(min = 0) @Schema(name = "monitoredObjectInstances", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("monitoredObjectInstances") public List getMonitoredObjectInstances() { return monitoredObjectInstances; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinition.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinition.java index 2570eee..fd8f988 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinition.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinition.java @@ -66,7 +66,6 @@ public class MonthlyScheduleDayOfWeekDefinition { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -86,7 +85,6 @@ public class MonthlyScheduleDayOfWeekDefinition { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -106,7 +104,6 @@ public class MonthlyScheduleDayOfWeekDefinition { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -134,7 +131,6 @@ public class MonthlyScheduleDayOfWeekDefinition { */ @Valid @Schema(name = "dayOfMonthRecurrence", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("dayOfMonthRecurrence") public List getDayOfMonthRecurrence() { return dayOfMonthRecurrence; } @@ -154,7 +150,6 @@ public class MonthlyScheduleDayOfWeekDefinition { */ @Schema(name = "recurringDaySequence", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("recurringDaySequence") public String getRecurringDaySequence() { return recurringDaySequence; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionFVO.java index c5e8663..65cf888 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionFVO.java @@ -56,7 +56,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -76,7 +75,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -96,7 +94,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO { */ @Valid @Schema(name = "dayOfMonthRecurrence", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("dayOfMonthRecurrence") public List getDayOfMonthRecurrence() { return dayOfMonthRecurrence; } @@ -144,7 +140,6 @@ public class MonthlyScheduleDayOfWeekDefinitionFVO { */ @Schema(name = "recurringDaySequence", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("recurringDaySequence") public String getRecurringDaySequence() { return recurringDaySequence; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java index 760f22c..09a52a0 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MonthlyScheduleDayOfWeekDefinitionMVO.java @@ -56,7 +56,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -76,7 +75,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -96,7 +94,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO { */ @Valid @Schema(name = "dayOfMonthRecurrence", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("dayOfMonthRecurrence") public List getDayOfMonthRecurrence() { return dayOfMonthRecurrence; } @@ -144,7 +140,6 @@ public class MonthlyScheduleDayOfWeekDefinitionMVO { */ @Schema(name = "recurringDaySequence", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("recurringDaySequence") public String getRecurringDaySequence() { return recurringDaySequence; } 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 a958a29..78d4db7 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 @@ -58,7 +58,6 @@ public class NoteFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -78,7 +77,6 @@ public class NoteFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -98,7 +96,6 @@ public class NoteFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getAtSchemaLocation() { return schemaLocation; } @@ -118,7 +115,6 @@ public class NoteFVO { */ @Schema(name = "author", example = "Mr. N. Bene", description = "Author of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("author") public String getAuthor() { return author; } @@ -168,7 +164,6 @@ public class NoteFVO { */ @Schema(name = "text", example = "This is important", description = "Text of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("text") public String getText() { return text; } 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 4add4b4..f803be3 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 @@ -61,7 +61,6 @@ public class NoteMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -81,7 +80,6 @@ public class NoteMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -101,7 +99,6 @@ public class NoteMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class NoteMVO { */ @Schema(name = "uuid", example = "afa9-3d90aaa8da0f", description = "Identifier of the note within its containing entity", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -141,7 +137,6 @@ public class NoteMVO { */ @Schema(name = "author", example = "Mr. N. Bene", description = "Author of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("author") public String getAuthor() { return author; } @@ -191,7 +186,6 @@ public class NoteMVO { */ @Schema(name = "text", example = "This is important", description = "Text of the note", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("text") public String getText() { return text; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PackingType.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PackingType.java index 4e692f8..afdb505 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PackingType.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PackingType.java @@ -31,7 +31,6 @@ public class PackingType { */ @Valid @Schema(name = "packingEnumType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("packingEnumType") public PackingEnumType getPackingEnumType() { return packingEnumType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRef.java index a620d50..483a6d1 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRef.java @@ -44,7 +44,6 @@ public class PartyRef extends BaseRootNamedEntity implements PartyRefOrPartyRole */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefFVO.java index b7aaa14..e1c7873 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefFVO.java @@ -59,7 +59,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -139,7 +135,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -159,7 +154,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -179,7 +173,6 @@ public class PartyRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefMVO.java index 1d5a9d4..2863a81 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRefMVO.java @@ -59,7 +59,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -139,7 +135,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "uuid", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -159,7 +154,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -179,7 +173,6 @@ public class PartyRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRef.java index 4d8a3ec..b2ccf0c 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRef.java @@ -49,7 +49,6 @@ public class PartyRoleRef extends BaseRootNamedEntity implements PartyRefOrParty */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -69,7 +68,6 @@ public class PartyRoleRef extends BaseRootNamedEntity implements PartyRefOrParty */ @Schema(name = "partyId", description = "The identifier of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyId") public String getPartyId() { return partyId; } @@ -89,7 +87,6 @@ public class PartyRoleRef extends BaseRootNamedEntity implements PartyRefOrParty */ @Schema(name = "partyName", description = "The name of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyName") public String getPartyName() { return partyName; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefFVO.java index fafb8ee..e124f15 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefFVO.java @@ -64,7 +64,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -84,7 +83,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -104,7 +102,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -144,7 +140,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -164,7 +159,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -184,7 +178,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -204,7 +197,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "partyId", description = "The identifier of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyId") public String getPartyId() { return partyId; } @@ -224,7 +216,6 @@ public class PartyRoleRefFVO implements PartyRefOrPartyRoleRefFVO { */ @Schema(name = "partyName", description = "The name of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyName") public String getPartyName() { return partyName; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefMVO.java index bc500b8..52a06ce 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PartyRoleRefMVO.java @@ -64,7 +64,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -84,7 +83,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -104,7 +102,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -144,7 +140,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "uuid", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -164,7 +159,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -184,7 +178,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -204,7 +197,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "partyId", description = "The identifier of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyId") public String getPartyId() { return partyId; } @@ -224,7 +216,6 @@ public class PartyRoleRefMVO implements PartyRefOrPartyRoleRefMVO { */ @Schema(name = "partyName", description = "The name of the engaged party that is linked to the PartyRole object.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyName") public String getPartyName() { return partyName; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java index d8aa88a..067d023 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java @@ -65,7 +65,6 @@ public class PerformanceIndicatorGroupSpecification extends BaseRootNamedEntity */ @Schema(name = "groupCategory", description = "A grouping or set of PerformanceIndicatorGroupSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("groupCategory") public String getGroupCategory() { return groupCategory; } @@ -93,7 +92,6 @@ public class PerformanceIndicatorGroupSpecification extends BaseRootNamedEntity */ @Valid @Size(min = 1) @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorSpecification") public List<@Valid PerformanceIndicatorSpecificationRefOrValue> getPerformanceIndicatorSpecification() { return performanceIndicatorSpecification; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationFVO.java index 9eef481..22da9c9 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationFVO.java @@ -62,7 +62,6 @@ public class PerformanceIndicatorGroupSpecificationFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -82,7 +81,6 @@ public class PerformanceIndicatorGroupSpecificationFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return atBaseType; } @@ -102,7 +100,6 @@ public class PerformanceIndicatorGroupSpecificationFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -122,7 +119,6 @@ public class PerformanceIndicatorGroupSpecificationFVO { */ @NotNull @Schema(name = "name", description = "A word, term, or phrase by which a PerformanceIndicatorGroupSpecification is tagged.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -142,7 +138,6 @@ public class PerformanceIndicatorGroupSpecificationFVO { */ @NotNull @Schema(name = "groupCategory", description = "A grouping or set of PerformanceIndicatorGroupSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("groupCategory") public String getGroupCategory() { return groupCategory; } @@ -170,7 +165,6 @@ public class PerformanceIndicatorGroupSpecificationFVO { */ @Valid @Size(min = 1) @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorSpecification") public List<@Valid PerformanceIndicatorSpecificationRefOrValueFVO> getPerformanceIndicatorSpecification() { return performanceIndicatorSpecification; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java index b9f81ab..211304d 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationMVO.java @@ -63,7 +63,6 @@ public class PerformanceIndicatorGroupSpecificationMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -83,7 +82,6 @@ public class PerformanceIndicatorGroupSpecificationMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -103,7 +101,6 @@ public class PerformanceIndicatorGroupSpecificationMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -123,7 +120,6 @@ public class PerformanceIndicatorGroupSpecificationMVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -143,7 +139,6 @@ public class PerformanceIndicatorGroupSpecificationMVO { */ @Schema(name = "name", description = "A word, term, or phrase by which a PerformanceIndicatorGroupSpecification is tagged.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -163,7 +158,6 @@ public class PerformanceIndicatorGroupSpecificationMVO { */ @Schema(name = "groupCategory", description = "A grouping or set of PerformanceIndicatorGroupSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("groupCategory") public String getGroupCategory() { return groupCategory; } @@ -191,7 +185,6 @@ public class PerformanceIndicatorGroupSpecificationMVO { */ @Valid @Size(min = 1) @Schema(name = "performanceIndicatorSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorSpecification") public List<@Valid PerformanceIndicatorSpecificationRefOrValueMVO> getPerformanceIndicatorSpecification() { return performanceIndicatorSpecification; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationRef.java index d699bf4..6ea112d 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecificationRef.java @@ -44,7 +44,6 @@ public class PerformanceIndicatorGroupSpecificationRef extends BaseRootNamedEnti */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -64,7 +63,6 @@ public class PerformanceIndicatorGroupSpecificationRef extends BaseRootNamedEnti */ @Schema(name = "version", description = "Version of the performance indicator group specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationship.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationship.java index 38b35e0..671dcd8 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationship.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationship.java @@ -52,7 +52,6 @@ public class PerformanceIndicatorSpecRelationship extends BaseRootEntity { */ @Schema(name = "relationshipType", description = "", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } @@ -72,7 +71,6 @@ public class PerformanceIndicatorSpecRelationship extends BaseRootEntity { */ @Schema(name = "role", description = "The association role for this service specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -92,7 +90,6 @@ public class PerformanceIndicatorSpecRelationship extends BaseRootEntity { */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipFVO.java index bc47f49..0602b39 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipFVO.java @@ -65,7 +65,6 @@ public class PerformanceIndicatorSpecRelationshipFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -85,7 +84,6 @@ public class PerformanceIndicatorSpecRelationshipFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -105,7 +103,6 @@ public class PerformanceIndicatorSpecRelationshipFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -125,7 +122,6 @@ public class PerformanceIndicatorSpecRelationshipFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -145,7 +141,6 @@ public class PerformanceIndicatorSpecRelationshipFVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -165,7 +160,6 @@ public class PerformanceIndicatorSpecRelationshipFVO { */ @NotNull @Schema(name = "relationshipType", description = "", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } @@ -185,7 +179,6 @@ public class PerformanceIndicatorSpecRelationshipFVO { */ @Schema(name = "role", description = "The association role for this service specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -205,7 +198,6 @@ public class PerformanceIndicatorSpecRelationshipFVO { */ @NotNull @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipMVO.java index 5202124..43995fc 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecRelationshipMVO.java @@ -63,7 +63,6 @@ public class PerformanceIndicatorSpecRelationshipMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -83,7 +82,6 @@ public class PerformanceIndicatorSpecRelationshipMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -103,7 +101,6 @@ public class PerformanceIndicatorSpecRelationshipMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -123,7 +120,6 @@ public class PerformanceIndicatorSpecRelationshipMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -143,7 +139,6 @@ public class PerformanceIndicatorSpecRelationshipMVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -163,7 +158,6 @@ public class PerformanceIndicatorSpecRelationshipMVO { */ @Schema(name = "relationshipType", description = "", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } @@ -183,7 +177,6 @@ public class PerformanceIndicatorSpecRelationshipMVO { */ @Schema(name = "role", description = "The association role for this service specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -203,7 +196,6 @@ public class PerformanceIndicatorSpecRelationshipMVO { */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecification.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecification.java index 013009b..5ea1628 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecification.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecification.java @@ -81,7 +81,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Schema(name = "description", description = "A narrative that explains in detail what the PerformanceIndicatorSpecification is.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -101,7 +100,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Schema(name = "perspective", description = "The point of view for the PerformanceIndicatorSpecification, such as a single user instance or aggregation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("perspective") public String getPerspective() { return perspective; } @@ -121,7 +119,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Schema(name = "indicatorCategory", description = "A grouping or set of PerformanceIndicatorSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("indicatorCategory") public String getIndicatorCategory() { return indicatorCategory; } @@ -141,7 +138,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Valid @Schema(name = "indicatorType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("indicatorType") public IndicatorType getIndicatorType() { return indicatorType; } @@ -161,7 +157,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Schema(name = "derivationAlgorithm", description = "A step-by-step procedure used to calculate the value of PerformanceIndicator.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("derivationAlgorithm") public String getDerivationAlgorithm() { return derivationAlgorithm; } @@ -181,7 +176,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Schema(name = "derivationMethod", description = "For simple calculations, the method used to calculate the value of a PerformanceIndicator, such as average, minimum, maximum, sum and so forth.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("derivationMethod") public String getDerivationMethod() { return derivationMethod; } @@ -201,7 +195,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } @@ -221,7 +214,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Valid @Schema(name = "collectionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("collectionType") public CollectionType getCollectionType() { return collectionType; } @@ -241,7 +233,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Schema(name = "indicatorUnit", description = "The unit by which the indicator is measured. For example, seconds, KBs, rate per second, etc.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("indicatorUnit") public String getIndicatorUnit() { return indicatorUnit; } @@ -269,7 +260,6 @@ public class PerformanceIndicatorSpecification extends BaseRootNamedEntity imple */ @Valid @Size(min = 0) @Schema(name = "performanceIndicatorSpecRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorSpecRelationship") public List getPerformanceIndicatorSpecRelationship() { return performanceIndicatorSpecRelationship; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationFVO.java index 41aeac4..b1db00f 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationFVO.java @@ -96,7 +96,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -116,7 +115,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -136,7 +134,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -156,7 +153,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -176,7 +172,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -196,7 +191,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @NotNull @Schema(name = "name", description = "A word, term, or phrase by which a PerformanceIndicatorSpecification is known and distinguished from other PerformanceIndicatorSpecifications.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -216,7 +210,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Schema(name = "description", description = "A narrative that explains in detail what the PerformanceIndicatorSpecification is.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -236,7 +229,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Schema(name = "perspective", description = "The point of view for the PerformanceIndicatorSpecification, such as a single user instance or aggregation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("perspective") public String getPerspective() { return perspective; } @@ -256,7 +248,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @NotNull @Schema(name = "indicatorCategory", description = "A grouping or set of PerformanceIndicatorSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("indicatorCategory") public String getIndicatorCategory() { return indicatorCategory; } @@ -276,7 +267,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @NotNull @Valid @Schema(name = "indicatorType", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("indicatorType") public IndicatorType getIndicatorType() { return indicatorType; } @@ -296,7 +286,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Schema(name = "derivationAlgorithm", description = "A step-by-step procedure used to calculate the value of PerformanceIndicator.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("derivationAlgorithm") public String getDerivationAlgorithm() { return derivationAlgorithm; } @@ -316,7 +305,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Schema(name = "derivationMethod", description = "For simple calculations, the method used to calculate the value of a PerformanceIndicator, such as average, minimum, maximum, sum and so forth.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("derivationMethod") public String getDerivationMethod() { return derivationMethod; } @@ -336,7 +324,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } @@ -356,7 +343,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @NotNull @Valid @Schema(name = "collectionType", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("collectionType") public CollectionType getCollectionType() { return collectionType; } @@ -376,7 +362,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @NotNull @Schema(name = "indicatorUnit", description = "The unit by which the indicator is measured. For example, seconds, KBs, rate per second, etc.", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("indicatorUnit") public String getIndicatorUnit() { return indicatorUnit; } @@ -404,7 +389,6 @@ public class PerformanceIndicatorSpecificationFVO implements PerformanceIndicato */ @Valid @Size(min = 0) @Schema(name = "performanceIndicatorSpecRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorSpecRelationship") public List getPerformanceIndicatorSpecRelationship() { return performanceIndicatorSpecRelationship; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java index a84bab6..e4364c7 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationMVO.java @@ -32,6 +32,7 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato @JsonProperty("href") private String href; + @JsonProperty("uuid") private String uuid; @JsonProperty("name") @@ -90,7 +91,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -110,7 +110,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getbaseType() { return baseType; } @@ -130,7 +129,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -150,7 +148,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -170,7 +167,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getUuid() { return uuid; } @@ -190,7 +186,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "name", description = "A word, term, or phrase by which a PerformanceIndicatorSpecification is known and distinguished from other PerformanceIndicatorSpecifications.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -210,7 +205,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "description", description = "A narrative that explains in detail what the PerformanceIndicatorSpecification is.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -230,7 +224,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "perspective", description = "The point of view for the PerformanceIndicatorSpecification, such as a single user instance or aggregation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("perspective") public String getPerspective() { return perspective; } @@ -250,7 +243,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "indicatorCategory", description = "A grouping or set of PerformanceIndicatorSpecifications that are classified together because of common characteristics, such as technology specific, service specific, or technology/service independent.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("indicatorCategory") public String getIndicatorCategory() { return indicatorCategory; } @@ -270,7 +262,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Valid @Schema(name = "indicatorType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("indicatorType") public IndicatorType getIndicatorType() { return indicatorType; } @@ -290,7 +281,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "derivationAlgorithm", description = "A step-by-step procedure used to calculate the value of PerformanceIndicator.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("derivationAlgorithm") public String getDerivationAlgorithm() { return derivationAlgorithm; } @@ -310,7 +300,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "derivationMethod", description = "For simple calculations, the method used to calculate the value of a PerformanceIndicator, such as average, minimum, maximum, sum and so forth.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("derivationMethod") public String getDerivationMethod() { return derivationMethod; } @@ -330,7 +319,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } @@ -350,7 +338,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Valid @Schema(name = "collectionType", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("collectionType") public CollectionType getCollectionType() { return collectionType; } @@ -370,7 +357,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Schema(name = "indicatorUnit", description = "The unit by which the indicator is measured. For example, seconds, KBs, rate per second, etc.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("indicatorUnit") public String getIndicatorUnit() { return indicatorUnit; } @@ -398,7 +384,6 @@ public class PerformanceIndicatorSpecificationMVO implements PerformanceIndicato */ @Valid @Size(min = 0) @Schema(name = "performanceIndicatorSpecRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("performanceIndicatorSpecRelationship") public List getPerformanceIndicatorSpecRelationship() { return performanceIndicatorSpecRelationship; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRef.java index a9b0d63..ccc5912 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRef.java @@ -46,7 +46,6 @@ public class PerformanceIndicatorSpecificationRef extends BaseRootNamedEntity im */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -66,7 +65,6 @@ public class PerformanceIndicatorSpecificationRef extends BaseRootNamedEntity im */ @Schema(name = "version", description = "Version of the performance indicator specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefFVO.java index 9c47680..0128d91 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefFVO.java @@ -61,7 +61,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -81,7 +80,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -101,7 +99,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -141,7 +137,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -161,7 +156,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -181,7 +175,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -201,7 +194,6 @@ public class PerformanceIndicatorSpecificationRefFVO implements PerformanceIndic */ @Schema(name = "version", description = "Version of the performance indicator specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefMVO.java index d1f799e..46ed370 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorSpecificationRefMVO.java @@ -27,6 +27,7 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic @JsonProperty("href") private String href; + @JsonProperty("uuid") private String uuid; @JsonProperty("name") @@ -60,7 +61,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -80,7 +80,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -100,7 +99,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getschemaLocation() { return schemaLocation; } @@ -120,7 +118,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -140,7 +137,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic */ @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getUuid() { return uuid; } @@ -160,7 +156,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -180,7 +175,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -200,7 +194,6 @@ public class PerformanceIndicatorSpecificationRefMVO implements PerformanceIndic */ @Schema(name = "version", description = "Version of the performance indicator specification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefFVO.java index d731eb1..0e38111 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefFVO.java @@ -59,7 +59,6 @@ public class PlaceRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class PlaceRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class PlaceRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class PlaceRefFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -139,7 +135,6 @@ public class PlaceRefFVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -159,7 +154,6 @@ public class PlaceRefFVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -179,7 +173,6 @@ public class PlaceRefFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefMVO.java index 8b3dadf..3e3c0fe 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PlaceRefMVO.java @@ -59,7 +59,6 @@ public class PlaceRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class PlaceRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class PlaceRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class PlaceRefMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -139,7 +135,6 @@ public class PlaceRefMVO { */ @Schema(name = "uuid", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -159,7 +154,6 @@ public class PlaceRefMVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -179,7 +173,6 @@ public class PlaceRefMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRef.java index ae4fa99..c34526e 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRef.java @@ -46,7 +46,6 @@ public class PolicyRef extends BaseRootNamedEntity { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -66,7 +65,6 @@ public class PolicyRef extends BaseRootNamedEntity { */ @Schema(name = "version", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefFVO.java index 161957c..2e0ed5a 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefFVO.java @@ -61,7 +61,6 @@ public class PolicyRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -81,7 +80,6 @@ public class PolicyRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -101,7 +99,6 @@ public class PolicyRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class PolicyRefFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -141,7 +137,6 @@ public class PolicyRefFVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -161,7 +156,6 @@ public class PolicyRefFVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -181,7 +175,6 @@ public class PolicyRefFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -201,7 +194,6 @@ public class PolicyRefFVO { */ @Schema(name = "version", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefMVO.java index bf33af5..da83103 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PolicyRefMVO.java @@ -61,7 +61,6 @@ public class PolicyRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -81,7 +80,6 @@ public class PolicyRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -101,7 +99,6 @@ public class PolicyRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class PolicyRefMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -141,7 +137,6 @@ public class PolicyRefMVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -161,7 +156,6 @@ public class PolicyRefMVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -181,7 +175,6 @@ public class PolicyRefMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -201,7 +194,6 @@ public class PolicyRefMVO { */ @Schema(name = "version", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferData.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferData.java index d359615..4e99c48 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferData.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferData.java @@ -42,7 +42,6 @@ public class ProtocolTransferData { */ @Schema(name = "transportProtocol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("transportProtocol") public String getTransportProtocol() { return transportProtocol; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataFVO.java index 87ccdfa..96f43e3 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataFVO.java @@ -39,7 +39,6 @@ public class ProtocolTransferDataFVO { */ @Schema(name = "transportProtocol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("transportProtocol") public String getTransportProtocol() { return transportProtocol; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataMVO.java index 9c47362..a6f0eb3 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ProtocolTransferDataMVO.java @@ -28,7 +28,6 @@ public class ProtocolTransferDataMVO { */ @Schema(name = "transportProtocol", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("transportProtocol") public String getTransportProtocol() { return transportProtocol; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRef.java index 4acb35b..1c4eb38 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRef.java @@ -72,7 +72,6 @@ public class RelatedPartyRefOrPartyRoleRef { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -92,7 +91,6 @@ public class RelatedPartyRefOrPartyRoleRef { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -112,7 +110,6 @@ public class RelatedPartyRefOrPartyRoleRef { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -132,7 +129,6 @@ public class RelatedPartyRefOrPartyRoleRef { */ @Schema(name = "role", description = "Role played by the related party or party role in the context of the specific entity it is linked to. Such as 'initiator', 'customer', 'salesAgent', 'user'", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -152,7 +148,6 @@ public class RelatedPartyRefOrPartyRoleRef { */ @Valid @Schema(name = "partyOrPartyRole", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyOrPartyRole") public PartyRefOrPartyRoleRef getPartyOrPartyRole() { return partyOrPartyRole; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefFVO.java index af9af10..6495713 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefFVO.java @@ -54,7 +54,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -74,7 +73,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -94,7 +92,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -114,7 +111,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO { */ @NotNull @Schema(name = "role", description = "Role played by the related party or party role in the context of the specific entity it is linked to. Such as 'initiator', 'customer', 'salesAgent', 'user'", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -134,7 +130,6 @@ public class RelatedPartyRefOrPartyRoleRefFVO { */ @Valid @Schema(name = "partyOrPartyRole", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyOrPartyRole") public PartyRefOrPartyRoleRefFVO getPartyOrPartyRole() { return partyOrPartyRole; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefMVO.java index 241aaae..473a3c5 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPartyRefOrPartyRoleRefMVO.java @@ -54,7 +54,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -74,7 +73,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -94,7 +92,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -114,7 +111,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO { */ @NotNull @Schema(name = "role", description = "Role played by the related party or party role in the context of the specific entity it is linked to. Such as 'initiator', 'customer', 'salesAgent', 'user'", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -134,7 +130,6 @@ public class RelatedPartyRefOrPartyRoleRefMVO { */ @Valid @Schema(name = "partyOrPartyRole", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("partyOrPartyRole") public PartyRefOrPartyRoleRefMVO getPartyOrPartyRole() { return partyOrPartyRole; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRef.java index efeea7a..fd67b4c 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRef.java @@ -50,7 +50,6 @@ public class RelatedPlaceRef extends BaseRootEntity { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -70,7 +69,6 @@ public class RelatedPlaceRef extends BaseRootEntity { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -90,7 +88,6 @@ public class RelatedPlaceRef extends BaseRootEntity { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -110,7 +107,6 @@ public class RelatedPlaceRef extends BaseRootEntity { */ @Schema(name = "role", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -130,7 +126,6 @@ public class RelatedPlaceRef extends BaseRootEntity { */ @Valid @Schema(name = "place", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("place") public PlaceRef getPlace() { return place; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefFVO.java index 43ca4b4..70a9100 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefFVO.java @@ -55,7 +55,6 @@ public class RelatedPlaceRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -75,7 +74,6 @@ public class RelatedPlaceRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -95,7 +93,6 @@ public class RelatedPlaceRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -115,7 +112,6 @@ public class RelatedPlaceRefFVO { */ @NotNull @Schema(name = "role", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -135,7 +131,6 @@ public class RelatedPlaceRefFVO { */ @NotNull @Valid @Schema(name = "place", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("place") public PlaceRefFVO getPlace() { return place; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefMVO.java index f0e5b6d..4b8d54b 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedPlaceRefMVO.java @@ -55,7 +55,6 @@ public class RelatedPlaceRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -75,7 +74,6 @@ public class RelatedPlaceRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -95,7 +93,6 @@ public class RelatedPlaceRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -115,7 +112,6 @@ public class RelatedPlaceRefMVO { */ @NotNull @Schema(name = "role", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("role") public String getRole() { return role; } @@ -135,7 +131,6 @@ public class RelatedPlaceRefMVO { */ @NotNull @Valid @Schema(name = "place", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("place") public PlaceRefMVO getPlace() { return place; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItem.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItem.java index db5a49d..16aafda 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItem.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItem.java @@ -73,7 +73,6 @@ public class RelatedResourceOrderItem { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -93,7 +92,6 @@ public class RelatedResourceOrderItem { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -113,7 +111,6 @@ public class RelatedResourceOrderItem { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -133,7 +130,6 @@ public class RelatedResourceOrderItem { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -153,7 +149,6 @@ public class RelatedResourceOrderItem { */ @Schema(name = "resourceOrderHref", description = "Reference of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderHref") public String getResourceOrderHref() { return resourceOrderHref; } @@ -173,7 +168,6 @@ public class RelatedResourceOrderItem { */ @Schema(name = "resourceOrderId", description = "Unique identifier of a related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderId") public String getResourceOrderId() { return resourceOrderId; } @@ -193,7 +187,6 @@ public class RelatedResourceOrderItem { */ @Valid @Schema(name = "itemAction", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("itemAction") public OrderItemActionType getItemAction() { return itemAction; } @@ -213,7 +206,6 @@ public class RelatedResourceOrderItem { */ @Schema(name = "itemId", description = "Identifier of the order item where the resource was managed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("itemId") public String getItemId() { return itemId; } @@ -233,7 +225,6 @@ public class RelatedResourceOrderItem { */ @Schema(name = "role", description = "role of the resource order item for this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("role") public String getRole() { return role; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemFVO.java index 20c7270..2e65e81 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemFVO.java @@ -66,7 +66,6 @@ public class RelatedResourceOrderItemFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -86,7 +85,6 @@ public class RelatedResourceOrderItemFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -106,7 +104,6 @@ public class RelatedResourceOrderItemFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -126,7 +123,6 @@ public class RelatedResourceOrderItemFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -146,7 +142,6 @@ public class RelatedResourceOrderItemFVO { */ @Schema(name = "resourceOrderHref", description = "Reference of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderHref") public String getResourceOrderHref() { return resourceOrderHref; } @@ -166,7 +161,6 @@ public class RelatedResourceOrderItemFVO { */ @Schema(name = "resourceOrderId", description = "Unique identifier of a related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderId") public String getResourceOrderId() { return resourceOrderId; } @@ -186,7 +180,6 @@ public class RelatedResourceOrderItemFVO { */ @Valid @Schema(name = "itemAction", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("itemAction") public OrderItemActionType getItemAction() { return itemAction; } @@ -206,7 +199,6 @@ public class RelatedResourceOrderItemFVO { */ @Schema(name = "itemId", description = "Identifier of the order item where the resource was managed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("itemId") public String getItemId() { return itemId; } @@ -226,7 +218,6 @@ public class RelatedResourceOrderItemFVO { */ @Schema(name = "role", description = "role of the resource order item for this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("role") public String getRole() { return role; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemMVO.java index 3627a63..ea7d3a0 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/RelatedResourceOrderItemMVO.java @@ -66,7 +66,6 @@ public class RelatedResourceOrderItemMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -86,7 +85,6 @@ public class RelatedResourceOrderItemMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -106,7 +104,6 @@ public class RelatedResourceOrderItemMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -126,7 +123,6 @@ public class RelatedResourceOrderItemMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -146,7 +142,6 @@ public class RelatedResourceOrderItemMVO { */ @Schema(name = "resourceOrderHref", description = "Reference of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderHref") public String getResourceOrderHref() { return resourceOrderHref; } @@ -166,7 +161,6 @@ public class RelatedResourceOrderItemMVO { */ @Schema(name = "resourceOrderId", description = "Unique identifier of a related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderId") public String getResourceOrderId() { return resourceOrderId; } @@ -186,7 +180,6 @@ public class RelatedResourceOrderItemMVO { */ @Valid @Schema(name = "itemAction", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("itemAction") public OrderItemActionType getItemAction() { return itemAction; } @@ -206,7 +199,6 @@ public class RelatedResourceOrderItemMVO { */ @Schema(name = "itemId", description = "Identifier of the order item where the resource was managed", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("itemId") public String getItemId() { return itemId; } @@ -226,7 +218,6 @@ public class RelatedResourceOrderItemMVO { */ @Schema(name = "role", description = "role of the resource order item for this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("role") public String getRole() { return role; } 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 6fa86c5..98ea10d 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 @@ -186,7 +186,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Schema(name = "category", description = "Category of the concrete resource. e.g Gold, Silver for MSISDN concrete resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("category") public String getCategory() { return category; } @@ -206,7 +205,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Schema(name = "description", description = "free-text description of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -256,7 +254,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "administrativeState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("administrativeState") public ResourceAdministrativeStateType getAdministrativeState() { return administrativeState; } @@ -276,7 +273,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "operationalState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("operationalState") public ResourceOperationalStateType getOperationalState() { return operationalState; } @@ -296,7 +292,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "resourceStatus", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceStatus") public ResourceStatusType getResourceStatus() { return resourceStatus; } @@ -316,7 +311,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "usageState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("usageState") public ResourceUsageStateType getUsageState() { return usageState; } @@ -336,7 +330,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } @@ -364,7 +357,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "note", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("note") public List getNote() { return note; } @@ -392,7 +384,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "resourceOrderItem", description = "A list of resource order items related to this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderItem") public List getResourceOrderItem() { return resourceOrderItem; } @@ -420,7 +411,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "place", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("place") public List getPlace() { return place; } @@ -448,7 +438,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "relatedParty", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relatedParty") public List getRelatedParty() { return relatedParty; } @@ -476,7 +465,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "resourceRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceRelationship") public List getResourceRelationship() { return resourceRelationship; } @@ -504,7 +492,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "resourceCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceCharacteristic") public List getResourceCharacteristic() { return resourceCharacteristic; } @@ -532,7 +519,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("attachment") public List getAttachment() { return attachment; } @@ -552,7 +538,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "resourceSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceSpecification") public ResourceSpecificationRef getResourceSpecification() { return resourceSpecification; } @@ -602,7 +587,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Schema(name = "resourceVersion", description = "A field that identifies the specific version of an instance of a resource.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceVersion") public String getResourceVersion() { return resourceVersion; } @@ -630,7 +614,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "activationFeature", description = "Configuration features", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("activationFeature") public List getActivationFeature() { return activationFeature; } @@ -650,7 +633,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "intent", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("intent") public IntentRef getIntent() { return intent; } @@ -678,7 +660,6 @@ public class Resource extends BaseRootNamedEntity implements ResourceRefOrValue */ @Valid @Schema(name = "externalIdentifier", description = "An identification of this resource that is owned by or originates in a software system different from the current system. The structure identifies the system itself, the nature of the resource within the system and the unique ID of the resource within the system. It is anticipated that multiple external IDs can be held for a single resource, e.g. if the resource passed through multiple systems on the way to the current system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("externalIdentifier") public List getExternalIdentifier() { return externalIdentifier; } 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 e0339b3..a5b50cc 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 @@ -149,7 +149,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -169,7 +168,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -189,7 +187,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -209,7 +206,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -229,7 +225,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -249,7 +244,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Schema(name = "category", description = "Category of the concrete resource. e.g Gold, Silver for MSISDN concrete resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("category") public String getCategory() { return category; } @@ -269,7 +263,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Schema(name = "description", description = "free-text description of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -289,7 +282,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Schema(name = "name", description = "the name of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -339,7 +331,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "administrativeState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("administrativeState") public ResourceAdministrativeStateType getAdministrativeState() { return administrativeState; } @@ -359,7 +350,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "operationalState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("operationalState") public ResourceOperationalStateType getOperationalState() { return operationalState; } @@ -379,7 +369,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "resourceStatus", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceStatus") public ResourceStatusType getResourceStatus() { return resourceStatus; } @@ -399,7 +388,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "usageState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("usageState") public ResourceUsageStateType getUsageState() { return usageState; } @@ -419,7 +407,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } @@ -447,7 +434,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "note", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("note") public List getNote() { return note; } @@ -475,7 +461,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "resourceOrderItem", description = "A list of resource order items related to this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderItem") public List getResourceOrderItem() { return resourceOrderItem; } @@ -503,7 +488,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "place", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("place") public List getPlace() { return place; } @@ -531,7 +515,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "relatedParty", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relatedParty") public List getRelatedParty() { return relatedParty; } @@ -559,7 +542,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "resourceRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceRelationship") public List getResourceRelationship() { return resourceRelationship; } @@ -587,7 +569,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "resourceCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceCharacteristic") public List getResourceCharacteristic() { return resourceCharacteristic; } @@ -615,7 +596,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("attachment") public List getAttachment() { return attachment; } @@ -635,7 +615,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "resourceSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceSpecification") public ResourceSpecificationRefFVO getResourceSpecification() { return resourceSpecification; } @@ -685,7 +664,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Schema(name = "resourceVersion", description = "A field that identifies the specific version of an instance of a resource.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceVersion") public String getResourceVersion() { return resourceVersion; } @@ -713,7 +691,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "activationFeature", description = "Configuration features", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("activationFeature") public List getActivationFeature() { return activationFeature; } @@ -733,7 +710,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "intent", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("intent") public IntentRefFVO getIntent() { return intent; } @@ -761,7 +737,6 @@ public class ResourceFVO implements ResourceRefOrValueFVO { */ @Valid @Schema(name = "externalIdentifier", description = "An identification of this resource that is owned by or originates in a software system different from the current system. The structure identifies the system itself, the nature of the resource within the system and the unique ID of the resource within the system. It is anticipated that multiple external IDs can be held for a single resource, e.g. if the resource passed through multiple systems on the way to the current system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("externalIdentifier") public List getExternalIdentifier() { return externalIdentifier; } 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 b932345..694b2c1 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 @@ -149,7 +149,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -169,7 +168,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -189,7 +187,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -209,7 +206,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -229,7 +225,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -249,7 +244,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Schema(name = "category", description = "Category of the concrete resource. e.g Gold, Silver for MSISDN concrete resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("category") public String getCategory() { return category; } @@ -269,7 +263,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Schema(name = "description", description = "free-text description of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -289,7 +282,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Schema(name = "name", description = "the name of the resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -339,7 +331,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "administrativeState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("administrativeState") public ResourceAdministrativeStateType getAdministrativeState() { return administrativeState; } @@ -359,7 +350,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "operationalState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("operationalState") public ResourceOperationalStateType getOperationalState() { return operationalState; } @@ -379,7 +369,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "resourceStatus", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceStatus") public ResourceStatusType getResourceStatus() { return resourceStatus; } @@ -399,7 +388,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "usageState", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("usageState") public ResourceUsageStateType getUsageState() { return usageState; } @@ -419,7 +407,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "validFor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("validFor") public TimePeriod getValidFor() { return validFor; } @@ -447,7 +434,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "note", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("note") public List getNote() { return note; } @@ -475,7 +461,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "resourceOrderItem", description = "A list of resource order items related to this resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceOrderItem") public List getResourceOrderItem() { return resourceOrderItem; } @@ -503,7 +488,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "place", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("place") public List getPlace() { return place; } @@ -531,7 +515,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "relatedParty", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relatedParty") public List getRelatedParty() { return relatedParty; } @@ -559,7 +542,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "resourceRelationship", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceRelationship") public List getResourceRelationship() { return resourceRelationship; } @@ -587,7 +569,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "resourceCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceCharacteristic") public List getResourceCharacteristic() { return resourceCharacteristic; } @@ -615,7 +596,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "attachment", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("attachment") public List getAttachment() { return attachment; } @@ -635,7 +615,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "resourceSpecification", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceSpecification") public ResourceSpecificationRefMVO getResourceSpecification() { return resourceSpecification; } @@ -685,7 +664,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Schema(name = "resourceVersion", description = "A field that identifies the specific version of an instance of a resource.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceVersion") public String getResourceVersion() { return resourceVersion; } @@ -713,7 +691,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "activationFeature", description = "Configuration features", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("activationFeature") public List getActivationFeature() { return activationFeature; } @@ -733,7 +710,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "intent", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("intent") public IntentRefMVO getIntent() { return intent; } @@ -761,7 +737,6 @@ public class ResourceMVO implements ResourceRefOrValueMVO { */ @Valid @Schema(name = "externalIdentifier", description = "An identification of this resource that is owned by or originates in a software system different from the current system. The structure identifies the system itself, the nature of the resource within the system and the unique ID of the resource within the system. It is anticipated that multiple external IDs can be held for a single resource, e.g. if the resource passed through multiple systems on the way to the current system.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("externalIdentifier") public List getExternalIdentifier() { return externalIdentifier; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRef.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRef.java index 5062148..b693956 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRef.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRef.java @@ -44,7 +44,6 @@ public class ResourceRef extends BaseRootNamedEntity implements ResourceRefOrVal */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefFVO.java index 660e50b..1ee8901 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefFVO.java @@ -59,7 +59,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -139,7 +135,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO { */ @Schema(name = "uuid", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -159,7 +154,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -179,7 +173,6 @@ public class ResourceRefFVO implements ResourceRefOrValueFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefMVO.java index a826aa4..7e74598 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRefMVO.java @@ -59,7 +59,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -79,7 +78,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -99,7 +97,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -119,7 +116,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -139,7 +135,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO { */ @Schema(name = "uuid", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -159,7 +154,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -179,7 +173,6 @@ public class ResourceRefMVO implements ResourceRefOrValueMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationship.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationship.java index a82363a..d1cf795 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationship.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationship.java @@ -73,7 +73,6 @@ public class ResourceRelationship extends BaseRootEntity { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -93,7 +92,6 @@ public class ResourceRelationship extends BaseRootEntity { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -113,7 +111,6 @@ public class ResourceRelationship extends BaseRootEntity { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -141,7 +138,6 @@ public class ResourceRelationship extends BaseRootEntity { */ @Valid @Schema(name = "resourceRelationshipCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceRelationshipCharacteristic") public List getResourceRelationshipCharacteristic() { return resourceRelationshipCharacteristic; } @@ -161,7 +157,6 @@ public class ResourceRelationship extends BaseRootEntity { */ @Valid @Schema(name = "resource", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resource") public ResourceRefOrValue getResource() { return resource; } @@ -181,7 +176,6 @@ public class ResourceRelationship extends BaseRootEntity { */ @Schema(name = "relationshipType", description = "Type of the resource relationship, such as [bundled] if the resource is a bundle and you want to describe the bundled resources inside this bundle; [reliesOn] if the resource needs another already owned resource to rely on (eg: an option on an already owned mobile access resource) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipFVO.java index 5421fd4..5d4b6d5 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipFVO.java @@ -61,7 +61,6 @@ public class ResourceRelationshipFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -81,7 +80,6 @@ public class ResourceRelationshipFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -101,7 +99,6 @@ public class ResourceRelationshipFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -129,7 +126,6 @@ public class ResourceRelationshipFVO { */ @Valid @Schema(name = "resourceRelationshipCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceRelationshipCharacteristic") public List getResourceRelationshipCharacteristic() { return resourceRelationshipCharacteristic; } @@ -149,7 +145,6 @@ public class ResourceRelationshipFVO { */ @NotNull @Valid @Schema(name = "resource", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("resource") public ResourceRefOrValueFVO getResource() { return resource; } @@ -169,7 +164,6 @@ public class ResourceRelationshipFVO { */ @NotNull @Schema(name = "relationshipType", description = "Type of the resource relationship, such as [bundled] if the resource is a bundle and you want to describe the bundled resources inside this bundle; [reliesOn] if the resource needs another already owned resource to rely on (eg: an option on an already owned mobile access resource) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java index 0c876f7..27b02be 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceRelationshipMVO.java @@ -64,7 +64,6 @@ public class ResourceRelationshipMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -84,7 +83,6 @@ public class ResourceRelationshipMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -104,7 +102,6 @@ public class ResourceRelationshipMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -124,7 +121,6 @@ public class ResourceRelationshipMVO { */ @Schema(name = "uuid", description = "Unique identifier of the characteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -152,7 +148,6 @@ public class ResourceRelationshipMVO { */ @Valid @Schema(name = "resourceRelationshipCharacteristic", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("resourceRelationshipCharacteristic") public List getResourceRelationshipCharacteristic() { return resourceRelationshipCharacteristic; } @@ -172,7 +167,6 @@ public class ResourceRelationshipMVO { */ @NotNull @Valid @Schema(name = "resource", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("resource") public ResourceRefOrValueMVO getResource() { return resource; } @@ -192,7 +186,6 @@ public class ResourceRelationshipMVO { */ @NotNull @Schema(name = "relationshipType", description = "Type of the resource relationship, such as [bundled] if the resource is a bundle and you want to describe the bundled resources inside this bundle; [reliesOn] if the resource needs another already owned resource to rely on (eg: an option on an already owned mobile access resource) [targets] or [isTargeted] (depending on the way of expressing the link) for any other kind of links that may be useful", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("relationshipType") public String getRelationshipType() { return relationshipType; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefFVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefFVO.java index e4feb94..f264ed7 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefFVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefFVO.java @@ -61,7 +61,6 @@ public class ResourceSpecificationRefFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -81,7 +80,6 @@ public class ResourceSpecificationRefFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -101,7 +99,6 @@ public class ResourceSpecificationRefFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class ResourceSpecificationRefFVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -141,7 +137,6 @@ public class ResourceSpecificationRefFVO { */ @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -161,7 +156,6 @@ public class ResourceSpecificationRefFVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -181,7 +175,6 @@ public class ResourceSpecificationRefFVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -201,7 +194,6 @@ public class ResourceSpecificationRefFVO { */ @Schema(name = "version", description = "Resource Specification version", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefMVO.java b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefMVO.java index 4a56233..a4907b2 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefMVO.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/ResourceSpecificationRefMVO.java @@ -61,7 +61,6 @@ public class ResourceSpecificationRefMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -81,7 +80,6 @@ public class ResourceSpecificationRefMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -101,7 +99,6 @@ public class ResourceSpecificationRefMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -121,7 +118,6 @@ public class ResourceSpecificationRefMVO { */ @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("href") public String getHref() { return href; } @@ -141,7 +137,6 @@ public class ResourceSpecificationRefMVO { */ @Schema(name = "id", description = "The identifier of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("id") public String getId() { return id; } @@ -161,7 +156,6 @@ public class ResourceSpecificationRefMVO { */ @Schema(name = "name", description = "Name of the referred entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("name") public String getName() { return name; } @@ -181,7 +175,6 @@ public class ResourceSpecificationRefMVO { */ @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@referredType") public String getReferredType() { return referredType; } @@ -201,7 +194,6 @@ public class ResourceSpecificationRefMVO { */ @Schema(name = "version", description = "Resource Specification version", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("version") public String getVersion() { return version; } 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 cb8ede2..6720bed 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 @@ -143,7 +143,6 @@ public class ScheduleDefinition extends BaseRootEntity { */ @Schema(name = "recurringFrequency", description = "A recurring frequency to run a job within day that is included in schedule definition, for example: every 5 minutes, 15 minute, 30 minutes, 1 hour", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("recurringFrequency") public String getRecurringFrequency() { return recurringFrequency; } @@ -190,7 +189,6 @@ public class ScheduleDefinition extends BaseRootEntity { this.excludedDate = excludedDate; } - @JsonProperty("excludedDate") public void setExcludedDateString(List excludedDate) { this.excludedDate = excludedDate.stream() .map(date -> { @@ -244,7 +242,6 @@ public class ScheduleDefinition extends BaseRootEntity { */ @Valid @Schema(name = "WeeklyScheduledDefinition", description = "The weekly schedule is used to define a schedule that is based on the days of the week, e.g. a schedule that will be active only on Monday and Tuesday.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("WeeklyScheduledDefinition") public List getWeeklyScheduledDefinition() { return weeklyScheduledDefinition; } @@ -317,7 +314,6 @@ public class ScheduleDefinition extends BaseRootEntity { */ @Valid @Schema(name = "MonthlyScheduleDayOfWeekDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("MonthlyScheduleDayOfWeekDefinition") public MonthlyScheduleDayOfWeekDefinition getMonthlyScheduleDayOfWeekDefinition() { return monthlyScheduleDayOfWeekDefinition; } 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 8df65f1..a30f0bf 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 @@ -43,14 +43,17 @@ public class ScheduleDefinitionFVO { @Valid private List excludedDate = new ArrayList<>(); + @JsonProperty("scheduleDefinitionHourRange") private String scheduleDefinitionHourRange; @Valid + @JsonProperty("WeeklyScheduledDefinition") private List weeklyScheduledDefinition = new ArrayList<>(); @Valid private List monthlyScheduleDayOfMonthDefinition = new ArrayList<>(); + @JsonProperty("MonthlyScheduleDayOfWeekDefinition") private MonthlyScheduleDayOfWeekDefinitionFVO monthlyScheduleDayOfWeekDefinition; @Valid @@ -78,7 +81,6 @@ public class ScheduleDefinitionFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -98,7 +100,6 @@ public class ScheduleDefinitionFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -118,7 +119,6 @@ public class ScheduleDefinitionFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -199,7 +199,6 @@ public class ScheduleDefinitionFVO { */ @Schema(name = "recurringFrequency", description = "A recurring frequency to run a job within day that is included in schedule definition, for example: every 5 minutes, 15 minute, 30 minutes, 1 hour", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("recurringFrequency") public String getRecurringFrequency() { return recurringFrequency; } @@ -270,7 +269,6 @@ public class ScheduleDefinitionFVO { */ @Schema(name = "scheduleDefinitionHourRange", description = "A list of time ranges within a specific day that the schedule will be active on, for example 08:00-12:00, 16:00-19:00.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("scheduleDefinitionHourRange") public String getScheduleDefinitionHourRange() { return scheduleDefinitionHourRange; } @@ -298,7 +296,6 @@ public class ScheduleDefinitionFVO { */ @Valid @Schema(name = "WeeklyScheduledDefinition", description = "The weekly schedule is used to define a schedule that is based on the days of the week, e.g. a schedule that will be active only on Monday and Tuesday.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("WeeklyScheduledDefinition") public List getWeeklyScheduledDefinition() { return weeklyScheduledDefinition; } @@ -370,7 +367,6 @@ public class ScheduleDefinitionFVO { */ @Valid @Schema(name = "MonthlyScheduleDayOfWeekDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("MonthlyScheduleDayOfWeekDefinition") public MonthlyScheduleDayOfWeekDefinitionFVO getMonthlyScheduleDayOfWeekDefinition() { return monthlyScheduleDayOfWeekDefinition; } 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 1ac9419..c4d1a6c 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 @@ -83,7 +83,6 @@ public class ScheduleDefinitionMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -103,7 +102,6 @@ public class ScheduleDefinitionMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -123,7 +121,6 @@ public class ScheduleDefinitionMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -143,7 +140,6 @@ public class ScheduleDefinitionMVO { */ @Schema(name = "uuid", description = "Identifier of the schedule definition", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } @@ -226,7 +222,6 @@ public class ScheduleDefinitionMVO { */ @Schema(name = "recurringFrequency", description = "A recurring frequency to run a job within day that is included in schedule definition, for example: every 5 minutes, 15 minute, 30 minutes, 1 hour", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("recurringFrequency") public String getRecurringFrequency() { return recurringFrequency; } @@ -299,7 +294,6 @@ public class ScheduleDefinitionMVO { */ @Schema(name = "scheduleDefinitionHourRange", description = "A list of time ranges within a specific day that the schedule will be active on, for example 08:00-12:00, 16:00-19:00.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("scheduleDefinitionHourRange") public String getScheduleDefinitionHourRange() { return scheduleDefinitionHourRange; } @@ -327,7 +321,6 @@ public class ScheduleDefinitionMVO { */ @Valid @Schema(name = "WeeklyScheduledDefinition", description = "The weekly schedule is used to define a schedule that is based on the days of the week, e.g. a schedule that will be active only on Monday and Tuesday.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("WeeklyScheduledDefinition") public List getWeeklyScheduledDefinition() { return weeklyScheduledDefinition; } @@ -399,7 +392,6 @@ public class ScheduleDefinitionMVO { */ @Valid @Schema(name = "MonthlyScheduleDayOfWeekDefinition", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("MonthlyScheduleDayOfWeekDefinition") public MonthlyScheduleDayOfWeekDefinitionMVO getMonthlyScheduleDayOfWeekDefinition() { return monthlyScheduleDayOfWeekDefinition; } 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 8ba4ada..b1ebee5 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 @@ -66,7 +66,6 @@ public class TrackingRecord extends BaseRootEntity { */ @Schema(name = "description", example = "[\"acknowledge\",\"clear\"]", description = "Describes the action being done, such as: ack, clear", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -94,7 +93,6 @@ public class TrackingRecord extends BaseRootEntity { */ @Valid @Schema(name = "characteristic", description = "A generic list of any type of elements. Used for vendor Extensions or loose element encapsulation from other namespaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("characteristic") public List getCharacteristic() { return characteristic; } @@ -114,7 +112,6 @@ public class TrackingRecord extends BaseRootEntity { */ @Schema(name = "systemId", description = "Describes the system Id from which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("systemId") public String getSystemId() { return systemId; } @@ -164,7 +161,6 @@ public class TrackingRecord extends BaseRootEntity { */ @Schema(name = "user", description = "Describes the user doing the action", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("user") public String getUser() { return user; } 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 068496f..3ec65c3 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 @@ -70,7 +70,6 @@ public class TrackingRecordFVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -90,7 +89,6 @@ public class TrackingRecordFVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -110,7 +108,6 @@ public class TrackingRecordFVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -130,7 +127,6 @@ public class TrackingRecordFVO { */ @Schema(name = "description", example = "[\"acknowledge\",\"clear\"]", description = "Describes the action being done, such as: ack, clear", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -158,7 +154,6 @@ public class TrackingRecordFVO { */ @Valid @Schema(name = "characteristic", description = "A generic list of any type of elements. Used for vendor Extensions or loose element encapsulation from other namespaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("characteristic") public List getCharacteristic() { return characteristic; } @@ -178,7 +173,6 @@ public class TrackingRecordFVO { */ @Schema(name = "systemId", description = "Describes the system Id from which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("systemId") public String getSystemId() { return systemId; } @@ -228,7 +222,6 @@ public class TrackingRecordFVO { */ @Schema(name = "user", description = "Describes the user doing the action", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("user") public String getUser() { return user; } 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 5078274..bd6ec5f 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 @@ -73,7 +73,6 @@ public class TrackingRecordMVO { */ @NotNull @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("@type") public String getType() { return type; } @@ -93,7 +92,6 @@ public class TrackingRecordMVO { */ @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@baseType") public String getBaseType() { return baseType; } @@ -113,7 +111,6 @@ public class TrackingRecordMVO { */ @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("@schemaLocation") public String getSchemaLocation() { return schemaLocation; } @@ -133,7 +130,6 @@ public class TrackingRecordMVO { */ @Schema(name = "description", example = "[\"acknowledge\",\"clear\"]", description = "Describes the action being done, such as: ack, clear", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("description") public String getDescription() { return description; } @@ -161,7 +157,6 @@ public class TrackingRecordMVO { */ @Valid @Schema(name = "characteristic", description = "A generic list of any type of elements. Used for vendor Extensions or loose element encapsulation from other namespaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("characteristic") public List getCharacteristic() { return characteristic; } @@ -181,7 +176,6 @@ public class TrackingRecordMVO { */ @Schema(name = "systemId", description = "Describes the system Id from which the action was done", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("systemId") public String getSystemId() { return systemId; } @@ -231,7 +225,6 @@ public class TrackingRecordMVO { */ @Schema(name = "user", description = "Describes the user doing the action", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("user") public String getUser() { return user; } @@ -251,7 +244,6 @@ public class TrackingRecordMVO { */ @Schema(name = "uuid", description = "Identifier of the TrackingRecord.", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonProperty("uuid") public String getUuid() { return uuid; } -- GitLab From 740a2d24744c0ec34672d2134a94088d4f696d20 Mon Sep 17 00:00:00 2001 From: Nikos Kyriakoulis Date: Fri, 11 Apr 2025 14:07:35 +0300 Subject: [PATCH 3/4] 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 From 7c45d8a4e83b4e9919e827417adeb4e5933a9425 Mon Sep 17 00:00:00 2001 From: Nikos Kyriakoulis Date: Fri, 11 Apr 2025 15:06:12 +0300 Subject: [PATCH 4/4] Fixed bugs related to Cascade annotations, added missing JsonProperty annotation in ScheduleDefinition --- src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java | 2 +- .../tmf/pm628/model/PerformanceIndicatorGroupSpecification.java | 2 +- .../java/org/etsi/osl/tmf/pm628/model/ScheduleDefinition.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java index 9e9f70b..00c43bd 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/MeasurementJob.java @@ -62,7 +62,7 @@ public class MeasurementJob extends ManagementJob { @AnyKeyJavaClass(String.class) @AnyDiscriminatorValue(discriminator = "value", entity = PerformanceIndicatorSpecification.class) @AnyDiscriminatorValue(discriminator = "ref", entity = PerformanceIndicatorSpecificationRef.class) - @Cascade(org.hibernate.annotations.CascadeType.MERGE) + @Cascade({org.hibernate.annotations.CascadeType.MERGE, org.hibernate.annotations.CascadeType.PERSIST}) @JoinTable( name = "pm628_meas_job_perf_ind_specs", joinColumns = @JoinColumn(name = "meas_job_uuid"), diff --git a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java index 067d023..7a5296d 100644 --- a/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java +++ b/src/main/java/org/etsi/osl/tmf/pm628/model/PerformanceIndicatorGroupSpecification.java @@ -35,7 +35,7 @@ public class PerformanceIndicatorGroupSpecification extends BaseRootNamedEntity @AnyKeyJavaClass(String.class) @AnyDiscriminatorValue(discriminator = "value", entity = PerformanceIndicatorSpecification.class) @AnyDiscriminatorValue(discriminator = "ref", entity = PerformanceIndicatorSpecificationRef.class) - @Cascade(CascadeType.MERGE) + @Cascade({CascadeType.MERGE, CascadeType.PERSIST}) @JoinTable( name = "perf_ind_group_spec_perf_ind_specs", joinColumns = @JoinColumn(name = "perf_ind_group_spec_id"), 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 c25213d..7801232 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 @@ -189,6 +189,7 @@ public class ScheduleDefinition extends BaseRootEntity { this.excludedDate = excludedDate; } + @JsonProperty("excludedDate") public void setExcludedDateString(List excludedDate) { this.excludedDate = excludedDate.stream() .map(date -> { -- GitLab