Resolve "refactor all org.etsi.osl.model references to org.etsi.osl.model.nfv"

Closes #2 (closed)

Merge request reports

Loading
+9 −9
Changes for src/main/java/portal/api/bus/BusController.java: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -40,15 +40,15 @@ import org.springframework.http.ResponseEntity;
import org.springframework.jms.core.JmsTemplate;
import org.springframework.stereotype.Component;

import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.DeploymentDescriptor;
import org.etsi.osl.model.ExperimentMetadata;
import org.etsi.osl.model.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.PortalUser;
import org.etsi.osl.model.VFImage;
import org.etsi.osl.model.VxFMetadata;
import org.etsi.osl.model.VxFOnBoardedDescriptor;
import org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.nfv.ExperimentMetadata;
import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.nfv.VFImage;
import org.etsi.osl.model.nfv.VxFMetadata;
import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
import portal.api.mano.MANOStatus;
import portal.api.validation.ci.ValidationJobResult;

+17 −17
Changes for src/main/java/portal/api/bus/BusControllerActiveMQ.java: 17 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -30,12 +30,12 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;

import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.DeploymentDescriptor;
import org.etsi.osl.model.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.PortalUser;
import org.etsi.osl.model.VxFOnBoardedDescriptor;
import org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
import portal.api.service.DeploymentDescriptorService;
import portal.api.service.InfrastructureService;
import portal.api.service.ManoProviderService;
@@ -328,7 +328,7 @@ public class BusControllerActiveMQ extends RouteBuilder {
		
		from("activemq:queue:updateDeploymentDescriptor")
		.log( "activemq:queue:updateDeploymentDescriptor !" )
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, true)		
		.bean( deploymentDescriptorService, "updateDeploymentEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");
		
@@ -351,49 +351,49 @@ public class BusControllerActiveMQ extends RouteBuilder {
		
		from("activemq:queue:updateVxFOnBoardedDescriptor")
		.log( "activemq:queue:updateVxFOnBoardedDescriptor for ${body} !" )		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)		
		.bean( vxfObdService , "updateVxFOBDEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");

		from("activemq:queue:addInfrastructure")
		.log( "activemq:queue:addInfrastructure for ${body} !" )		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.Infrastructure.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.Infrastructure.class, true)		
		.bean( infraStructureService , "addInfrastructureEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");

		from("activemq:queue:updateInfrastructure")
		.log( "activemq:queue:updateInfrastructure for ${body} !" )		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.Infrastructure.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.Infrastructure.class, true)		
		.bean( infraStructureService , "updateInfrastructureEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");
		
		from("activemq:queue:addVxFMetadata")
		.log( "activemq:queue:addVxFMetadata for ${body} !" )		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFMetadata.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFMetadata.class, true)		
		.bean( vxfService , "addVxFMetadataEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");
		
		from("activemq:queue:addExperimentMetadata")
		.log( "activemq:queue:addExperimentMetadata for ${body} !" )		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentMetadata.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentMetadata.class, true)		
		.bean( nsdService , "addNSDMetadataEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");
		
		from("activemq:queue:addVxFOnBoardedDescriptor")
		.log( "activemq:queue:addVxFOnBoardedDescriptor for ${body} !" )		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.VxFOnBoardedDescriptor.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.VxFOnBoardedDescriptor.class, true)		
		.bean( vxfObdService , "addVxFOnBoardedDescriptorEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");
		
		from("activemq:queue:addExperimentOnBoardedDescriptor")
		.log( "activemq:queue:addExperimentOnBoardedDescriptor for ${body} !" )		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)		
		.bean( nsdObdService , "addExperimentOnBoardedDescriptorEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");
		
		from("activemq:queue:updateExperimentOnBoardDescriptor")
		.log( "activemq:queue:updateExperimentOnBoardDescriptor for ${body} !" )		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.ExperimentOnBoardDescriptor.class, true)		
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor.class, true)		
		.bean( nsdObdService , "updateNSDOBDEagerDataJson" )
		.to("log:DEBUG?showBody=true&showHeaders=true");		
				
@@ -444,7 +444,7 @@ public class BusControllerActiveMQ extends RouteBuilder {
		from( NFV_CATALOG_DEPLOY_NSD_REQ )
		.log(LoggingLevel.INFO, log, NFV_CATALOG_DEPLOY_NSD_REQ + " message received!")
		.to("log:DEBUG?showBody=true&showHeaders=true")
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, false)
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, false)
		.bean( deploymentDescriptorService, "createDeploymentRequestJson")
		.convertBodyTo( String.class );
		
