Commit 97144071 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

Merge remote-tracking branch 'origin/develop' into productorder

parents 76f186c4 19b69aab

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
/.project

/.classpath

/.settings

*.iml

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ include: 
      - ci-templates/default.yml

      - ci-templates/build.yml

    rules:

      - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'

      - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"'



  - project: osl/code/org.etsi.osl.main

    ref: develop
@@ -29,7 +29,7 @@ include: 
      - ci-templates/default.yml

      - ci-templates/build_unprotected.yml

    rules:

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED'

      - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && $CI_COMMIT_REF_PROTECTED == "false"'



maven_build:

  extends: .maven_build

pom.xml

+28 −1
Original line number Diff line number Diff line
@@ -3,12 +3,13 @@ 
	<parent>

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

		<artifactId>org.etsi.osl.main</artifactId>

		<version>1.0.0</version>

		<version>2024Q4-SNAPSHOT</version>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>

	

	

  	<artifactId>org.etsi.osl.model.tmf</artifactId>

	<version>${org.etsi.osl.model.tmf.version}</version>



	<properties>

		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -27,6 +28,10 @@ 
			<id>gitlab-maven</id>

			<url>https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven</url>

		</repository>

		<repository>

			<id>jitpack.io</id>

			<url>https://jitpack.io</url>

		</repository>

	</repositories>

	<distributionManagement>

		<repository>
@@ -69,6 +74,11 @@ 
			<groupId>com.fasterxml.jackson.datatype</groupId>

			<artifactId>jackson-datatype-hibernate5-jakarta</artifactId>

		</dependency>

		<dependency>

			<groupId>org.openapitools</groupId>

			<artifactId>jackson-databind-nullable</artifactId>

			<version>0.2.6</version>

		</dependency>



	<!-- swagger -->

		<dependency>
@@ -88,6 +98,23 @@ 
			<artifactId>mapstruct-processor</artifactId>

			<version>${mapstruct.version}</version>

		</dependency>

		<dependency>

			<groupId>javax.annotation</groupId>

			<artifactId>javax.annotation-api</artifactId>

			<version>1.3.2</version>

			<scope>compile</scope>

		</dependency>

		<dependency>

			<groupId>jakarta.validation</groupId>

			<artifactId>jakarta.validation-api</artifactId>

			<version>3.0.2</version>

		</dependency>

		<dependency>

			<groupId>org.jetbrains</groupId>

			<artifactId>annotations</artifactId>

			<version>13.0</version>

			<scope>compile</scope>

		</dependency>

	</dependencies>

	

		<build>

src/main/java/org/etsi/osl/tmf/common/model/Addressable.java

0 → 100644
+104 −0
Original line number Diff line number Diff line 
package org.etsi.osl.tmf.common.model;



import com.fasterxml.jackson.annotation.JsonProperty;

import io.swagger.v3.oas.annotations.media.Schema;

import jakarta.validation.Valid;



import javax.annotation.Generated;

import java.net.URI;

import java.util.Objects;



/**

 * Base schema for adressable entities

 */



@Schema(name = "Addressable", description = "Base schema for adressable entities")

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-25T11:17:58.147516734Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")

public class Addressable {



    private String id;



    private URI href;



    public Addressable id(String id) {

        this.id = id;

        return this;

    }



    /**

     * unique identifier

     *

     * @return id

     */



    @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)

    @JsonProperty("id")

    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public Addressable href(URI href) {

        this.href = href;

        return this;

    }



    /**

     * Hyperlink reference

     *

     * @return href

     */

    @Valid

    @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)

    @JsonProperty("href")

    public URI getHref() {

        return href;

    }



    public void setHref(URI href) {

        this.href = href;

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) {

            return true;

        }

        if (o == null || getClass() != o.getClass()) {

            return false;

        }

        Addressable addressable = (Addressable) o;

        return Objects.equals(this.id, addressable.id) &&

                Objects.equals(this.href, addressable.href);

    }



    @Override

    public int hashCode() {

        return Objects.hash(id, href);

    }



    @Override

    public String toString() {

        StringBuilder sb = new StringBuilder();

        sb.append("class Addressable {\n");

        sb.append("    id: ").append(toIndentedString(id)).append("\n");

        sb.append("    href: ").append(toIndentedString(href)).append("\n");

        sb.append("}");

        return sb.toString();

    }



    /**

     * Convert the given object to string with each line indented by 4 spaces

     * (except the first line).

     */

    private String toIndentedString(Object o) {

        if (o == null) {

            return "null";

        }

        return o.toString().replace("\n", "\n    ");

    }

}

