Commit 9f081f1f authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

fix: erroneous getters and setters in schema models

parent 0474acb3

src/main/java/org/etsi/osl/hypo/clients/oss/kafka/outgoing/OssClientProducer.java

+1 −1
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/kafka/outgoing/OssClientProducer.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class OssClientProducer { 
    public void sendAlarmToTmfApi(Alarm alarm) {

        logger.infof(

                "Sending alarm to tmf api for serviceId: %s",

                alarm.getAffectedService().getFirst().getId());

                alarm.getAffectedService().getFirst().getTmfId());

        alarmEmitter.send(alarm);

    }

}

src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/OpenSliceRestClientImpl.java

+1 −1
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/OpenSliceRestClientImpl.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ public class OpenSliceRestClientImpl { 


        ServiceOrder serviceOrderResponse;

        try (Response response =

                openSliceRestClient.updateServiceOrder(token, serviceOrder, serviceOrder.getId())) {

                openSliceRestClient.updateServiceOrder(token, serviceOrder, serviceOrder.getTmfId())) {

            String serviceOrderResponseBodyAsString = response.readEntity(String.class);

            serviceOrderResponse =

                    objectMapper.readValue(serviceOrderResponseBodyAsString, ServiceOrder.class);

src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/dto/res/inventory/schema/AttachmentRefOrValue.java

+2 −2
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/dto/res/inventory/schema/AttachmentRefOrValue.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; 
import com.fasterxml.jackson.annotation.JsonPropertyOrder;

import lombok.Data;

import lombok.EqualsAndHashCode;

import org.etsi.osl.hypo.api.tmf.common.model.BaseFieldsEntity;

import org.etsi.osl.hypo.api.tmf.common.schema.validations.BaseFieldsEntityWithHref;

import org.etsi.osl.hypo.clients.oss.oss.external.dto.res.inventory.schema.validations.CheckDateFormat;



@Data
@@ -24,7 +24,7 @@ import org.etsi.osl.hypo.clients.oss.oss.external.dto.res.inventory.schema.valid 
    "referredType",

    "validFor"

})

public class AttachmentRefOrValue extends BaseFieldsEntity {

public class AttachmentRefOrValue extends BaseFieldsEntityWithHref {



    @JsonProperty("@referredType")

    private String referredType;

src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/dto/res/inventory/schema/Characteristic.java

+2 −2
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/dto/res/inventory/schema/Characteristic.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; 
import com.fasterxml.jackson.annotation.JsonPropertyOrder;

import lombok.Data;

import lombok.EqualsAndHashCode;

import org.etsi.osl.hypo.api.tmf.common.model.BaseFieldsEntity;

import org.etsi.osl.hypo.api.tmf.common.schema.validations.BaseFieldsEntityWithHref;



@Data

@JsonInclude(JsonInclude.Include.NON_NULL)

@EqualsAndHashCode(callSuper = false)

@JsonPropertyOrder({"id", "name", "value", "valueType"})

public class Characteristic extends BaseFieldsEntity {

public class Characteristic extends BaseFieldsEntityWithHref {



    private String name;

    private Value value;

src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/dto/res/inventory/schema/ConstraintRef.java

+2 −2
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/dto/res/inventory/schema/ConstraintRef.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; 
import com.fasterxml.jackson.annotation.JsonPropertyOrder;

import lombok.Data;

import lombok.EqualsAndHashCode;

import org.etsi.osl.hypo.api.tmf.common.model.BaseFieldsEntity;

import org.etsi.osl.hypo.api.tmf.common.schema.validations.BaseFieldsEntityWithHref;



@Data

@JsonInclude(JsonInclude.Include.NON_NULL)

@EqualsAndHashCode(callSuper = false)

@JsonPropertyOrder({"id", "name", "href", "version", "referredType"})

public class ConstraintRef extends BaseFieldsEntity {

public class ConstraintRef extends BaseFieldsEntityWithHref {



    private String href;

    private String name;