Commit ef67d9ea authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

feat: introduce new fields to FabricApiConnection.java

parent 330d7450

pom.xml

+41 −4
Changes for pom.xml: 41 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -94,10 +94,6 @@ 


    <build>

        <plugins>

            <plugin>

                <groupId>com.diffplug.spotless</groupId>

                <artifactId>spotless-maven-plugin</artifactId>

            </plugin>

            <plugin>

                <groupId>io.quarkus</groupId>

                <artifactId>quarkus-maven-plugin</artifactId>
@@ -158,6 +154,47 @@ 
                    </execution>

                </executions>

            </plugin>



            <plugin>

                <groupId>com.diffplug.spotless</groupId>

                <artifactId>spotless-maven-plugin</artifactId>

                <version>${spotless.maven.plugin.version}</version>

                <configuration>

                    <java>

                        <!--

                            Allow toggling spotless, as per:

                            https://github.com/diffplug/spotless/tree/main/plugin-maven#spotlessoff-and-spotlesson

                        -->

                        <toggleOffOn>

                            <off>fmt:off</off>

                            <on>fmt:on</on>

                        </toggleOffOn>



                        <googleJavaFormat>

                            <version>1.28.0</version>

                            <style>GOOGLE</style>

                        </googleJavaFormat>



                        <!-- Custom configuration -->

                        <indent>

                            <tabs>true</tabs>

                            <spacesPerTab>2</spacesPerTab>

                        </indent>

                        <indent>

                            <spaces>true</spaces>

                            <spacesPerTab>4</spacesPerTab>

                        </indent>

                    </java>

                </configuration>

                <executions>

                    <execution>

                        <phase>compile</phase>

                        <goals>

                            <goal>check</goal>

                        </goals>

                    </execution>

                </executions>

            </plugin>

            <!-- other plugins... -->

        </plugins>

    </build>

src/main/java/org/etsi/osl/hypo/core/common/fabric/management/ztc/FabricApiConnection.java

+5 −4
Changes for src/main/java/org/etsi/osl/hypo/core/common/fabric/management/ztc/FabricApiConnection.java: 5 added lines, 4 removed lines.
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.core.common.fabric.management.ztc;



import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.io.Serializable;

import java.util.List;

import lombok.AllArgsConstructor;
@@ -9,9 +8,9 @@ import lombok.Data; 
import lombok.EqualsAndHashCode;

import lombok.NoArgsConstructor;

import org.etsi.osl.hypo.core.common.ServiceBaseObject;

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.etsi.osl.hypo.core.common.object.writer.JsonObjectWriter;

import org.etsi.osl.hypo.core.common.serializers.ProtocolCustomSerializer;



@EqualsAndHashCode(callSuper = true)

@Data
@@ -20,12 +19,14 @@ import org.etsi.osl.hypo.core.common.serializers.ProtocolCustomSerializer; 
@JsonInclude(JsonInclude.Include.NON_NULL)

public class FabricApiConnection extends ServiceBaseObject implements Serializable {

    private String organizationId;

    private String bindDomainIdentityId;

    private String dialDomainIdentityId;

    private String organizationName;

    private String address;

    private List<Integer> ports;



    @JsonSerialize(using = ProtocolCustomSerializer.class)

    private List<PortRange> portRanges;

    private Protocol protocol;

    private List<Protocol> protocols;



    public String toStringAsJson() {

        return JsonObjectWriter.writeValueAsJsonString(this);

src/main/java/org/etsi/osl/hypo/core/common/fabric/management/ztc/host/PortRange.java

0 → 100644
+13 −0
Changes for src/main/java/org/etsi/osl/hypo/core/common/fabric/management/ztc/host/PortRange.java: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.core.common.fabric.management.ztc.host;



import lombok.AllArgsConstructor;

import lombok.Data;

import lombok.NoArgsConstructor;



@Data

@NoArgsConstructor

@AllArgsConstructor

public class PortRange {

    private int high;

    private int low;

}

src/main/java/org/etsi/osl/hypo/core/common/fabric/management/ztc/host/Protocol.java

+2 −2
Changes for src/main/java/org/etsi/osl/hypo/core/common/fabric/management/ztc/host/Protocol.java: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.core.common.fabric.management.ztc.host;



import com.fasterxml.jackson.annotation.JsonCreator;

import com.fasterxml.jackson.annotation.JsonValue;

import java.util.Arrays;



public enum Protocol {

    TCP("tcp"),

    UDP("udp"),

    @SuppressWarnings("SpellCheckingInspection")

    TCPANDUDP("tcpAndUdp"),

    UNSUPPORTED("unsupported");



    private final String protocolName;
@@ -21,6 +20,7 @@ public enum Protocol { 
        return protocolName;

    }



    @JsonCreator

    public static Protocol getProtocol(String protocolName) {

        return Arrays.stream(Protocol.values())

                .filter(protocol -> protocol.getProtocolName().equalsIgnoreCase(protocolName))