Commit bddfe9b8 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '2025Q4_RC' into 'main'

Creating 2025Q4 Release

Closes org.etsi.osl.tmf.api#92

See merge request !36
parents 64210d31 8040ce3f
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@
	<parent>
	<parent>
		<groupId>org.etsi.osl</groupId>
		<groupId>org.etsi.osl</groupId>
		<artifactId>org.etsi.osl.main</artifactId>
		<artifactId>org.etsi.osl.main</artifactId>
		<version>2025Q2</version>
		<version>2025Q4</version>
		<relativePath>../org.etsi.osl.main</relativePath>
		<relativePath>../org.etsi.osl.main</relativePath>
	</parent>
	</parent>
	
	
+27 −0
Original line number Original line Diff line number Diff line
package org.etsi.osl.tmf.common.model;

public enum ERangeInterval {
    OPEN("open"),
    CLOSED("closed"),
    CLOSED_BOTTOM("closedBottom"),
    CLOSED_TOP("closedTop");

    private String value;

    ERangeInterval(String value) {this.value = value;}

    public String getValue() {
        return value;
    }

    @Override
    public String toString() {
        return this.getValue();
    }

    public static ERangeInterval getEnum(String value) {
        for(ERangeInterval v : values())
            if(v.getValue().equalsIgnoreCase(value)) return v;
        throw new IllegalArgumentException();
    }
}
+97 −0
Original line number Original line Diff line number Diff line
/*-
 * ========================LICENSE_START=================================
 * org.etsi.osl.tmf.api
 * %%
 * Copyright (C) 2019 openslice.io
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * =========================LICENSE_END==================================
 */
package org.etsi.osl.tmf.pcm620.model;

import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonProperty;
import org.etsi.osl.tmf.common.model.Notification;
import org.springframework.validation.annotation.Validated;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;

/**
 * The notification data structure for catalog create events
 */
@Schema(description = "The notification data structure for catalog create events")
@Validated
public class CatalogCreateNotification extends Notification {
  
  @JsonProperty("event")
  private CatalogCreateEvent event = null;

  public CatalogCreateNotification event(CatalogCreateEvent event) {
    this.event = event;
    return this;
  }

  /**
   * The event data structure
   * @return event
   **/
  @Schema(description = "The event data structure")
  @Valid
  public CatalogCreateEvent getEvent() {
    return event;
  }

  public void setEvent(CatalogCreateEvent event) {
    this.event = event;
  }

  @Override
  public boolean equals(java.lang.Object o) {
    if (this == o) {
      return true;
    }
    if (o == null || getClass() != o.getClass()) {
      return false;
    }
    CatalogCreateNotification catalogCreateNotification = (CatalogCreateNotification) o;
    return Objects.equals(this.event, catalogCreateNotification.event) &&
        super.equals(o);
  }

  @Override
  public int hashCode() {
    return Objects.hash(event, super.hashCode());
  }

  @Override
  public String toString() {
    StringBuilder sb = new StringBuilder();
    sb.append("class CatalogCreateNotification {\n");
    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
    sb.append("    event: ").append(toIndentedString(event)).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(java.lang.Object o) {
    if (o == null) {
      return "null";
    }
    return o.toString().replace("\n", "\n    ");
  }
}
 No newline at end of file
+97 −0
Original line number Original line Diff line number Diff line
/*-
 * ========================LICENSE_START=================================
 * org.etsi.osl.tmf.api
 * %%
 * Copyright (C) 2019 openslice.io
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * =========================LICENSE_END==================================
 */
package org.etsi.osl.tmf.pcm620.model;

import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonProperty;
import org.etsi.osl.tmf.common.model.Notification;
import org.springframework.validation.annotation.Validated;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;

/**
 * The notification data structure for catalog delete events
 */
@Schema(description = "The notification data structure for catalog delete events")
@Validated
public class CatalogDeleteNotification extends Notification {
  
  @JsonProperty("event")
  private CatalogDeleteEvent event = null;

  public CatalogDeleteNotification event(CatalogDeleteEvent event) {
    this.event = event;
    return this;
  }

  /**
   * The event data structure
   * @return event
   **/
  @Schema(description = "The event data structure")
  @Valid
  public CatalogDeleteEvent getEvent() {
    return event;
  }

  public void setEvent(CatalogDeleteEvent event) {
    this.event = event;
  }

  @Override
  public boolean equals(java.lang.Object o) {
    if (this == o) {
      return true;
    }
    if (o == null || getClass() != o.getClass()) {
      return false;
    }
    CatalogDeleteNotification catalogDeleteNotification = (CatalogDeleteNotification) o;
    return Objects.equals(this.event, catalogDeleteNotification.event) &&
        super.equals(o);
  }

  @Override
  public int hashCode() {
    return Objects.hash(event, super.hashCode());
  }

  @Override
  public String toString() {
    StringBuilder sb = new StringBuilder();
    sb.append("class CatalogDeleteNotification {\n");
    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
    sb.append("    event: ").append(toIndentedString(event)).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(java.lang.Object o) {
    if (o == null) {
      return "null";
    }
    return o.toString().replace("\n", "\n    ");
  }
}
 No newline at end of file
+97 −0
Original line number Original line Diff line number Diff line
/*-
 * ========================LICENSE_START=================================
 * org.etsi.osl.tmf.api
 * %%
 * Copyright (C) 2019 openslice.io
 * %%
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 * =========================LICENSE_END==================================
 */
package org.etsi.osl.tmf.pcm620.model;

import java.util.Objects;

import com.fasterxml.jackson.annotation.JsonProperty;
import org.etsi.osl.tmf.common.model.Notification;
import org.springframework.validation.annotation.Validated;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;

/**
 * The notification data structure for category create events
 */
@Schema(description = "The notification data structure for category create events")
@Validated
public class CategoryCreateNotification extends Notification {
  
  @JsonProperty("event")
  private CategoryCreateEvent event = null;

  public CategoryCreateNotification event(CategoryCreateEvent event) {
    this.event = event;
    return this;
  }

  /**
   * The event data structure
   * @return event
   **/
  @Schema(description = "The event data structure")
  @Valid
  public CategoryCreateEvent getEvent() {
    return event;
  }

  public void setEvent(CategoryCreateEvent event) {
    this.event = event;
  }

  @Override
  public boolean equals(java.lang.Object o) {
    if (this == o) {
      return true;
    }
    if (o == null || getClass() != o.getClass()) {
      return false;
    }
    CategoryCreateNotification categoryCreateNotification = (CategoryCreateNotification) o;
    return Objects.equals(this.event, categoryCreateNotification.event) &&
        super.equals(o);
  }

  @Override
  public int hashCode() {
    return Objects.hash(event, super.hashCode());
  }

  @Override
  public String toString() {
    StringBuilder sb = new StringBuilder();
    sb.append("class CategoryCreateNotification {\n");
    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
    sb.append("    event: ").append(toIndentedString(event)).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(java.lang.Object o) {
    if (o == null) {
      return "null";
    }
    return o.toString().replace("\n", "\n    ");
  }
}
 No newline at end of file
Loading