Commit 0e3084c0 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'model_refactor' into 'develop' 

removed classes and changed pom.xml

See merge request !2
parents 725e4278 5c1f8ff4

pom.xml

+10 −0
Original line number Diff line number Diff line
@@ -193,6 +193,16 @@ 
			<artifactId>org.etsi.osl.model.nfv</artifactId>

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

		</dependency>

		<dependency>

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

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

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

		</dependency>

		<dependency>

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

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

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

		</dependency>

		<dependency>

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

			<artifactId>org.etsi.osl.centrallog.client</artifactId>

src/main/java/org/etsi/osl/domain/model/DomainModelDefinition.java

deleted100644 → 0
+0 −25
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;

	

	

	

}

src/main/java/org/etsi/osl/domain/model/ITMFRCM634_ModelTransformer.java

deleted100644 → 0
+0 −32
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 ) ;

	

}

src/main/java/org/etsi/osl/domain/model/ITMFRI639_ModelTransformer.java

deleted100644 → 0
+0 −34
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 ) {

		

	}



	

}

src/main/java/org/etsi/osl/domain/model/kubernetes/KubernetesCRDProperty.java

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
package org.etsi.osl.domain.model.kubernetes;



import java.util.HashMap;

import java.util.Map;



import lombok.Builder;

import lombok.Getter;

import lombok.Setter;



/**

 * @author ctranoris

 */

@Getter

@Setter

@Builder

public class KubernetesCRDProperty {



	String name;

	String valueType;

	String defaultValue;

	String description;

	Map<String, KubernetesCRDProperty> properties;

	

	public Map<String, KubernetesCRDProperty> getProperties() {

		if ( properties == null) {

			this.properties = new HashMap<>();			

		}

		return properties;

	}

	



	

	

	

}