From 34eb0ef42510a3ac8fab7533ef0e6af40381b3c9 Mon Sep 17 00:00:00 2001
From: Christos Tranoris <tranoris@ece.upatras.gr>
Date: Sat, 25 Nov 2023 19:25:34 +0200
Subject: [PATCH] refactoring packages

---
 pom.xml                                                     | 2 +-
 .../org/etsi/osl/tmf/cm629/api/CustomerApiController.java   | 2 +-
 .../org/etsi/osl/tmf/pm632/api/IndividualApiController.java | 2 +-
 .../org/etsi/osl/tmf/ri639/api/ResourceApiController.java   | 2 +-
 .../scm633/api/ServiceSpecificationApiRouteBuilderNSD.java  | 2 +-
 .../reposervices/ServiceSpecificationRepoService.java       | 6 +++---
 .../org/etsi/osl/tmf/sim638/api/ServiceApiController.java   | 2 +-
 .../org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java | 2 +-
 .../org/etsi/osl/tmf/sim638/service/ServiceRepoService.java | 4 ++--
 .../etsi/osl/tmf/so641/api/ServiceOrderApiController.java   | 2 +-
 .../etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 044cfc0..ca6ca6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,7 @@
 
 		<dependency>
 			<groupId>org.etsi.osl</groupId>
-			<artifactId>org.etsi.osl.model</artifactId>
+			<artifactId>org.etsi.osl.model.nfv</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java b/src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java
index 04d4886..a50e730 100644
--- a/src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/cm629/api/CustomerApiController.java
@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
diff --git a/src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java b/src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java
index 1e8d006..4946fe2 100644
--- a/src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/pm632/api/IndividualApiController.java
@@ -44,7 +44,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
diff --git a/src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java b/src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java
index cf639f1..81c07b5 100644
--- a/src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/ri639/api/ResourceApiController.java
@@ -21,7 +21,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 @jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2021-07-08T09:52:18.013684600+03:00[Europe/Athens]")
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java b/src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java
index 565a365..92bfb90 100644
--- a/src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java
+++ b/src/main/java/org/etsi/osl/tmf/scm633/api/ServiceSpecificationApiRouteBuilderNSD.java
@@ -33,7 +33,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.model.NetworkServiceDescriptor;
+import org.etsi.osl.model.nfv.NetworkServiceDescriptor;
 
 @Configuration
 //@RefreshScope
diff --git a/src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java b/src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java
index 1a3c00c..23a8645 100644
--- a/src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/scm633/reposervices/ServiceSpecificationRepoService.java
@@ -86,9 +86,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import org.etsi.osl.model.ConstituentVxF;
-import org.etsi.osl.model.ExperimentOnBoardDescriptor;
-import org.etsi.osl.model.NetworkServiceDescriptor;
+import org.etsi.osl.model.nfv.ConstituentVxF;
+import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor;
+import org.etsi.osl.model.nfv.NetworkServiceDescriptor;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.validation.Valid;
 
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java b/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java
index 445318a..ac5ee19 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiController.java
@@ -42,7 +42,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java b/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java
index c589795..b9e7e4a 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/api/ServiceApiRouteBuilder.java
@@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
 
-import org.etsi.osl.model.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
 
 @Configuration
 //@RefreshScope
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
index cf763f5..47d419d 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
@@ -69,8 +69,8 @@ import org.hibernate.Transaction;
 import org.hibernate.transform.ResultTransformer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.etsi.osl.model.DeploymentDescriptor;
-import org.etsi.osl.model.DeploymentDescriptorVxFInstanceInfo;
+import org.etsi.osl.model.nfv.DeploymentDescriptor;
+import org.etsi.osl.model.nfv.DeploymentDescriptorVxFInstanceInfo;
 import jakarta.persistence.EntityManagerFactory;
 import jakarta.validation.Valid;
 
diff --git a/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java b/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java
index 7f1c2e8..7465978 100644
--- a/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java
+++ b/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiController.java
@@ -51,7 +51,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import org.etsi.osl.model.UserRoleType;
+import org.etsi.osl.model.nfv.UserRoleType;
 import io.swagger.v3.oas.annotations.Parameter;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
diff --git a/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java b/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java
index f0a02d8..04bec43 100644
--- a/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java
+++ b/src/main/java/org/etsi/osl/tmf/so641/api/ServiceOrderApiRouteBuilder.java
@@ -39,7 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Component;
-import org.etsi.osl.model.PortalUser;
+import org.etsi.osl.model.nfv.PortalUser;
 
 @Configuration
 //@RefreshScope
-- 
GitLab