From e6ff189709e0d765e7646766c726d585e587ae80 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Sat, 25 Nov 2023 19:45:23 +0200 Subject: [PATCH] refactor packages to nfv and also removed unused packages from classes --- pom.xml | 2 +- .../org/etsi/osl/osom/OsomSpringBoot.java | 6 ----- .../ActiveMQComponentConfig.java | 1 - .../osom/configuration/OSOMRouteBuilder.java | 15 ++++------- .../etsi/osl/osom/lcm/LCMRulesController.java | 6 ++--- .../etsi/osl/osom/lcm/LCMRulesExecutor.java | 3 --- .../etsi/osl/osom/lcm/LcmBaseExecutor.java | 12 +++------ .../osl/osom/management/AlarmsService.java | 9 +++---- .../osl/osom/management/AutomationCheck.java | 10 ++++---- ...CROrchestrationCheckDeploymentService.java | 15 +++-------- .../management/CROrchestrationService.java | 13 ++++------ .../CheckServiceTestDeployment.java | 12 ++++----- .../management/CreateReservedService.java | 11 ++++---- .../management/DependencyRulesSolver.java | 8 +++--- ...ExternalPartnerCheckDeploymentService.java | 11 ++++---- .../ExternalPartnerSubmitOrderService.java | 11 ++++---- .../management/FetchAcknowledgedOrders.java | 6 ++--- .../management/FetchInProgressOrders.java | 4 +-- .../osl/osom/management/FindOrderItems.java | 6 ++--- .../management/InitializeProcessOrders.java | 6 ++--- .../management/LocalSOCheckDeployment.java | 11 ++++---- .../osom/management/LocalSOInitialize.java | 7 +++--- ...FVOrchestrationCheckDeploymentService.java | 15 ++++++----- .../management/NFVOrchestrationService.java | 22 ++++++++-------- .../osom/management/OrderCompleteService.java | 12 ++++----- .../management/ProcessCreateServiceRules.java | 11 ++++---- .../management/ProcessOrderItemActionAdd.java | 6 ++--- .../ProcessOrderItemActionCheck.java | 6 ++--- .../ProcessOrderItemActionDelete.java | 10 ++++---- .../ProcessOrderItemActionModify.java | 10 ++++---- .../osom/management/ServiceOrderManager.java | 25 ++++++++----------- .../management/UserOrderCompleteService.java | 5 ++-- .../FetchPartnerOrganizations.java | 5 +--- .../FetchUpdateExternalPartnerServices.java | 11 +++----- .../partnerservices/FlowOneServiceOrder.java | 1 - .../osom/partnerservices/GenericClient.java | 3 --- .../PartnerOrganizationServicesManager.java | 16 +++++------- .../osom/partnerservices/SimpleIDSpec.java | 1 - .../SyncPartnerServiceInventory.java | 9 +++---- .../AutomaticallyHandleAction.java | 10 +++----- .../osl/osom/serviceactions/CRPatchTask.java | 19 ++++---------- .../osom/serviceactions/CRTerminateTask.java | 15 ++++------- .../ExternalProviderServiceAction.java | 12 ++++----- .../FetchServiceQueueItems.java | 4 +-- .../serviceactions/HandleManuallyAction.java | 10 +++----- .../osom/serviceactions/NFVODAY2config.java | 15 +++++------ .../serviceactions/NFVONSTerminateTask.java | 13 ++++------ .../NSActionRequestPayload.java | 1 - .../serviceactions/ServiceActionCheck.java | 11 ++++---- .../ServiceActivationAction.java | 12 ++++----- .../serviceactions/ServiceEvaluateAction.java | 12 ++++----- .../serviceactions/ServiceInactiveAction.java | 12 ++++----- .../fetchAndTerminateScheduledServices.java | 5 ++-- src/main/resources/application.yml | 2 +- src/test/java/org/etsi/osl/osom/SCMocked.java | 6 ++--- src/test/java/org/etsi/osl/osom/SPMocked.java | 4 +-- 56 files changed, 200 insertions(+), 316 deletions(-) diff --git a/pom.xml b/pom.xml index 343c6c1..ca48b0f 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.etsi.osl - org.etsi.osl.model + org.etsi.osl.model.nfv ${project.version} diff --git a/src/main/java/org/etsi/osl/osom/OsomSpringBoot.java b/src/main/java/org/etsi/osl/osom/OsomSpringBoot.java index 423aa63..e2830e6 100644 --- a/src/main/java/org/etsi/osl/osom/OsomSpringBoot.java +++ b/src/main/java/org/etsi/osl/osom/OsomSpringBoot.java @@ -26,16 +26,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.ExitCodeGenerator; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.context.properties.EnableConfigurationProperties; //import org.springframework.cloud.client.discovery.EnableDiscoveryClient; //import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.context.annotation.FilterType; /** * @author ctranoris diff --git a/src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java b/src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java index a49908f..c7cdebd 100644 --- a/src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java +++ b/src/main/java/org/etsi/osl/osom/configuration/ActiveMQComponentConfig.java @@ -22,7 +22,6 @@ package org.etsi.osl.osom.configuration; import org.apache.camel.component.activemq.ActiveMQComponent; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - import jakarta.jms.ConnectionFactory; /** diff --git a/src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java b/src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java index e4ac7e7..61d3e40 100644 --- a/src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java +++ b/src/main/java/org/etsi/osl/osom/configuration/OSOMRouteBuilder.java @@ -25,21 +25,16 @@ import org.apache.camel.Exchange; import org.apache.camel.LoggingLevel; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.model.dataformat.JsonLibrary; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.etsi.osl.osom.management.ServiceOrderManager; -import org.etsi.osl.osom.serviceactions.ServiceActionCheck; +import org.etsi.osl.model.nfv.ExperimentMetadata; +import org.etsi.osl.model.nfv.Product; +import org.etsi.osl.model.nfv.ValidationJob; +import org.etsi.osl.model.nfv.ValidationStatus; +import org.etsi.osl.model.nfv.VxFMetadata; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import org.etsi.osl.model.ExperimentMetadata; -import org.etsi.osl.model.Product; -import org.etsi.osl.model.ValidationJob; -import org.etsi.osl.model.ValidationStatus; -import org.etsi.osl.model.VxFMetadata; -import org.etsi.osl.tmf.am642.model.AlarmCreate; -import org.etsi.osl.tmf.so641.model.ServiceOrder; @Configuration //@RefreshScope diff --git a/src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java b/src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java index 760874b..46cc547 100644 --- a/src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java +++ b/src/main/java/org/etsi/osl/osom/lcm/LCMRulesController.java @@ -4,20 +4,18 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.camel.ProducerTemplate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; +import org.etsi.osl.tmf.lcm.model.ELCMRulePhase; +import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import org.etsi.osl.tmf.lcm.model.ELCMRulePhase; -import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification; /** * @author ctranoris diff --git a/src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java b/src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java index 3a77c8e..3edcb15 100644 --- a/src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java +++ b/src/main/java/org/etsi/osl/osom/lcm/LCMRulesExecutor.java @@ -12,17 +12,14 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.List; - import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification; /** diff --git a/src/main/java/org/etsi/osl/osom/lcm/LcmBaseExecutor.java b/src/main/java/org/etsi/osl/osom/lcm/LcmBaseExecutor.java index fa11e71..585b5d0 100644 --- a/src/main/java/org/etsi/osl/osom/lcm/LcmBaseExecutor.java +++ b/src/main/java/org/etsi/osl/osom/lcm/LcmBaseExecutor.java @@ -5,9 +5,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.function.Consumer; - import javax.net.ssl.SSLException; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -17,15 +15,9 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.JsonPath; import com.jayway.jsonpath.Option; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.partnerservices.GenericClient; -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpStatus; -import org.springframework.http.HttpStatusCode; -import org.springframework.web.reactive.function.client.WebClient; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.EValueType; import org.etsi.osl.tmf.common.model.service.Characteristic; @@ -39,6 +31,10 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderCreate; import org.etsi.osl.tmf.so641.model.ServiceOrderItemRelationship; import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatusCode; +import org.springframework.web.reactive.function.client.WebClient; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import reactor.core.publisher.Mono; diff --git a/src/main/java/org/etsi/osl/osom/management/AlarmsService.java b/src/main/java/org/etsi/osl/osom/management/AlarmsService.java index ec21c95..879e6a2 100644 --- a/src/main/java/org/etsi/osl/osom/management/AlarmsService.java +++ b/src/main/java/org/etsi/osl/osom/management/AlarmsService.java @@ -3,22 +3,19 @@ package org.etsi.osl.osom.management; import java.io.IOException; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - import org.etsi.osl.tmf.am642.model.AlarmCreate; import org.etsi.osl.tmf.am642.model.AlarmStateType; import org.etsi.osl.tmf.am642.model.AlarmUpdate; import org.etsi.osl.tmf.am642.model.Comment; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; @Service public class AlarmsService { diff --git a/src/main/java/org/etsi/osl/osom/management/AutomationCheck.java b/src/main/java/org/etsi/osl/osom/management/AutomationCheck.java index 1e8fc76..d8aef5d 100644 --- a/src/main/java/org/etsi/osl/osom/management/AutomationCheck.java +++ b/src/main/java/org/etsi/osl/osom/management/AutomationCheck.java @@ -22,16 +22,16 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.UserPartRoleType; import org.etsi.osl.tmf.prm669.model.RelatedParty; import org.etsi.osl.tmf.scm633.model.ServiceSpecification; import org.etsi.osl.tmf.sim638.model.EServiceStartMode; import org.etsi.osl.tmf.sim638.model.Service; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; /** * @author ctranoris diff --git a/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java index 364aa98..d13ff59 100644 --- a/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java +++ b/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java @@ -21,22 +21,15 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.DeploymentDescriptorStatus; -import org.etsi.osl.model.DeploymentDescriptorVxFInstanceInfo; -import org.etsi.osl.tmf.common.model.Any; -import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.common.model.service.ResourceRef; import org.etsi.osl.tmf.common.model.service.ServiceStateType; import org.etsi.osl.tmf.ri639.model.Resource; -import org.etsi.osl.tmf.ri639.model.ResourceStatusType; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import jakarta.validation.Valid; diff --git a/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java b/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java index 866593b..83889fa 100644 --- a/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java +++ b/src/main/java/org/etsi/osl/osom/management/CROrchestrationService.java @@ -23,16 +23,8 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.util.HashMap; import java.util.Map; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import org.etsi.osl.model.DeploymentDescriptor; import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.common.model.service.ResourceRef; @@ -45,6 +37,11 @@ import org.etsi.osl.tmf.scm633.model.ServiceSpecification; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.etsi.osl.tmf.so641.model.ServiceOrder; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "crOrchestrationService") // bean name diff --git a/src/main/java/org/etsi/osl/osom/management/CheckServiceTestDeployment.java b/src/main/java/org/etsi/osl/osom/management/CheckServiceTestDeployment.java index 84a2b71..c21c634 100644 --- a/src/main/java/org/etsi/osl/osom/management/CheckServiceTestDeployment.java +++ b/src/main/java/org/etsi/osl/osom/management/CheckServiceTestDeployment.java @@ -2,15 +2,8 @@ package org.etsi.osl.osom.management; import java.util.ArrayList; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.EValueType; import org.etsi.osl.tmf.common.model.service.Characteristic; @@ -27,6 +20,11 @@ import org.etsi.osl.tmf.stm653.model.ServiceTest; import org.etsi.osl.tmf.stm653.model.ServiceTestCreate; import org.etsi.osl.tmf.stm653.model.ServiceTestSpecification; import org.etsi.osl.tmf.stm653.model.ServiceTestSpecificationRef; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; import jakarta.validation.Valid; @Component(value = "checkServiceTestDeployment") //bean name diff --git a/src/main/java/org/etsi/osl/osom/management/CreateReservedService.java b/src/main/java/org/etsi/osl/osom/management/CreateReservedService.java index 042353e..9feeb41 100644 --- a/src/main/java/org/etsi/osl/osom/management/CreateReservedService.java +++ b/src/main/java/org/etsi/osl/osom/management/CreateReservedService.java @@ -4,16 +4,10 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.util.ArrayList; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.EValueType; import org.etsi.osl.tmf.common.model.UserPartRoleType; @@ -37,6 +31,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; import jakarta.validation.Valid; @Component(value = "createReservedService") // bean name diff --git a/src/main/java/org/etsi/osl/osom/management/DependencyRulesSolver.java b/src/main/java/org/etsi/osl/osom/management/DependencyRulesSolver.java index 9902fb1..8ccef5a 100644 --- a/src/main/java/org/etsi/osl/osom/management/DependencyRulesSolver.java +++ b/src/main/java/org/etsi/osl/osom/management/DependencyRulesSolver.java @@ -21,17 +21,15 @@ package org.etsi.osl.osom.management; import java.util.HashMap; import java.util.Map; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.flowable.dmn.engine.DmnEngine; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.scm633.model.ServiceSpecification; import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; +import org.flowable.dmn.engine.DmnEngine; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; /** * @author ctranoris diff --git a/src/main/java/org/etsi/osl/osom/management/ExternalPartnerCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/ExternalPartnerCheckDeploymentService.java index a7550e9..df4226f 100644 --- a/src/main/java/org/etsi/osl/osom/management/ExternalPartnerCheckDeploymentService.java +++ b/src/main/java/org/etsi/osl/osom/management/ExternalPartnerCheckDeploymentService.java @@ -22,15 +22,9 @@ package org.etsi.osl.osom.management; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.partnerservices.PartnerOrganizationServicesManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.UserPartRoleType; import org.etsi.osl.tmf.common.model.service.Characteristic; @@ -49,6 +43,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "externalPartnerCheckDeploymentService") //bean name public class ExternalPartnerCheckDeploymentService implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/ExternalPartnerSubmitOrderService.java b/src/main/java/org/etsi/osl/osom/management/ExternalPartnerSubmitOrderService.java index 7b6ee4b..6e42233 100644 --- a/src/main/java/org/etsi/osl/osom/management/ExternalPartnerSubmitOrderService.java +++ b/src/main/java/org/etsi/osl/osom/management/ExternalPartnerSubmitOrderService.java @@ -21,15 +21,9 @@ package org.etsi.osl.osom.management; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.partnerservices.PartnerOrganizationServicesManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.UserPartRoleType; import org.etsi.osl.tmf.common.model.service.Characteristic; @@ -46,6 +40,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderCreate; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.etsi.osl.tmf.so641.model.ServiceRestriction; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "externalPartnerSubmitOrderService") //bean name public class ExternalPartnerSubmitOrderService implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/FetchAcknowledgedOrders.java b/src/main/java/org/etsi/osl/osom/management/FetchAcknowledgedOrders.java index 0deac30..82686ff 100644 --- a/src/main/java/org/etsi/osl/osom/management/FetchAcknowledgedOrders.java +++ b/src/main/java/org/etsi/osl/osom/management/FetchAcknowledgedOrders.java @@ -22,9 +22,10 @@ package org.etsi.osl.osom.management; import java.time.Instant; import java.util.ArrayList; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.tmf.so641.model.ServiceOrder; +import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.flowable.engine.TaskService; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; @@ -32,9 +33,6 @@ import org.flowable.task.api.Task; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.so641.model.ServiceOrder; -import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; - @Component(value = "fetchAcknowledgedOrders") // bean name public class FetchAcknowledgedOrders implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/FetchInProgressOrders.java b/src/main/java/org/etsi/osl/osom/management/FetchInProgressOrders.java index 0f6a3f5..baef257 100644 --- a/src/main/java/org/etsi/osl/osom/management/FetchInProgressOrders.java +++ b/src/main/java/org/etsi/osl/osom/management/FetchInProgressOrders.java @@ -21,17 +21,15 @@ package org.etsi.osl.osom.management; import java.util.ArrayList; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.flowable.engine.TaskService; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; - @Component(value = "fetchInProgressOrders") // bean name public class FetchInProgressOrders implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/FindOrderItems.java b/src/main/java/org/etsi/osl/osom/management/FindOrderItems.java index a80bd82..41bb9fe 100644 --- a/src/main/java/org/etsi/osl/osom/management/FindOrderItems.java +++ b/src/main/java/org/etsi/osl/osom/management/FindOrderItems.java @@ -2,17 +2,15 @@ package org.etsi.osl.osom.management; import java.util.ArrayList; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.tmf.so641.model.ServiceOrder; +import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.so641.model.ServiceOrder; -import org.etsi.osl.tmf.so641.model.ServiceOrderItem; - @Component(value = "findOrderItems") // bean name public class FindOrderItems implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/InitializeProcessOrders.java b/src/main/java/org/etsi/osl/osom/management/InitializeProcessOrders.java index 3b2a331..2d81c48 100644 --- a/src/main/java/org/etsi/osl/osom/management/InitializeProcessOrders.java +++ b/src/main/java/org/etsi/osl/osom/management/InitializeProcessOrders.java @@ -21,18 +21,16 @@ package org.etsi.osl.osom.management; import java.util.ArrayList; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; +import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; -import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; - @Component(value = "initializeProcessOrders") // bean name public class InitializeProcessOrders implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/LocalSOCheckDeployment.java b/src/main/java/org/etsi/osl/osom/management/LocalSOCheckDeployment.java index 29c6d4d..c2626f4 100644 --- a/src/main/java/org/etsi/osl/osom/management/LocalSOCheckDeployment.java +++ b/src/main/java/org/etsi/osl/osom/management/LocalSOCheckDeployment.java @@ -21,15 +21,9 @@ package org.etsi.osl.osom.management; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.partnerservices.PartnerOrganizationServicesManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.common.model.service.ServiceRef; import org.etsi.osl.tmf.common.model.service.ServiceStateType; @@ -38,6 +32,11 @@ import org.etsi.osl.tmf.scm633.model.ServiceSpecification; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.etsi.osl.tmf.so641.model.ServiceOrder; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "localSoCheckDeployment") //bean name diff --git a/src/main/java/org/etsi/osl/osom/management/LocalSOInitialize.java b/src/main/java/org/etsi/osl/osom/management/LocalSOInitialize.java index b8276f7..411c051 100644 --- a/src/main/java/org/etsi/osl/osom/management/LocalSOInitialize.java +++ b/src/main/java/org/etsi/osl/osom/management/LocalSOInitialize.java @@ -21,16 +21,15 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.tmf.sim638.model.Service; +import org.etsi.osl.tmf.sim638.model.ServiceUpdate; +import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.sim638.model.Service; -import org.etsi.osl.tmf.sim638.model.ServiceUpdate; -import org.etsi.osl.tmf.so641.model.ServiceOrder; - @Component(value = "localSoInitialize") //bean name public class LocalSOInitialize implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationCheckDeploymentService.java index 740a8fd..e81aab1 100644 --- a/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationCheckDeploymentService.java +++ b/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationCheckDeploymentService.java @@ -21,19 +21,18 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.DeploymentDescriptorStatus; -import org.etsi.osl.model.DeploymentDescriptorVxFInstanceInfo; +import org.etsi.osl.model.nfv.DeploymentDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptorStatus; +import org.etsi.osl.model.nfv.DeploymentDescriptorVxFInstanceInfo; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.common.model.service.ServiceStateType; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; @Component(value = "nfvOrchestrationCheckDeploymentService") //bean name diff --git a/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationService.java b/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationService.java index d4ef027..b92d3e3 100644 --- a/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationService.java +++ b/src/main/java/org/etsi/osl/osom/management/NFVOrchestrationService.java @@ -24,20 +24,13 @@ import java.time.ZoneOffset; import java.util.Date; import java.util.Map; import java.util.regex.Pattern; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.DeploymentDescriptorStatus; -import org.etsi.osl.model.ExperimentMetadata; -import org.etsi.osl.model.ExperimentOnBoardDescriptor; -import org.etsi.osl.model.NetworkServiceDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptorStatus; +import org.etsi.osl.model.nfv.ExperimentMetadata; +import org.etsi.osl.model.nfv.ExperimentOnBoardDescriptor; +import org.etsi.osl.model.nfv.NetworkServiceDescriptor; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.common.model.service.Note; @@ -47,6 +40,11 @@ import org.etsi.osl.tmf.scm633.model.ServiceSpecification; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.etsi.osl.tmf.so641.model.ServiceOrder; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "nfvOrchestrationService") //bean name diff --git a/src/main/java/org/etsi/osl/osom/management/OrderCompleteService.java b/src/main/java/org/etsi/osl/osom/management/OrderCompleteService.java index fa592d4..7b37307 100644 --- a/src/main/java/org/etsi/osl/osom/management/OrderCompleteService.java +++ b/src/main/java/org/etsi/osl/osom/management/OrderCompleteService.java @@ -21,15 +21,8 @@ package org.etsi.osl.osom.management; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.common.model.service.ResourceRef; import org.etsi.osl.tmf.common.model.service.ServiceRef; @@ -39,6 +32,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; import jakarta.validation.Valid; diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java b/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java index e21df96..872cf39 100644 --- a/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java +++ b/src/main/java/org/etsi/osl/osom/management/ProcessCreateServiceRules.java @@ -4,16 +4,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.service.ServiceRef; import org.etsi.osl.tmf.common.model.service.ServiceStateType; import org.etsi.osl.tmf.lcm.model.ELCMRulePhase; @@ -23,6 +17,11 @@ import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "processCreateServiceRules") public class ProcessCreateServiceRules implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionAdd.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionAdd.java index 9eda1bc..caa5b90 100644 --- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionAdd.java +++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionAdd.java @@ -3,14 +3,14 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; +import org.etsi.osl.tmf.scm633.model.ServiceSpecification; +import org.etsi.osl.tmf.so641.model.ServiceOrder; +import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.scm633.model.ServiceSpecification; -import org.etsi.osl.tmf.so641.model.ServiceOrder; -import org.etsi.osl.tmf.so641.model.ServiceOrderItem; @Component(value = "processOrderItemActionAdd") // bean name public class ProcessOrderItemActionAdd implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java index 9b5c123..d724da8 100644 --- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java +++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java @@ -3,14 +3,14 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; +import org.etsi.osl.tmf.so641.model.ServiceOrder; +import org.etsi.osl.tmf.so641.model.ServiceOrderActionType; +import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.so641.model.ServiceOrder; -import org.etsi.osl.tmf.so641.model.ServiceOrderActionType; -import org.etsi.osl.tmf.so641.model.ServiceOrderItem; @Component(value = "processOrderItemActionCheck") // bean name public class ProcessOrderItemActionCheck implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionDelete.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionDelete.java index cf6d2c7..d1bfd15 100644 --- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionDelete.java +++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionDelete.java @@ -3,11 +3,6 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.service.ServiceRef; import org.etsi.osl.tmf.common.model.service.ServiceStateType; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; @@ -17,6 +12,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; import org.etsi.osl.tmf.so641.model.ServiceRestriction; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "processOrderItemActionDelete") // bean name public class ProcessOrderItemActionDelete implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionModify.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionModify.java index ed7d7b2..8c2f950 100644 --- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionModify.java +++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionModify.java @@ -3,11 +3,6 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.common.model.service.ServiceRef; import org.etsi.osl.tmf.common.model.service.ServiceStateType; @@ -19,6 +14,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; import org.etsi.osl.tmf.so641.model.ServiceRestriction; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "processOrderItemActionModify") // bean name public class ProcessOrderItemActionModify implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/management/ServiceOrderManager.java b/src/main/java/org/etsi/osl/osom/management/ServiceOrderManager.java index e745d30..0a09c5f 100644 --- a/src/main/java/org/etsi/osl/osom/management/ServiceOrderManager.java +++ b/src/main/java/org/etsi/osl/osom/management/ServiceOrderManager.java @@ -26,28 +26,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.camel.ProducerTemplate; -import org.apache.camel.model.dataformat.JsonLibrary; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.model.nfv.DeploymentDescriptor; +import org.etsi.osl.model.nfv.NetworkServiceDescriptor; +import org.etsi.osl.model.nfv.ScaleDescriptor; import org.etsi.osl.osom.serviceactions.NSActionRequestPayload; -import org.flowable.engine.RuntimeService; -import org.flowable.engine.TaskService; -import org.flowable.task.api.Task; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.NetworkServiceDescriptor; -import org.etsi.osl.model.ScaleDescriptor; import org.etsi.osl.tmf.pm632.model.Organization; -import org.etsi.osl.tmf.rcm634.model.ResourceSpecification; import org.etsi.osl.tmf.ri639.model.LogicalResource; import org.etsi.osl.tmf.ri639.model.PhysicalResource; import org.etsi.osl.tmf.ri639.model.Resource; @@ -64,6 +52,13 @@ import org.etsi.osl.tmf.stm653.model.ServiceTest; import org.etsi.osl.tmf.stm653.model.ServiceTestCreate; import org.etsi.osl.tmf.stm653.model.ServiceTestSpecification; import org.etsi.osl.tmf.stm653.model.ServiceTestUpdate; +import org.flowable.engine.RuntimeService; +import org.flowable.engine.TaskService; +import org.flowable.task.api.Task; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import jakarta.validation.constraints.NotNull; /** diff --git a/src/main/java/org/etsi/osl/osom/management/UserOrderCompleteService.java b/src/main/java/org/etsi/osl/osom/management/UserOrderCompleteService.java index 3cd49cc..d9ec9f2 100644 --- a/src/main/java/org/etsi/osl/osom/management/UserOrderCompleteService.java +++ b/src/main/java/org/etsi/osl/osom/management/UserOrderCompleteService.java @@ -21,15 +21,14 @@ package org.etsi.osl.osom.management; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.tmf.common.model.service.ServiceStateType; +import org.etsi.osl.tmf.sim638.model.Service; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.common.model.service.ServiceStateType; -import org.etsi.osl.tmf.sim638.model.Service; - @Component(value = "userOrderCompleteService") //bean name public class UserOrderCompleteService implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/FetchPartnerOrganizations.java b/src/main/java/org/etsi/osl/osom/partnerservices/FetchPartnerOrganizations.java index 2653975..e2f7a14 100644 --- a/src/main/java/org/etsi/osl/osom/partnerservices/FetchPartnerOrganizations.java +++ b/src/main/java/org/etsi/osl/osom/partnerservices/FetchPartnerOrganizations.java @@ -21,20 +21,17 @@ package org.etsi.osl.osom.partnerservices; import java.util.ArrayList; import java.util.List; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.tmf.pm632.model.Organization; import org.flowable.engine.TaskService; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.pm632.model.Organization; - @Component(value = "fetchPartnerOrganizations") // bean name public class FetchPartnerOrganizations implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/FetchUpdateExternalPartnerServices.java b/src/main/java/org/etsi/osl/osom/partnerservices/FetchUpdateExternalPartnerServices.java index 343f6f4..fb12205 100644 --- a/src/main/java/org/etsi/osl/osom/partnerservices/FetchUpdateExternalPartnerServices.java +++ b/src/main/java/org/etsi/osl/osom/partnerservices/FetchUpdateExternalPartnerServices.java @@ -20,20 +20,17 @@ package org.etsi.osl.osom.partnerservices; import java.util.List; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.pm632.model.Characteristic; import org.etsi.osl.tmf.pm632.model.Organization; import org.etsi.osl.tmf.scm633.model.ServiceSpecification; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; @Component(value = "fetchUpdateExternalPartnerServices") // bean name public class FetchUpdateExternalPartnerServices implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/FlowOneServiceOrder.java b/src/main/java/org/etsi/osl/osom/partnerservices/FlowOneServiceOrder.java index 38c31de..2a6c3b0 100644 --- a/src/main/java/org/etsi/osl/osom/partnerservices/FlowOneServiceOrder.java +++ b/src/main/java/org/etsi/osl/osom/partnerservices/FlowOneServiceOrder.java @@ -21,7 +21,6 @@ package org.etsi.osl.osom.partnerservices; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; - import org.etsi.osl.tmf.so641.model.ServiceOrderItem; @JsonIgnoreProperties(ignoreUnknown=true) diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/GenericClient.java b/src/main/java/org/etsi/osl/osom/partnerservices/GenericClient.java index 5cf2042..2aa4f91 100644 --- a/src/main/java/org/etsi/osl/osom/partnerservices/GenericClient.java +++ b/src/main/java/org/etsi/osl/osom/partnerservices/GenericClient.java @@ -23,9 +23,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.function.Function; - import javax.net.ssl.SSLException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.http.HttpHeaders; @@ -49,7 +47,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.reactive.function.client.ExchangeFilterFunction; import org.springframework.web.reactive.function.client.ExchangeStrategies; import org.springframework.web.reactive.function.client.WebClient; - import io.netty.channel.ChannelOption; import io.netty.handler.ssl.SslContext; import io.netty.handler.ssl.SslContextBuilder; diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/PartnerOrganizationServicesManager.java b/src/main/java/org/etsi/osl/osom/partnerservices/PartnerOrganizationServicesManager.java index 71132f9..366f400 100644 --- a/src/main/java/org/etsi/osl/osom/partnerservices/PartnerOrganizationServicesManager.java +++ b/src/main/java/org/etsi/osl/osom/partnerservices/PartnerOrganizationServicesManager.java @@ -26,23 +26,13 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.net.ssl.SSLException; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; - import org.apache.camel.ProducerTemplate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.core.ParameterizedTypeReference; -import org.springframework.http.HttpStatusCode; -import org.springframework.stereotype.Service; -import org.springframework.web.reactive.function.client.WebClient; - import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.pm632.model.Characteristic; import org.etsi.osl.tmf.pm632.model.Organization; @@ -55,6 +45,12 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderCreate; import org.etsi.osl.tmf.so641.model.ServiceOrderStateType; import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpStatusCode; +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; import jakarta.validation.constraints.NotNull; import reactor.core.publisher.Mono; diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/SimpleIDSpec.java b/src/main/java/org/etsi/osl/osom/partnerservices/SimpleIDSpec.java index 395c1c7..ce2d93e 100644 --- a/src/main/java/org/etsi/osl/osom/partnerservices/SimpleIDSpec.java +++ b/src/main/java/org/etsi/osl/osom/partnerservices/SimpleIDSpec.java @@ -22,7 +22,6 @@ package org.etsi.osl.osom.partnerservices; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; - import org.etsi.osl.tmf.scm633.model.ServiceSpecification; diff --git a/src/main/java/org/etsi/osl/osom/partnerservices/SyncPartnerServiceInventory.java b/src/main/java/org/etsi/osl/osom/partnerservices/SyncPartnerServiceInventory.java index e150fb7..b75adbc 100644 --- a/src/main/java/org/etsi/osl/osom/partnerservices/SyncPartnerServiceInventory.java +++ b/src/main/java/org/etsi/osl/osom/partnerservices/SyncPartnerServiceInventory.java @@ -1,19 +1,18 @@ package org.etsi.osl.osom.partnerservices; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.pm632.model.Organization; import org.etsi.osl.tmf.prm669.model.RelatedParty; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; @Component(value = "SyncPartnerServiceInventory") // bean name public class SyncPartnerServiceInventory implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/AutomaticallyHandleAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/AutomaticallyHandleAction.java index de5215e..6bc7ce4 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/AutomaticallyHandleAction.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/AutomaticallyHandleAction.java @@ -2,23 +2,21 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; +import org.etsi.osl.tmf.common.model.service.Note; +import org.etsi.osl.tmf.sim638.model.Service; +import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; +import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.common.model.service.Note; -import org.etsi.osl.tmf.sim638.model.Service; -import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; -import org.etsi.osl.tmf.sim638.model.ServiceUpdate; @Component(value = "AutomaticallyHandleAction") //bean name public class AutomaticallyHandleAction implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/CRPatchTask.java b/src/main/java/org/etsi/osl/osom/serviceactions/CRPatchTask.java index e0eb251..2e8c65a 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/CRPatchTask.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/CRPatchTask.java @@ -3,32 +3,23 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; - import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.AlarmsService; import org.etsi.osl.osom.management.ServiceOrderManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import org.etsi.osl.model.ScaleDescriptor; -import org.etsi.osl.tmf.common.model.Any; -import org.etsi.osl.tmf.common.model.EValueType; import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "CRPatchTask") // bean name public class CRPatchTask implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java b/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java index f544d3e..2648047 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java @@ -2,29 +2,24 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; -import java.util.Date; import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import org.etsi.osl.model.DeploymentDescriptor; import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.common.model.service.ResourceRef; -import org.etsi.osl.tmf.rcm634.model.ResourceSpecificationRef; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "CRTerminateTask") //bean name public class CRTerminateTask implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ExternalProviderServiceAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/ExternalProviderServiceAction.java index fd0616c..a19f1f9 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/ExternalProviderServiceAction.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/ExternalProviderServiceAction.java @@ -2,20 +2,13 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; import org.etsi.osl.osom.partnerservices.PartnerOrganizationServicesManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.common.model.service.ServiceStateType; @@ -28,6 +21,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderActionType; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.etsi.osl.tmf.so641.model.ServiceOrderUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "ExternalProviderServiceAction") //bean name public class ExternalProviderServiceAction implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/FetchServiceQueueItems.java b/src/main/java/org/etsi/osl/osom/serviceactions/FetchServiceQueueItems.java index 9ce3cb3..e78a9b1 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/FetchServiceQueueItems.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/FetchServiceQueueItems.java @@ -2,18 +2,16 @@ package org.etsi.osl.osom.serviceactions; import java.util.ArrayList; import java.util.List; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; +import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; @Component(value = "fetchServiceQueueItems") // bean name public class FetchServiceQueueItems implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/HandleManuallyAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/HandleManuallyAction.java index 7e81375..54d90bc 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/HandleManuallyAction.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/HandleManuallyAction.java @@ -2,23 +2,21 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; +import org.etsi.osl.tmf.common.model.service.Note; +import org.etsi.osl.tmf.sim638.model.Service; +import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; +import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.common.model.service.Note; -import org.etsi.osl.tmf.sim638.model.Service; -import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; -import org.etsi.osl.tmf.sim638.model.ServiceUpdate; @Component(value = "HandleManuallyAction") //bean name public class HandleManuallyAction implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/NFVODAY2config.java b/src/main/java/org/etsi/osl/osom/serviceactions/NFVODAY2config.java index feee282..6267c92 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/NFVODAY2config.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/NFVODAY2config.java @@ -6,22 +6,14 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.model.nfv.ScaleDescriptor; import org.etsi.osl.osom.management.AlarmsService; import org.etsi.osl.osom.management.ServiceOrderManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import org.etsi.osl.model.ScaleDescriptor; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.EValueType; import org.etsi.osl.tmf.common.model.service.Characteristic; @@ -29,6 +21,11 @@ import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "NFVODAY2config") //bean name public class NFVODAY2config implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/NFVONSTerminateTask.java b/src/main/java/org/etsi/osl/osom/serviceactions/NFVONSTerminateTask.java index 439101f..6a73fcc 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/NFVONSTerminateTask.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/NFVONSTerminateTask.java @@ -3,26 +3,23 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.util.Date; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.etsi.osl.model.nfv.DeploymentDescriptor; import org.etsi.osl.osom.management.ServiceOrderManager; +import org.etsi.osl.tmf.common.model.service.Note; +import org.etsi.osl.tmf.sim638.model.Service; +import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; +import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.tmf.common.model.service.Note; -import org.etsi.osl.tmf.sim638.model.Service; -import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; -import org.etsi.osl.tmf.sim638.model.ServiceUpdate; - @Component(value = "NFVONSTerminateTask") //bean name public class NFVONSTerminateTask implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/NSActionRequestPayload.java b/src/main/java/org/etsi/osl/osom/serviceactions/NSActionRequestPayload.java index eb58af7..0119c9f 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/NSActionRequestPayload.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/NSActionRequestPayload.java @@ -23,7 +23,6 @@ package org.etsi.osl.osom.serviceactions; import java.util.LinkedHashMap; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActionCheck.java b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActionCheck.java index 68e1ab2..c375e37 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActionCheck.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActionCheck.java @@ -3,15 +3,9 @@ package org.etsi.osl.osom.serviceactions; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.UserPartRoleType; import org.etsi.osl.tmf.common.model.service.ResourceRef; import org.etsi.osl.tmf.common.model.service.ServiceRef; @@ -19,6 +13,11 @@ import org.etsi.osl.tmf.prm669.model.RelatedParty; import org.etsi.osl.tmf.sim638.model.Service; import org.etsi.osl.tmf.sim638.model.ServiceActionQueueAction; import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "serviceActionCheck") //bean name public class ServiceActionCheck implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActivationAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActivationAction.java index dc2fa17..9bad34b 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActivationAction.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceActivationAction.java @@ -2,21 +2,14 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables; import org.etsi.osl.osom.management.ServiceOrderManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.lcm.model.ELCMRulePhase; import org.etsi.osl.tmf.scm633.model.ServiceSpecification; @@ -25,6 +18,11 @@ import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "ServiceActivationAction") //bean name public class ServiceActivationAction implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceEvaluateAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceEvaluateAction.java index 8679313..c95463c 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceEvaluateAction.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceEvaluateAction.java @@ -2,21 +2,14 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables; import org.etsi.osl.osom.management.ServiceOrderManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.common.model.service.Characteristic; import org.etsi.osl.tmf.common.model.service.Note; @@ -29,6 +22,11 @@ import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; import org.etsi.osl.tmf.stm653.model.ServiceTest; import org.etsi.osl.tmf.stm653.model.ServiceTestUpdate; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "ServiceEvaluateAction") //bean name public class ServiceEvaluateAction implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceInactiveAction.java b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceInactiveAction.java index 1fad4f5..8dba93d 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/ServiceInactiveAction.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/ServiceInactiveAction.java @@ -2,21 +2,14 @@ package org.etsi.osl.osom.serviceactions; import java.time.OffsetDateTime; import java.time.ZoneOffset; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.lcm.LCMRulesController; import org.etsi.osl.osom.lcm.LCMRulesExecutorVariables; import org.etsi.osl.osom.management.ServiceOrderManager; -import org.flowable.engine.delegate.DelegateExecution; -import org.flowable.engine.delegate.JavaDelegate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.etsi.osl.tmf.common.model.service.Note; import org.etsi.osl.tmf.lcm.model.ELCMRulePhase; import org.etsi.osl.tmf.scm633.model.ServiceSpecification; @@ -25,6 +18,11 @@ import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem; import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.etsi.osl.tmf.so641.model.ServiceOrder; import org.etsi.osl.tmf.so641.model.ServiceOrderItem; +import org.flowable.engine.delegate.DelegateExecution; +import org.flowable.engine.delegate.JavaDelegate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; @Component(value = "ServiceInactiveAction") //bean name public class ServiceInactiveAction implements JavaDelegate { diff --git a/src/main/java/org/etsi/osl/osom/serviceactions/fetchAndTerminateScheduledServices.java b/src/main/java/org/etsi/osl/osom/serviceactions/fetchAndTerminateScheduledServices.java index b28385b..312276d 100644 --- a/src/main/java/org/etsi/osl/osom/serviceactions/fetchAndTerminateScheduledServices.java +++ b/src/main/java/org/etsi/osl/osom/serviceactions/fetchAndTerminateScheduledServices.java @@ -1,16 +1,15 @@ package org.etsi.osl.osom.serviceactions; import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.etsi.osl.osom.management.ServiceOrderManager; +import org.etsi.osl.tmf.common.model.service.ServiceStateType; +import org.etsi.osl.tmf.sim638.model.ServiceUpdate; import org.flowable.engine.delegate.DelegateExecution; import org.flowable.engine.delegate.JavaDelegate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.etsi.osl.tmf.common.model.service.ServiceStateType; -import org.etsi.osl.tmf.sim638.model.ServiceUpdate; @Component(value = "fetchAndTerminateScheduledServices") // bean name public class fetchAndTerminateScheduledServices implements JavaDelegate { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6f930df..fd9ed49 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 13100 + port: 13689 spring: application: diff --git a/src/test/java/org/etsi/osl/osom/SCMocked.java b/src/test/java/org/etsi/osl/osom/SCMocked.java index f114c8b..d048d88 100644 --- a/src/test/java/org/etsi/osl/osom/SCMocked.java +++ b/src/test/java/org/etsi/osl/osom/SCMocked.java @@ -34,9 +34,9 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.DeploymentDescriptorStatus; -import org.etsi.osl.model.NetworkServiceDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptorStatus; +import org.etsi.osl.model.nfv.NetworkServiceDescriptor; import org.etsi.osl.tmf.lcm.model.LCMRuleSpecification; import org.etsi.osl.tmf.so641.model.ServiceOrder; import jakarta.validation.Valid; diff --git a/src/test/java/org/etsi/osl/osom/SPMocked.java b/src/test/java/org/etsi/osl/osom/SPMocked.java index 0220eba..3b25979 100644 --- a/src/test/java/org/etsi/osl/osom/SPMocked.java +++ b/src/test/java/org/etsi/osl/osom/SPMocked.java @@ -36,8 +36,8 @@ import org.apache.commons.logging.LogFactory; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; -import org.etsi.osl.model.DeploymentDescriptor; -import org.etsi.osl.model.DeploymentDescriptorStatus; +import org.etsi.osl.model.nfv.DeploymentDescriptor; +import org.etsi.osl.model.nfv.DeploymentDescriptorStatus; import org.etsi.osl.tmf.common.model.Any; import org.etsi.osl.tmf.pm632.model.Characteristic; import org.etsi.osl.tmf.pm632.model.ContactMedium; -- GitLab