Commit 52c41f3e authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

feat: upgrade tmf.parent to 1.3.0, tmf.common to 1.3.0, tmf.schema to 2.10.0... 

feat: upgrade tmf.parent to 1.3.0, tmf.common to 1.3.0, tmf.schema to 2.10.0 and quarkus to 3.40.1.1
parent 57ec929d

pom.xml

+3 −3
Changes for pom.xml: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
  <parent>

    <groupId>org.etsi.osl.hypo.api</groupId>

    <artifactId>tmf.parent</artifactId>

    <version>1.2.0</version>

    <version>1.3.0</version>

    <!-- Signify parent lookup from artifact repository -->

    <relativePath/>

  </parent>
@@ -51,13 +51,13 @@ 
    <dependency>

      <groupId>org.etsi.osl.hypo.api</groupId>

      <artifactId>tmf.common</artifactId>

      <version>1.2.0</version>

      <version>1.3.0</version>

    </dependency>



    <dependency>

      <groupId>org.etsi.osl.hypo.api</groupId>

      <artifactId>tmf.schema</artifactId>

      <version>2.9.0</version>

      <version>2.10.0</version>

      <exclusions>

        <exclusion>

          <groupId>io.quarkus</groupId>

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

+2 −1
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/kafka/outgoing/OssClientProducer.java: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ public class OssClientProducer { 


    public void sendAlarmToTmfApi(Alarm alarm) {

        logger.infof(

                "Sending alarm to tmf api for serviceId: %s", alarm.getAffectedService().get(0).getTmfId());

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

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

        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.getTmfId())) {

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

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

            serviceOrderResponse =

                    objectMapper.readValue(serviceOrderResponseBodyAsString, ServiceOrder.class);

src/main/java/org/etsi/osl/hypo/clients/oss/poller/ResourceInventorySupplier.java

+2 −2
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/poller/ResourceInventorySupplier.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ public class ResourceInventorySupplier implements Supplier<Uni<Resource>> { 
                .transform(

                        resourceResponse -> {

                            if (resourceResponse != null

                                    && resourceResponse.getTmfId() != null

                                    && resourceId.equals(resourceResponse.getTmfId())) {

                                    && resourceResponse.getId() != null

                                    && resourceId.equals(resourceResponse.getId())) {



                                String kubeConfigValue = getKubeConfigCharacteristicValue(resourceResponse);

src/main/java/org/etsi/osl/hypo/clients/oss/poller/ServiceInventorySupplier.java

+2 −2
Changes for src/main/java/org/etsi/osl/hypo/clients/oss/poller/ServiceInventorySupplier.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ public class ServiceInventorySupplier implements Supplier<Uni<Service>> { 
                .transform(

                        serviceResponse -> {

                            if (serviceResponse != null

                                    && serviceResponse.getTmfId() != null

                                    && serviceResponse.getTmfId().equals(serviceId)) {

                                    && serviceResponse.getId() != null

                                    && serviceResponse.getId().equals(serviceId)) {

                                String kubernetesAsAServiceId =

                                        getKubernetesConfFromKubernetesAsAService(serviceResponse);

                                if (StringUtils.isNotBlank(kubernetesAsAServiceId)) {