Commit b0ad0195 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

feat: quarkus upgrade dependencies

parent 46cfe8bf

pom.xml

+14 −5
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>

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

        <relativePath/>

    </parent>
@@ -53,9 +53,13 @@ 
        <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>
@@ -64,6 +68,11 @@ 
            <groupId>io.quarkus</groupId>

            <artifactId>quarkus-keycloak-authorization</artifactId>

        </dependency>

        <dependency>

            <groupId>io.quarkiverse.openapi.generator</groupId>

            <artifactId>quarkus-openapi-generator-oidc</artifactId>

            <version>2.14.0-lts</version>

        </dependency>



        <dependency>

            <groupId>io.quarkus</groupId>
@@ -154,13 +163,13 @@ 
        <dependency>

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

            <artifactId>tmf.common</artifactId>

            <version>1.3.1</version>

            <version>1.1.0</version>

        </dependency>



        <dependency>

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

            <artifactId>tmf.schema</artifactId>

            <version>2.0.1</version>

            <version>2.4.0</version>

            <exclusions>

                <exclusion>

                    <groupId>io.quarkus</groupId>

src/main/java/org/etsi/osl/hypo/api/peering/services/PeeringService.java

+1 −8
Original line number Diff line number Diff line
@@ -171,17 +171,10 @@ public class PeeringService { 
                    "Authentication error while connecting to keycloak : %s",

                    oidcClientException.getMessage());

            peeringProducer.sendPeeringFailure(ossLifecycleData.getOrganizationId());

            Alarm alarm =

                    HelperFunctions.prepareAlarm(

                            ossLifecycleData.getOrganizationId(),

                            oidcClientException.getMessage(),

                            AlarmType.COMMUNICATIONSALARM);

            throw new PeeringException(oidcClientException.getCause().getMessage());

        } catch (Exception e) {

            logger.errorf("Error occured: %s", e.getMessage());

            peeringProducer.sendPeeringFailure(ossLifecycleData.getOrganizationId());

            Alarm alarm =

                    HelperFunctions.prepareAlarm(

                            ossLifecycleData.getOrganizationId(), e.getMessage(), AlarmType.COMMUNICATIONSALARM);

            throw new PeeringException(e.getCause().getMessage());

        }

        return serviceSpecificationEntityList;

src/main/resources/application.properties

+3 −1
Original line number Diff line number Diff line 
quarkus.http.port=8092



quarkus.http.root-path=/peering-api

quarkus.rest-client.oss-client.scope=javax.enterprise.context.RequestScoped

quarkus.rest-client.oss-client.scope=jakarta.enterprise.context.RequestScoped

quarkus.rest-client.oss-client.url=https://patras5g.eu

# No need to configure this property.It is just for passing the mvn clean install

quarkus.log.handler.kafka.enabled=false
@@ -16,6 +16,8 @@ mp.openapi.extensions.smallrye.info.contact.email=hypo@ubitech.eu 
mp.openapi.extensions.smallrye.info.contact.name=HypO

mp.openapi.extensions.smallrye.info.contact.url=https://osl.etsi.org/hypo/documentation/

mp.openapi.extensions.smallrye.info.license.name=HypO

quarkus.hibernate-orm.mapping.format.global=ignore

quarkus.keycloak.devservices.start-timeout=PT5M

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:v22.3.4

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

src/test/java/org/etsi/osl/hypo/api/peering/oss/OssRestClientImplTest.java

+1 −2
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.api.peering.oss;



import static org.etsi.osl.hypo.api.peering.util.OssConstants.TEST_BASE_URL;

import static org.gradle.api.internal.DocumentationRegistry.BASE_URL;

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

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

import static org.mockito.ArgumentMatchers.any;
@@ -36,7 +35,7 @@ class OssRestClientImplTest { 


    OssRestClient mockOpenSliceRestClient;

    Response mockResponse;



    public static final String BASE_URL = "https://docs.gradle.org";

    private final String ORG_ID = "org-123";

    private final String ACCESS_TOKEN = "test-access-token";

    private final String REFRESHED_TOKEN = "new-access-token";