src/main/java/org/etsi/osl/tmf/common/model/Entity.java

0 → 100644
+179 −0
Original line number Diff line number Diff line 
package org.etsi.osl.tmf.common.model;



import com.fasterxml.jackson.annotation.JsonProperty;

import io.swagger.v3.oas.annotations.media.Schema;

import jakarta.validation.Valid;



import javax.annotation.Generated;

import java.net.URI;

import java.util.Objects;



/**

 * Base entity schema for use in TMForum Open-APIs

 */



@Schema(name = "Entity", description = "Base entity schema for use in TMForum Open-APIs")

@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", date = "2024-04-25T11:17:58.147516734Z[Etc/UTC]", comments = "Generator version: 7.6.0-SNAPSHOT")

public class Entity {



    private String id;



    private URI href;



    private String atBaseType;



    private URI atSchemaLocation;



    private String atType;



    public Entity id(String id) {

        this.id = id;

        return this;

    }



    /**

     * unique identifier

     *

     * @return id

     */



    @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)

    @JsonProperty("id")

    public String getId() {

        return id;

    }



    public void setId(String id) {

        this.id = id;

    }



    public Entity href(URI href) {

        this.href = href;

        return this;

    }



    /**

     * Hyperlink reference

     *

     * @return href

     */

    @Valid

    @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)

    @JsonProperty("href")

    public URI getHref() {

        return href;

    }



    public void setHref(URI href) {

        this.href = href;

    }



    public Entity atBaseType(String atBaseType) {

        this.atBaseType = atBaseType;

        return this;

    }



    /**

     * When sub-classing, this defines the super-class

     *

     * @return atBaseType

     */



    @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)

    @JsonProperty("@baseType")

    public String getAtBaseType() {

        return atBaseType;

    }



    public void setAtBaseType(String atBaseType) {

        this.atBaseType = atBaseType;

    }



    public Entity atSchemaLocation(URI atSchemaLocation) {

        this.atSchemaLocation = atSchemaLocation;

        return this;

    }



    /**

     * A URI to a JSON-Schema file that defines additional attributes and relationships

     *

     * @return atSchemaLocation

     */

    @Valid

    @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)

    @JsonProperty("@schemaLocation")

    public URI getAtSchemaLocation() {

        return atSchemaLocation;

    }



    public void setAtSchemaLocation(URI atSchemaLocation) {

        this.atSchemaLocation = atSchemaLocation;

    }



    public Entity atType(String atType) {

        this.atType = atType;

        return this;

    }



    /**

     * When sub-classing, this defines the sub-class Extensible name

     *

     * @return atType

     */



    @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)

    @JsonProperty("@type")

    public String getAtType() {

        return atType;

    }



    public void setAtType(String atType) {

        this.atType = atType;

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) {

            return true;

        }

        if (o == null || getClass() != o.getClass()) {

            return false;

        }

        Entity entity = (Entity) o;

        return Objects.equals(this.id, entity.id) &&

                Objects.equals(this.href, entity.href) &&

                Objects.equals(this.atBaseType, entity.atBaseType) &&

                Objects.equals(this.atSchemaLocation, entity.atSchemaLocation) &&

                Objects.equals(this.atType, entity.atType);

    }



    @Override

    public int hashCode() {

        return Objects.hash(id, href, atBaseType, atSchemaLocation, atType);

    }



    @Override

    public String toString() {

        StringBuilder sb = new StringBuilder();

        sb.append("class Entity {\n");

        sb.append("    id: ").append(toIndentedString(id)).append("\n");

        sb.append("    href: ").append(toIndentedString(href)).append("\n");

        sb.append("    atBaseType: ").append(toIndentedString(atBaseType)).append("\n");

        sb.append("    atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n");

        sb.append("    atType: ").append(toIndentedString(atType)).append("\n");

        sb.append("}");

        return sb.toString();

    }



    /**

     * Convert the given object to string with each line indented by 4 spaces

     * (except the first line).

     */

    private String toIndentedString(Object o) {

        if (o == null) {

            return "null";

        }

        return o.toString().replace("\n", "\n    ");

    }

}