Commit 6b687815 authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

feat: introduce changes from new fields in FabricDomainConnection Kafka message

parent ed1817a3

pom.xml

+1 −1
Changes for pom.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
        <dependency>

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

            <artifactId>common</artifactId>

            <version>1.4.9</version>

            <version>1.7.0</version>

        </dependency>



        <dependency>

src/main/java/org/etsi/osl/hypo/api/fabric/entity/DomainConnectionData.java

+1 −1
Changes for src/main/java/org/etsi/osl/hypo/api/fabric/entity/DomainConnectionData.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ import java.util.List; 
import java.util.Set;

import java.util.UUID;

import lombok.Data;

import org.etsi.osl.hypo.api.fabric.model.domain.identities.PortRange;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.host.PortRange;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.host.Protocol;

import org.hibernate.annotations.JdbcTypeCode;

import org.hibernate.type.SqlTypes;

src/main/java/org/etsi/osl/hypo/api/fabric/kafka/handlers/SonataMessageHandler.java

+1 −1
Changes for src/main/java/org/etsi/osl/hypo/api/fabric/kafka/handlers/SonataMessageHandler.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import org.etsi.osl.hypo.api.fabric.exception.domain.connection.DomainConnection 
import org.etsi.osl.hypo.api.fabric.kafka.FabricKafkaSonataProducer;

import org.etsi.osl.hypo.api.fabric.mapper.DomainConnectionMapper;

import org.etsi.osl.hypo.api.fabric.model.domain.connection.DomainConnectionRequest;

import org.etsi.osl.hypo.api.fabric.model.domain.identities.PortRange;

import org.etsi.osl.hypo.api.fabric.service.DomainConnectionsService;

import org.etsi.osl.hypo.api.fabric.service.DomainIdentityService;

import org.etsi.osl.hypo.api.fabric.utils.DomainConnectionCheckerService;
@@ -33,6 +32,7 @@ import org.etsi.osl.hypo.core.common.fabric.management.ztc.CloudEventFabricApiCo 
import org.etsi.osl.hypo.core.common.fabric.management.ztc.CloudEventFabricApiDomainConnectionRequest;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.FabricApiConnection;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.FabricApiConnectionResult;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.host.PortRange;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.host.Protocol;

import org.jboss.logging.Logger;

src/main/java/org/etsi/osl/hypo/api/fabric/mapper/DomainConnectionMapper.java

+16 −1
Changes for src/main/java/org/etsi/osl/hypo/api/fabric/mapper/DomainConnectionMapper.java: 16 added lines, 1 removed line.
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.api.fabric.mapper;



import org.apache.commons.lang3.StringUtils;

import org.etsi.osl.hypo.api.fabric.entity.DomainConnectionData;

import org.etsi.osl.hypo.api.fabric.entity.DomainIdentityData;

import org.etsi.osl.hypo.api.fabric.model.domain.connection.DomainConnectionRequest;

import org.etsi.osl.hypo.api.fabric.model.domain.connection.DomainConnectionResponse;

import org.etsi.osl.hypo.api.fabric.service.ZitiContext;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.FabricApiConnection;

import org.mapstruct.AfterMapping;

import org.mapstruct.InjectionStrategy;

import org.mapstruct.Mapper;

import org.mapstruct.Mapping;

import org.mapstruct.MappingTarget;

import org.mapstruct.SubclassExhaustiveStrategy;



@Mapper(
@@ -17,7 +20,6 @@ import org.mapstruct.SubclassExhaustiveStrategy; 
        subclassExhaustiveStrategy = SubclassExhaustiveStrategy.RUNTIME_EXCEPTION)

public interface DomainConnectionMapper {



    @Mapping(source = "domainIdentityData.domainIdentityId", target = "bindDomainIdentityId")

    DomainConnectionRequest mapToDomainIdentity(

            FabricApiConnection fabricApiConnection, DomainIdentityData domainIdentityData);
@@ -32,4 +34,17 @@ public interface DomainConnectionMapper { 
            target = "networkController.name")

    @Mapping(source = "domainConnectionData.domainConnectionDataId", target = "domainConnectionId")

    DomainConnectionResponse getDomainConnectionResponse(DomainConnectionData domainConnectionData);



    @AfterMapping

    default void applyConnectionIdentityOverride(

            DomainIdentityData domainIdentityData,

            @MappingTarget

                    DomainConnectionRequest

                            domainConnectionRequest) { // or @MappingTarget DomainConnectionRequest target

        if (domainConnectionRequest != null

                && StringUtils.isBlank(domainConnectionRequest.getBindDomainIdentityId())) {

            domainConnectionRequest.setBindDomainIdentityId(domainIdentityData.getDomainIdentityId());

            // or: target.setBindDomainIdentityId(connection.getBindDomainIdentityId());

        }

    }

}

src/main/java/org/etsi/osl/hypo/api/fabric/model/domain/connection/DomainConnectionRequest.java

+1 −1
Changes for src/main/java/org/etsi/osl/hypo/api/fabric/model/domain/connection/DomainConnectionRequest.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ import java.io.IOException; 
import java.util.List;

import java.util.Set;

import lombok.Data;

import org.etsi.osl.hypo.api.fabric.model.domain.identities.PortRange;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.host.PortRange;

import org.etsi.osl.hypo.core.common.fabric.management.ztc.host.Protocol;



@Data