Commit a8c8306b authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '23-pm628-measurementcollectionjob-execution-state-not-properly-saved-in-the-db' into 'develop'

PM628: MeasurementCollectionJob Execution State not properly saved in the DB

See merge request !25
parents ec5f533b 102b4ce1

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ public class ManagementJobMVO { 
  // @JsonProperty("executionState")

  // @JsonProperty("executionState")

  @Setter

  @Setter

  @Getter

  @Getter

  @JsonIgnore

  @JsonProperty("executionState")

  private ExecutionStateType executionState;

  private ExecutionStateType executionState;





  public ManagementJobMVO() {

  public ManagementJobMVO() {
@@ -267,6 +267,7 @@ public class ManagementJobMVO { 
        Objects.equals(this.schemaLocation, managementJobMVO.schemaLocation) &&

        Objects.equals(this.schemaLocation, managementJobMVO.schemaLocation) &&

        Objects.equals(this.href, managementJobMVO.href) &&

        Objects.equals(this.href, managementJobMVO.href) &&

        Objects.equals(this.uuid, managementJobMVO.uuid) &&

        Objects.equals(this.uuid, managementJobMVO.uuid) &&

        Objects.equals(this.executionState, managementJobMVO.executionState) &&

        Objects.equals(this.fileTransferData, managementJobMVO.fileTransferData) &&

        Objects.equals(this.fileTransferData, managementJobMVO.fileTransferData) &&

        Objects.equals(this.dataAccessEndpoint, managementJobMVO.dataAccessEndpoint) &&

        Objects.equals(this.dataAccessEndpoint, managementJobMVO.dataAccessEndpoint) &&

        Objects.equals(this.scheduleDefinition, managementJobMVO.scheduleDefinition);

        Objects.equals(this.scheduleDefinition, managementJobMVO.scheduleDefinition);
@@ -286,6 +287,7 @@ public class ManagementJobMVO { 
    sb.append("    atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");

    sb.append("    atSchemaLocation: ").append(toIndentedString(schemaLocation)).append("\n");

    sb.append("    href: ").append(toIndentedString(href)).append("\n");

    sb.append("    href: ").append(toIndentedString(href)).append("\n");

    sb.append("    id: ").append(toIndentedString(uuid)).append("\n");

    sb.append("    id: ").append(toIndentedString(uuid)).append("\n");

    sb.append("    executionState: ").append(toIndentedString(executionState)).append("\n");

    sb.append("    fileTransferData: ").append(toIndentedString(fileTransferData)).append("\n");

    sb.append("    fileTransferData: ").append(toIndentedString(fileTransferData)).append("\n");

    sb.append("    dataAccessEndpoint: ").append(toIndentedString(dataAccessEndpoint)).append("\n");

    sb.append("    dataAccessEndpoint: ").append(toIndentedString(dataAccessEndpoint)).append("\n");

    sb.append("    scheduleDefinition: ").append(toIndentedString(scheduleDefinition)).append("\n");

    sb.append("    scheduleDefinition: ").append(toIndentedString(scheduleDefinition)).append("\n");