@@ -459,7 +459,7 @@ public class BusControllerActiveMQ extends RouteBuilder {
		from( NFV_CATALOG_UPD_DEPLOYMENT_BY_ID )
		.log(LoggingLevel.INFO, log, NFV_CATALOG_UPD_DEPLOYMENT_BY_ID + " message received!")
		.to("log:DEBUG?showBody=true&showHeaders=true")	
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.DeploymentDescriptor.class, false)
		.unmarshal().json( JsonLibrary.Jackson, org.etsi.osl.model.nfv.DeploymentDescriptor.class, false)
		.bean( deploymentDescriptorService, "updateDeploymentEagerDataJson" )
		.convertBodyTo( String.class );
				
+22 −22
Changes for src/main/java/portal/api/controller/ArtifactsAPIController.java: 22 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -77,28 +77,28 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.multipart.MultipartFile;
import org.etsi.osl.model.Category;
import org.etsi.osl.model.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.ConstituentVxF;
import org.etsi.osl.model.DeploymentDescriptor;
import org.etsi.osl.model.DeploymentDescriptorStatus;
import org.etsi.osl.model.DeploymentDescriptorVxFPlacement;
import org.etsi.osl.model.ExperimentMetadata;
import org.etsi.osl.model.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.Infrastructure;
import org.etsi.osl.model.MANOplatform;
import org.etsi.osl.model.MANOprovider;
import org.etsi.osl.model.OnBoardingStatus;
import org.etsi.osl.model.PortalProperty;
import org.etsi.osl.model.PortalUser;
import org.etsi.osl.model.Product;
import org.etsi.osl.model.UserRoleType;
import org.etsi.osl.model.VFImage;
import org.etsi.osl.model.ValidationJob;
import org.etsi.osl.model.ValidationStatus;
import org.etsi.osl.model.VxFMetadata;
import org.etsi.osl.model.VxFOnBoardedDescriptor;
import org.etsi.osl.model.nfv.Category;
import org.etsi.osl.model.nfv.CompositeExperimentOnBoardDescriptor;
import org.etsi.osl.model.nfv.CompositeVxFOnBoardDescriptor;
import org.etsi.osl.model.nfv.ConstituentVxF;
import org.etsi.osl.model.nfv.DeploymentDescriptor;
import org.etsi.osl.model.nfv.DeploymentDescriptorStatus;
import org.etsi.osl.model.nfv.DeploymentDescriptorVxFPlacement;
import org.etsi.osl.model.nfv.ExperimentMetadata;
import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
import org.etsi.osl.model.nfv.Infrastructure;
import org.etsi.osl.model.nfv.MANOplatform;
import org.etsi.osl.model.nfv.MANOprovider;
import org.etsi.osl.model.nfv.OnBoardingStatus;
import org.etsi.osl.model.nfv.PortalProperty;
import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.nfv.Product;
import org.etsi.osl.model.nfv.UserRoleType;
import org.etsi.osl.model.nfv.VFImage;
import org.etsi.osl.model.nfv.ValidationJob;
import org.etsi.osl.model.nfv.ValidationStatus;
import org.etsi.osl.model.nfv.VxFMetadata;
import org.etsi.osl.model.nfv.VxFOnBoardedDescriptor;
import jakarta.annotation.PostConstruct;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
+7 −7
Changes for src/main/java/portal/api/controller/PortalRepositoryAPIImpl.java: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;

import org.etsi.osl.model.Category;
import org.etsi.osl.model.ExperimentMetadata;
import org.etsi.osl.model.PortalUser;
import org.etsi.osl.model.Product;
import org.etsi.osl.model.UserRoleType;
import org.etsi.osl.model.UserSession;
import org.etsi.osl.model.VxFMetadata;
import org.etsi.osl.model.nfv.Category;
import org.etsi.osl.model.nfv.ExperimentMetadata;
import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.nfv.Product;
import org.etsi.osl.model.nfv.UserRoleType;
import org.etsi.osl.model.nfv.UserSession;
import org.etsi.osl.model.nfv.VxFMetadata;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import portal.api.bus.BusController;
+4 −4
Changes for src/main/java/portal/api/controller/PortalRepositoryVFImageAPI.java: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -56,10 +56,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;

import org.etsi.osl.model.PortalUser;
import org.etsi.osl.model.UserRoleType;
import org.etsi.osl.model.VFImage;
import org.etsi.osl.model.VxFMetadata;
import org.etsi.osl.model.nfv.PortalUser;
import org.etsi.osl.model.nfv.UserRoleType;
import org.etsi.osl.model.nfv.VFImage;
import org.etsi.osl.model.nfv.VxFMetadata;
import jakarta.servlet.http.HttpServletRequest;
import portal.api.bus.BusController;
import portal.api.service.PortalPropertiesService;
Loading
Loading