Commit 8b50b4c4 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

feat: Quarkus upgrade

parent 03c23d0f

pom.xml

+14 −9
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>0.1.0</version>

    <version>1.1.0</version>

      <relativePath/>

  </parent>
@@ -48,9 +48,14 @@ 
      <dependency>

          <groupId>org.jboss.pnc.logging</groupId>

          <artifactId>quarkus-logging-kafka</artifactId>

        <version>1.0.5</version>

          <version>3.0.4</version>

      </dependency>

      <dependency>

          <groupId>org.jboss.pnc.logging</groupId>

          <artifactId>quarkus-logging-kafka-deployment</artifactId>

          <version>3.0.4</version>

          <scope>provided</scope>

      </dependency>



      <dependency>

        <groupId>io.quarkus</groupId>

        <artifactId>quarkus-oidc</artifactId>
@@ -141,7 +146,7 @@ 
      <dependency>

        <groupId>org.junit.jupiter</groupId>

        <artifactId>junit-jupiter-params</artifactId>

        <version>5.10.0</version>

        <version>6.0.3</version>

        <scope>test</scope>

      </dependency>
@@ -185,19 +190,19 @@ 
      <dependency>

          <groupId>org.apache.commons</groupId>

          <artifactId>commons-lang3</artifactId>

          <version>3.14.0</version> <!-- Latest as of Aug 2025 -->

<!--          <version>3.14.0</version> &lt;!&ndash; Latest as of Aug 2025 &ndash;&gt;-->

      </dependency>



    <dependency>

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

      <artifactId>tmf.schema</artifactId>

      <version>2.0.4</version>

      <version>2.4.0</version>

    </dependency>



    <dependency>

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

      <artifactId>tmf.common</artifactId>

      <version>1.3.1</version>

      <version>1.1.0</version>

    </dependency>



    <dependency>

src/main/resources/application.properties

+3 −1
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ mp.messaging.incoming.alarm-management-channel.value.deserializer=org.etsi.osl.h 


quarkus.datasource.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/postgres:14

quarkus.kafka.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/vectorized/redpanda:v24.1.2

quarkus.keycloak.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/keycloak/keycloak:22.0.3



#Default Datasource #Postgresql

%dev.quarkus.hibernate-orm.database.generation=drop-and-create
@@ -514,3 +515,4 @@ quarkus.oidc.runtime-configuration-lifecycle=true 
quarkus.smallrye-openapi.always-run-filter=true

%prod.quarkus.smallrye-openapi.auto-add-security=false

%prod.quarkus.smallrye-openapi.filter=org.etsi.osl.hypo.api.tmf.common.api.DynamicOidcOasFilter

quarkus.hibernate-orm.mapping.format.global=ignore
 
 No newline at end of file

src/test/java/org/etsi/osl/hypo/api/tmf/api/kafka/peering/api/incoming/PeeringApiListenerKafkaTest.java

+18 −11
Original line number Diff line number Diff line
@@ -172,17 +172,24 @@ class PeeringApiListenerKafkaTest { 
                                serviceSpecificationEntity, SECOND_SERVICE_SPECIFICATION_NAME));



        // ASSERT ORGANIZATION

        Organization organizationFromDdAfterPeering = organizationService.getById(ORGANIZATION_ID);

        Awaitility.await()

                .atMost(DURATION)

                .untilAsserted(

                        () -> {

                            Organization organizationFromDdAfterPeering =

                                    organizationService.getById(ORGANIZATION_ID);

                            assertThat(organizationFromDdAfterPeering).isNotNull();



                            Optional<Characteristic> peeredOrganizationCharOptional =

                                    organizationFromDdAfterPeering.getPartyCharacteristic().stream()

                        .filter(characteristic -> characteristic.getName().equals(PEERED_ORGANIZATION))

                                            .filter(

                                                    characteristic -> characteristic.getName().equals(PEERED_ORGANIZATION))

                                            .findFirst();



                            assertThat(peeredOrganizationCharOptional).isPresent();

        assertThat(peeredOrganizationCharOptional.get().getValue().getValue()).isEqualTo("true");



                            assertThat(peeredOrganizationCharOptional.get().getValue().getValue())

                                    .isEqualTo("true");

                        });

        // ASSERT K8S CATEGORIES

        assertK8sCategoryAddition();

        // ASSERT 5G

src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/services/ServiceCandidateServiceTest.java

+1 −1
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.api.tmf.services.catalog.api.services;



import static org.assertj.core.api.Assertions.assertThat;

import static org.junit.Assert.assertThrows;

import static org.junit.jupiter.api.Assertions.assertThrows;



import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.ObjectMapper;

src/test/java/org/etsi/osl/hypo/api/tmf/services/catalog/api/services/ServiceCatalogServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ package org.etsi.osl.hypo.api.tmf.services.catalog.api.services; 
import static org.assertj.core.api.Assertions.assertThat;

import static org.etsi.osl.hypo.api.tmf.services.catalog.api.services.ServiceSpecificationService.SERVICE_CATALOG_ID;

import static org.etsi.osl.hypo.api.tmf.services.catalog.api.services.ServiceSpecificationService.SERVICE_CATEGORY_ID;

import static org.junit.Assert.assertThrows;

import static org.junit.jupiter.api.Assertions.assertThrows;



import com.fasterxml.jackson.core.JsonProcessingException;

import com.fasterxml.jackson.databind.ObjectMapper;