Commit 1578237a authored by Eduardo Santos's avatar Eduardo Santos
Browse files

Created PrimitivesParser + added primitives as a Service Specification Characteristic + added tests

parent cc679500

pom.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -298,6 +298,11 @@ 
			<version>2.0.1</version>

			<version>2.0.1</version>

			<scope>test</scope>

			<scope>test</scope>

		</dependency>

		</dependency>

		<dependency>

			<groupId>org.json</groupId>

			<artifactId>json</artifactId>

			<version>20210307</version>

		</dependency>

	</dependencies>

	</dependencies>





	<build>

	<build>

src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java

+10 −0
Original line number Original line Diff line number Diff line
@@ -75,11 +75,13 @@ import org.etsi.osl.tmf.stm653.model.ServiceTestSpecificationUpdate; 
import org.etsi.osl.tmf.stm653.reposervices.ServiceTestSpecificationRepoService;

import org.etsi.osl.tmf.stm653.reposervices.ServiceTestSpecificationRepoService;

import org.etsi.osl.tmf.util.AttachmentUtil;

import org.etsi.osl.tmf.util.AttachmentUtil;

import org.etsi.osl.tmf.util.KrokiClient;

import org.etsi.osl.tmf.util.KrokiClient;

import org.etsi.osl.tmf.util.PrimitivesParser;

import org.hibernate.Hibernate;

import org.hibernate.Hibernate;

import org.hibernate.Session;

import org.hibernate.Session;

import org.hibernate.SessionFactory;

import org.hibernate.SessionFactory;

import org.hibernate.Transaction;

import org.hibernate.Transaction;

import org.hibernate.transform.ResultTransformer;

import org.hibernate.transform.ResultTransformer;

import org.json.JSONObject;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.core.io.ClassPathResource;

import org.springframework.core.io.ClassPathResource;

import org.springframework.stereotype.Service;

import org.springframework.stereotype.Service;
@@ -1210,6 +1212,14 @@ public class ServiceSpecificationRepoService { 
				logger.error("nsdid getConstituentVxF null returned: " + nsd.toString() );

				logger.error("nsdid getConstituentVxF null returned: " + nsd.toString() );

			}

			}





			/******************** Begin Primitives Handling ********************/



			JSONObject allPrimitives = PrimitivesParser.extractPrimitives(nsd);

    

            addServiceSpecCharacteristic(serviceSpec, "PrimitivesList", "NSPrimitives", new Any(allPrimitives.toString(), ""), EValueType.TEXT);



            /********************* End Primitives Handling *********************/

			

			

			

			ResourceSpecificationRef resourceSpecificationItemRef = new ResourceSpecificationRef();

			ResourceSpecificationRef resourceSpecificationItemRef = new ResourceSpecificationRef();

			resourceSpecificationItemRef.setId( resourceNSD.getId() );

			resourceSpecificationItemRef.setId( resourceNSD.getId() );

src/main/java/org/etsi/osl/tmf/util/PrimitivesParser.java

0 → 100644
+587 −0

File added.

Preview size limit exceeded, changes collapsed.

src/test/java/org/etsi/osl/services/reposervices/scm633/ServiceSpecificationRepoServiceTest.java

0 → 100644
+535 −0

File added.

Preview size limit exceeded, changes collapsed.

src/test/resources/reposervices/scm633/nsd.json

0 → 100644
+1 −0

File added.

Preview size limit exceeded, changes collapsed.