Merge branch 'tmf628' into 'develop' (81328efe) · Commits · OSL / code / org.etsi.osl.model.tmf

.gitignore

+1 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,4 @@
		/.classpath
		/.settings
		*.iml
		/.factorypath

src/main/java/org/etsi/osl/tmf/pm628/model/DayOfMonthRecurrence.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ public class DayOfMonthRecurrence {
		@Column(name = "domr_schema_location")
		private String schemaLocation;

		@JsonProperty("dates")
		@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
		private OffsetDateTime dates;

		@@ -120,6 +119,16 @@ public class DayOfMonthRecurrence {
		@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;
		}

src/main/java/org/etsi/osl/tmf/pm628/model/DayOfWeekRecurrence.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@ public class DayOfWeekRecurrence {
		@Column(name = "dowr_schema_location")
		private String schemaLocation;

		@JsonProperty("dates")
		@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
		private OffsetDateTime dates;

		@@ -119,11 +118,21 @@ public class DayOfWeekRecurrence {
		*/
		@Valid
		@Schema(name = "dates", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
		@JsonProperty("dates")
		public OffsetDateTime getDates() {
		return dates;
		}

		@JsonProperty("dates")
		public String getDatesString() {
		return dates.toString();
		}

		public void setDates(String dates) {
		if ( dates!= null ) {
		this.dates = OffsetDateTime.parse( dates );
		}
		}

		public void setDates(OffsetDateTime dates) {
		this.dates = dates;
		}

src/main/java/org/etsi/osl/tmf/pm628/model/Event.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -73,7 +73,7 @@ public class Event {
		@JsonProperty("eventId")
		protected String eventId= UUID.randomUUID().toString();

		@JsonProperty("eventTime")

		@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
		protected OffsetDateTime eventTime = OffsetDateTime.now(ZoneOffset.UTC);

		@@ -441,15 +441,26 @@ public class Event {
		*/
		@Valid
		@Schema(name = "eventTime", description = "Time of the event occurrence.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
		@JsonProperty("eventTime")
		public OffsetDateTime getEventTime() {
		return eventTime;
		}

		@JsonProperty("eventTime")
		public String getEventTimeString() {
		return eventTime.toString();
		}


		public void setEventTime(OffsetDateTime eventTime) {
		this.eventTime = eventTime;
		}

		public void setEventTime(String eventTime) {
		if ( eventTime!= null ) {
		this.eventTime = OffsetDateTime.parse( eventTime );
		}
		}

		public Event eventType(String eventType) {
		this.eventType = eventType;
		return this;

src/main/java/org/etsi/osl/tmf/pm628/model/ManagementJob.java

+21 −2

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ public class ManagementJob extends BaseRootEntity {
		@JsonProperty("adminState")
		private AdministrativeState adminState;

		@JsonProperty("creationTime")
		@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
		private OffsetDateTime creationTime;

		@@ -73,7 +72,6 @@ public class ManagementJob extends BaseRootEntity {
		@JsonProperty("jobPriority")
		private Integer jobPriority = 5;

		@JsonProperty("lastModifiedTime")
		@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
		private OffsetDateTime lastModifiedTime;

		@@ -130,6 +128,17 @@ public class ManagementJob extends BaseRootEntity {
		@Valid
		@Schema(name = "creationTime", description = "The measurement job creation time.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
		@JsonProperty("creationTime")
		public String getCreationTimeStr() {
		return creationTime.toString();
		}

		public void setCreationTime(String t) {
		if ( t!= null ) {
		this.creationTime = OffsetDateTime.parse( t );
		}
		}


		public OffsetDateTime getCreationTime() {
		return creationTime;
		}
		@@ -268,6 +277,16 @@ public class ManagementJob extends BaseRootEntity {
		@Valid
		@Schema(name = "lastModifiedTime", description = "The last time that a measurement job was modified.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
		@JsonProperty("lastModifiedTime")
		public String getLastModifiedTimeStr() {
		return lastModifiedTime.toString();
		}

		public void setLastModifiedTime(String t) {
		if ( t!= null ) {
		this.lastModifiedTime = OffsetDateTime.parse( t );
		}
		}

		public OffsetDateTime getLastModifiedTime() {
		return lastModifiedTime;
		}