Commit 55b713e8 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '15-tmf628-add-executionstate-attribute-to-measurementcollectionjobmvo-through-inheritance-from' into 'develop'

Resolve "TMF628: Add ExecutionState attribute to MeasurementCollectionJobMVO through inheritance from ManagementJobMVO"

See merge request !14
parents 5f5c8274 bc922ab3

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

+10 −4
Original line number Diff line number Diff line 
package org.etsi.osl.tmf.pm628.model;



import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

import com.fasterxml.jackson.annotation.JsonProperty;

import com.fasterxml.jackson.annotation.JsonSubTypes;

import com.fasterxml.jackson.annotation.JsonTypeInfo;

import com.fasterxml.jackson.annotation.*;

import io.swagger.v3.oas.annotations.media.Schema;

import jakarta.validation.Valid;

import jakarta.validation.constraints.NotNull;

import jakarta.validation.constraints.Size;

import lombok.Getter;

import lombok.Setter;



import javax.annotation.Generated;

import java.util.ArrayList;
@@ -59,6 +58,13 @@ public class ManagementJobMVO { 
  @Valid

  private List<ScheduleDefinitionMVO> scheduleDefinition = new ArrayList<>();



  // Property bellow was added by UoP and is not officialy part of TMF628 Model

  // @JsonProperty("executionState")

  @Setter

  @Getter

  @JsonIgnore

  private ExecutionStateType executionState;



  public ManagementJobMVO() {

    super();

  }

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

+1 −0
Original line number Diff line number Diff line
@@ -22,4 +22,5 @@ import javax.annotation.Generated; 
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-05-15T07:30:16.936523289Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")

public interface ResourceRefOrValue {

    public String getType();

    public void setType(String type);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -24,4 +24,5 @@ import javax.annotation.Generated; 
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-05-15T07:30:16.936523289Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")

public interface ResourceRefOrValueMVO {

    public String getType();

    public void setType(String type);

}