Merging 2024Q2_RC into main, creating 2024Q2 Release

Merging 2024Q2_RC into main, creating 2024Q2 Release #12 (closed)

Merge request reports

Loading
+25
Changes for src/main/java/org/etsi/osl/domain/model/DomainModelDefinition.java: 25 added lines, 0 removed lines.
Original line number Diff line number Diff line
package org.etsi.osl.domain.model;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;

/**
 * @author ctranoris
 */

@Getter
@Setter
@AllArgsConstructor
public class DomainModelDefinition {
	
	//instance variables
	protected String uuid;
	protected String name;
	protected String version;
	protected String description;
	protected String category;
	
	
	
}
+32
Changes for src/main/java/org/etsi/osl/domain/model/ITMFRCM634_ModelTransformer.java: 32 added lines, 0 removed lines.
Original line number Diff line number Diff line
package org.etsi.osl.domain.model;

import org.etsi.osl.tmf.rcm634.model.ResourceSpecification;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationCreate;
import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationUpdate;

/**
 * @author ctranoris
 * 
 * Transforms the PoJo class to/from the equivalent TMF model 
 */
public interface ITMFRCM634_ModelTransformer {
	
	
	ResourceSpecificationCreate toRSpecCreate_InitRepo();
	
	
	default ResourceSpecificationCreate toRSpecCreate() {
		return null;
	}
	
	default ResourceSpecificationUpdate toRSpecUpdate() {
		return null;
	}
	
	/**
	 * loads the class fields from this model
	 * @param rSpec
	 */
	DomainModelDefinition fromRSpec( ResourceSpecification rSpec ) ;
	
}
+34
Changes for src/main/java/org/etsi/osl/domain/model/ITMFRI639_ModelTransformer.java: 34 added lines, 0 removed lines.
Original line number Diff line number Diff line
package org.etsi.osl.domain.model;

import org.etsi.osl.tmf.ri639.model.Resource;
import org.etsi.osl.tmf.ri639.model.ResourceCreate;
import org.etsi.osl.tmf.ri639.model.ResourceUpdate;

/**
 * @author ctranoris
 * 
 * Transforms the PoJo class to/from the equivalent TMF model 
 */
public interface ITMFRI639_ModelTransformer {
	
	

	
	default ResourceCreate toResourceCreate() throws Exception {
		return null;
	};

	default ResourceUpdate toResourceUpdate() throws Exception {
		return null;
	};
	
	/**
	 * loads the class fields from this model
	 * @param rSpec
	 */
	default void fromResource( Resource rSpec ) {
		
	}

	
}
+139
Changes for src/main/java/org/etsi/osl/sd/model/ServiceDescriptor.java: 139 added lines, 0 removed lines.
Original line number 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.sd.model;

import java.util.HashSet;
import java.util.Set;
import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
import org.hibernate.annotations.GenericGenerator;
import org.springframework.validation.annotation.Validated;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.validation.Valid;

/**
 * This model will hold information that will help later on service orchestration.
 * It should be attached to entities that we need to orchestrate in general, like {@link ServiceSpecification} 
 * 
 * @author ctranoris
 *
 */
@Schema(description = "This model will hold information that will help later on service orchestration.")
@Validated
@Entity(name = "ServiceDescriptor")
public class ServiceDescriptor {

	@Id
	@GeneratedValue(generator = "uuid")
	@GenericGenerator(name = "uuid", strategy = "uuid2")
	protected String uuid = null;


	@Valid
	@OneToMany(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH })
	Set<ServiceDescriptorAttr> metadata = new HashSet<>();
	
	
	/**
	 * references the root entity ID of this SD 
	 */
	private String rootEntityID;

	/**
	 * references the root entity ID of this SD 
	 */
	private String rootEntityType;
	
	
	public ServiceDescriptor() {

	}


	/**
	 * @return the metadata
	 */
	public Set<ServiceDescriptorAttr> getMetadata() {
		return metadata;
	}


	/**
	 * @param metadata the metadata to set
	 */
	public void setMetadata(Set<ServiceDescriptorAttr> metadata) {
		this.metadata = metadata;
	}


	/**
	 * @return the uuid
	 */
	public String getUuid() {
		return uuid;
	}


	/**
	 * @param uuid the uuid to set
	 */
	public void setUuid(String uuid) {
		this.uuid = uuid;
	}


	/**
	 * @return the rootEntityID
	 */
	public String getRootEntityID() {
		return rootEntityID;
	}


	/**
	 * @param rootEntityID the rootEntityID to set
	 */
	public void setRootEntityID(String rootEntityID) {
		this.rootEntityID = rootEntityID;
	}


	/**
	 * @return the rootEntityType
	 */
	public String getRootEntityType() {
		return rootEntityType;
	}


	/**
	 * @param rootEntityType the rootEntityType to set
	 */
	public void setRootEntityType(String rootEntityType) {
		this.rootEntityType = rootEntityType;
	}
	
	
	
}
+100
Changes for src/main/java/org/etsi/osl/sd/model/ServiceDescriptorAttr.java: 100 added lines, 0 removed lines.
Original line number 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.sd.model;

import org.etsi.osl.tmf.scm633.model.ServiceSpecification;
import org.hibernate.annotations.GenericGenerator;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;

/**
 * This model will hold information that will help later on service
 * orchestration. It should be attached to entities that we need to orchestrate
 * in general, like {@link ServiceSpecification}
 * 
 * @author ctranoris
 *
 */
@Entity(name = "ServiceDescriptorAttr")
public class ServiceDescriptorAttr {

	@Id
	@GeneratedValue(generator = "uuid")
	@GenericGenerator(name = "uuid", strategy = "uuid2")
	protected String uuid = null;

	private String name;

	private String value;

	public ServiceDescriptorAttr() {

	}

	public ServiceDescriptorAttr(String name, String value) {
		super();
		this.name = name;
		this.value = value;
	}

	/**
	 * @return the name
	 */
	public String getName() {
		return name;
	}

	/**
	 * @param name the name to set
	 */
	public void setName(String name) {
		this.name = name;
	}

	/**
	 * @return the value
	 */
	public String getValue() {
		return value;
	}

	/**
	 * @param value the value to set
	 */
	public void setValue(String value) {
		this.value = value;
	}

	/**
	 * @return the uuid
	 */
	public String getUuid() {
		return uuid;
	}

	/**
	 * @param uuid the uuid to set
	 */
	public void setUuid(String uuid) {
		this.uuid = uuid;
	}

}
Loading
Loading