From 4702cdefd76de09ea1d00d833fa0ed0e8288ba0b Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Thu, 25 Jul 2024 17:01:49 +0100 Subject: [PATCH] Package name modified Package name modified. Issue-ID: NONRTRIC-872 Change-Id: Ie50c74e1a4b82dcaeac536a3904a471b613aedbf Signed-off-by: aravind.est --- rapp-manager-acm/pom.xml | 8 +- .../acm/configuration/ACMConfiguration.java | 3 +- .../JacksonMessageConverterConfiguration.java | 3 +- .../rappmanager/acm/service/AcmDeployer.java | 28 +++---- .../rappmanager/acm/service/AcmDeployerTest.java | 28 +++---- .../acm/service/BeanTestConfiguration.java | 16 ++-- .../models/rapp/RappResourceBuilder.java | 10 +-- .../oransc/rappmanager/BeanConfiguration.java | 59 +++++++------- .../oransc/rappmanager/RappManagerApplication.java | 3 +- .../configuration/RappManagerConfiguration.java | 3 +- .../oransc/rappmanager/rest/RappController.java | 25 +++--- .../rappmanager/rest/RappInstanceController.java | 19 ++--- .../service/DeploymentArtifactsService.java | 12 +-- .../oransc/rappmanager/service/RappService.java | 24 +++--- .../rappmanager/rest/RappControllerTest.java | 20 ++--- .../rest/RappInstanceControllerTest.java | 29 ++++--- .../service/DeploymentArtifactsServiceTest.java | 17 ++-- .../rappmanager/service/RappServiceTest.java | 24 +++--- rapp-manager-dme/pom.xml | 7 +- .../dme/configuration/DmeConfiguration.java | 4 +- .../rappmanager/dme/models/DataConsumerEntity.java | 3 +- .../rappmanager/dme/models/DataProducerEntity.java | 3 +- .../rappmanager/dme/models/InfoTypeEntity.java | 3 +- .../rappmanager/dme/service/DmeAcmInterceptor.java | 17 ++-- .../rappmanager/dme/service/DmeDeployer.java | 16 ++-- .../dme/service/BeanTestConfiguration.java | 17 ++-- .../dme/service/DmeAcmInterceptorTest.java | 14 ++-- .../rappmanager/dme/service/DmeDeployerTest.java | 24 +++--- .../models/rapp/RappDmeResourceBuilder.java | 7 +- rapp-manager-models/pom.xml | 2 +- .../oransc/rappmanager/models/AcmInterceptor.java | 8 +- .../oransc/rappmanager/models/RappDeployer.java | 8 +- .../rappmanager/models/cache/RappCacheService.java | 5 +- .../RappsEnvironmentConfiguration.java | 2 +- .../rappmanager/models/csar/AsdMetadata.java | 2 +- .../rappmanager/models/csar/DeploymentItem.java | 2 +- .../models/csar/DeploymentItemArtifactType.java | 2 +- .../models/csar/DeploymentItemTargetServer.java | 2 +- .../models/csar/RappCsarConfigurationHandler.java | 12 +-- .../models/csar/RappCsarPathProvider.java | 2 +- .../validator/ArtifactDefinitionValidator.java | 8 +- .../csar/validator/AsdDescriptorValidator.java | 10 +-- .../csar/validator/FileExistenceValidator.java | 4 +- .../models/csar/validator/NamingValidator.java | 4 +- .../csar/validator/RappValidationHandler.java | 2 +- .../models/csar/validator/RappValidationUtils.java | 8 +- .../models/csar/validator/RappValidator.java | 2 +- .../models/exception/ErrorResponse.java | 4 +- .../exception/ExceptionControllerHandler.java | 2 +- .../models/exception/RappHandlerException.java | 2 +- .../models/exception/RappValidationException.java | 2 +- .../oransc/rappmanager/models/rapp/PrimeOrder.java | 3 +- .../oransc/rappmanager/models/rapp/Rapp.java | 6 +- .../oransc/rappmanager/models/rapp/RappEvent.java | 3 +- .../rappmanager/models/rapp/RappPrimeOrder.java | 3 +- .../rappmanager/models/rapp/RappResources.java | 3 +- .../oransc/rappmanager/models/rapp/RappState.java | 3 +- .../models/rappinstance/DeployOrder.java | 3 +- .../models/rappinstance/RappACMInstance.java | 3 +- .../models/rappinstance/RappDMEInstance.java | 3 +- .../models/rappinstance/RappInstance.java | 2 +- .../rappinstance/RappInstanceDeployOrder.java | 3 +- .../models/rappinstance/RappInstanceState.java | 3 +- .../models/rappinstance/RappSMEInstance.java | 3 +- .../statemachine/RappInstanceStateMachine.java | 8 +- .../RappInstanceStateMachineConfig.java | 6 +- .../rappmanager/models/AcmInterceptorTest.java | 8 +- .../rappmanager/models/BeanTestConfiguration.java | 2 +- .../rappmanager/models/RappServiceEnablerTest.java | 18 ++--- .../models/cache/RappCacheServiceTest.java | 8 +- .../csar/RappCsarConfigurationHandlerTest.java | 16 ++-- .../validator/ArtifactDefinitionValidatorTest.java | 8 +- .../csar/validator/AsdDescriptorValidatorTest.java | 16 ++-- .../csar/validator/FileExistenceValidatorTest.java | 8 +- .../models/csar/validator/NamingValidatorTest.java | 4 +- .../csar/validator/RappValidationHandlerTest.java | 12 +-- .../csar/validator/RappValidationUtilsTest.java | 10 +-- .../RappInstanceStateMachineConfigTest.java | 6 +- .../statemachine/RappInstanceStateMachineTest.java | 10 +-- rapp-manager-sme/pom.xml | 18 ++--- .../sme/configuration/SmeConfiguration.java | 3 +- .../rappmanager/sme/service/SmeDeployer.java | 32 ++++---- .../sme/service/SmeLifecycleManager.java | 5 +- .../sme/service/BeanTestConfiguration.java | 34 ++++---- .../rappmanager/sme/service/SmeDeployerTest.java | 94 ++++++++++------------ .../sme/service/SmeLifecycleManagerTest.java | 5 +- 86 files changed, 467 insertions(+), 446 deletions(-) rename rapp-manager-acm/src/main/java/{com => org}/oransc/rappmanager/acm/configuration/ACMConfiguration.java (91%) mode change 100755 => 100644 rename rapp-manager-acm/src/main/java/{com => org}/oransc/rappmanager/acm/configuration/JacksonMessageConverterConfiguration.java (93%) mode change 100755 => 100644 rename rapp-manager-acm/src/main/java/{com => org}/oransc/rappmanager/acm/service/AcmDeployer.java (93%) mode change 100755 => 100644 rename rapp-manager-acm/src/test/java/{com => org}/oransc/rappmanager/acm/service/AcmDeployerTest.java (97%) mode change 100755 => 100644 rename rapp-manager-acm/src/test/java/{com => org}/oransc/rappmanager/acm/service/BeanTestConfiguration.java (88%) mode change 100755 => 100644 rename rapp-manager-acm/src/test/java/{com => org}/oransc/rappmanager/models/rapp/RappResourceBuilder.java (88%) mode change 100755 => 100644 rename rapp-manager-application/src/main/java/{com => org}/oransc/rappmanager/BeanConfiguration.java (70%) mode change 100755 => 100644 rename rapp-manager-application/src/main/java/{com => org}/oransc/rappmanager/RappManagerApplication.java (92%) mode change 100755 => 100644 rename rapp-manager-application/src/main/java/{com => org}/oransc/rappmanager/configuration/RappManagerConfiguration.java (90%) mode change 100755 => 100644 rename rapp-manager-application/src/main/java/{com => org}/oransc/rappmanager/rest/RappController.java (87%) mode change 100755 => 100644 rename rapp-manager-application/src/main/java/{com => org}/oransc/rappmanager/rest/RappInstanceController.java (90%) mode change 100755 => 100644 rename rapp-manager-application/src/main/java/{com => org}/oransc/rappmanager/service/DeploymentArtifactsService.java (90%) mode change 100755 => 100644 rename rapp-manager-application/src/main/java/{com => org}/oransc/rappmanager/service/RappService.java (91%) mode change 100755 => 100644 rename rapp-manager-application/src/test/java/{com => org}/oransc/rappmanager/rest/RappControllerTest.java (94%) mode change 100755 => 100644 rename rapp-manager-application/src/test/java/{com => org}/oransc/rappmanager/rest/RappInstanceControllerTest.java (94%) mode change 100755 => 100644 rename rapp-manager-application/src/test/java/{com => org}/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java (94%) mode change 100755 => 100644 rename rapp-manager-application/src/test/java/{com => org}/oransc/rappmanager/service/RappServiceTest.java (96%) mode change 100755 => 100644 rename rapp-manager-dme/src/main/java/{com => org}/oransc/rappmanager/dme/configuration/DmeConfiguration.java (90%) mode change 100755 => 100644 rename rapp-manager-dme/src/main/java/{com => org}/oransc/rappmanager/dme/models/DataConsumerEntity.java (92%) mode change 100755 => 100644 rename rapp-manager-dme/src/main/java/{com => org}/oransc/rappmanager/dme/models/DataProducerEntity.java (92%) mode change 100755 => 100644 rename rapp-manager-dme/src/main/java/{com => org}/oransc/rappmanager/dme/models/InfoTypeEntity.java (91%) mode change 100755 => 100644 rename rapp-manager-dme/src/main/java/{com => org}/oransc/rappmanager/dme/service/DmeAcmInterceptor.java (96%) mode change 100755 => 100644 rename rapp-manager-dme/src/main/java/{com => org}/oransc/rappmanager/dme/service/DmeDeployer.java (91%) mode change 100755 => 100644 rename rapp-manager-dme/src/test/java/{com => org}/oransc/rappmanager/dme/service/BeanTestConfiguration.java (82%) mode change 100755 => 100644 rename rapp-manager-dme/src/test/java/{com => org}/oransc/rappmanager/dme/service/DmeAcmInterceptorTest.java (94%) mode change 100755 => 100644 rename rapp-manager-dme/src/test/java/{com => org}/oransc/rappmanager/dme/service/DmeDeployerTest.java (92%) mode change 100755 => 100644 rename rapp-manager-dme/src/test/java/{com => org}/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java (89%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/AcmInterceptor.java (94%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/RappDeployer.java (83%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/cache/RappCacheService.java (92%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/configuration/RappsEnvironmentConfiguration.java (95%) rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/AsdMetadata.java (97%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/DeploymentItem.java (97%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/DeploymentItemArtifactType.java (96%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/DeploymentItemTargetServer.java (96%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java (97%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/RappCsarPathProvider.java (98%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidator.java (91%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/validator/AsdDescriptorValidator.java (92%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/validator/FileExistenceValidator.java (94%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/validator/NamingValidator.java (93%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/validator/RappValidationHandler.java (96%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/validator/RappValidationUtils.java (92%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/csar/validator/RappValidator.java (95%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/exception/ErrorResponse.java (88%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/exception/ExceptionControllerHandler.java (97%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/exception/RappHandlerException.java (96%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/exception/RappValidationException.java (96%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rapp/PrimeOrder.java (88%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rapp/Rapp.java (93%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rapp/RappEvent.java (90%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rapp/RappPrimeOrder.java (89%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rapp/RappResources.java (93%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rapp/RappState.java (89%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rappinstance/DeployOrder.java (88%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rappinstance/RappACMInstance.java (89%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rappinstance/RappDMEInstance.java (89%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rappinstance/RappInstance.java (97%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rappinstance/RappInstanceDeployOrder.java (88%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rappinstance/RappInstanceState.java (88%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/rappinstance/RappSMEInstance.java (90%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/statemachine/RappInstanceStateMachine.java (93%) mode change 100755 => 100644 rename rapp-manager-models/src/main/java/{com => org}/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java (97%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/AcmInterceptorTest.java (95%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/BeanTestConfiguration.java (97%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/RappServiceEnablerTest.java (93%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/cache/RappCacheServiceTest.java (92%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java (97%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java (95%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java (94%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java (94%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java (96%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java (94%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java (94%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java (99%) mode change 100755 => 100644 rename rapp-manager-models/src/test/java/{com => org}/oransc/rappmanager/models/statemachine/RappInstanceStateMachineTest.java (91%) mode change 100755 => 100644 rename rapp-manager-sme/src/main/java/{com => org}/oransc/rappmanager/sme/configuration/SmeConfiguration.java (91%) mode change 100755 => 100644 rename rapp-manager-sme/src/main/java/{com => org}/oransc/rappmanager/sme/service/SmeDeployer.java (92%) mode change 100755 => 100644 rename rapp-manager-sme/src/main/java/{com => org}/oransc/rappmanager/sme/service/SmeLifecycleManager.java (91%) mode change 100755 => 100644 rename rapp-manager-sme/src/test/java/{com => org}/oransc/rappmanager/sme/service/BeanTestConfiguration.java (75%) mode change 100755 => 100644 rename rapp-manager-sme/src/test/java/{com => org}/oransc/rappmanager/sme/service/SmeDeployerTest.java (90%) mode change 100755 => 100644 rename rapp-manager-sme/src/test/java/{com => org}/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java (93%) mode change 100755 => 100644 diff --git a/rapp-manager-acm/pom.xml b/rapp-manager-acm/pom.xml index a9c5b6d..39b3ed1 100755 --- a/rapp-manager-acm/pom.xml +++ b/rapp-manager-acm/pom.xml @@ -4,7 +4,7 @@ * O-RAN-SC * %% * Copyright (C) 2023 Nordix Foundation -* Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. +* Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -138,9 +138,9 @@ src/main/java true - com.oransc.rappmanager.acm - com.oransc.rappmanager.acm.rest - com.oransc.rappmanager.acm.data + org.oransc.rappmanager.acm + org.oransc.rappmanager.acm.rest + org.oransc.rappmanager.acm.data false diff --git a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/configuration/ACMConfiguration.java b/rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/configuration/ACMConfiguration.java old mode 100755 new mode 100644 similarity index 91% rename from rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/configuration/ACMConfiguration.java rename to rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/configuration/ACMConfiguration.java index 956f928..5e9129e --- a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/configuration/ACMConfiguration.java +++ b/rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/configuration/ACMConfiguration.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.acm.configuration; +package org.oransc.rappmanager.acm.configuration; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/configuration/JacksonMessageConverterConfiguration.java b/rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/configuration/JacksonMessageConverterConfiguration.java old mode 100755 new mode 100644 similarity index 93% rename from rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/configuration/JacksonMessageConverterConfiguration.java rename to rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/configuration/JacksonMessageConverterConfiguration.java index 970c70b..67e3674 --- a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/configuration/JacksonMessageConverterConfiguration.java +++ b/rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/configuration/JacksonMessageConverterConfiguration.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.acm.configuration; +package org.oransc.rappmanager.acm.configuration; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.deser.std.StdKeyDeserializer; diff --git a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java b/rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/service/AcmDeployer.java old mode 100755 new mode 100644 similarity index 93% rename from rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java rename to rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/service/AcmDeployer.java index dce7be8..9016aae --- a/rapp-manager-acm/src/main/java/com/oransc/rappmanager/acm/service/AcmDeployer.java +++ b/rapp-manager-acm/src/main/java/org/oransc/rappmanager/acm/service/AcmDeployer.java @@ -17,20 +17,9 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.acm.service; +package org.oransc.rappmanager.acm.service; import com.google.gson.Gson; -import com.oransc.rappmanager.acm.configuration.ACMConfiguration; -import com.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient; -import com.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient; -import com.oransc.rappmanager.dme.service.DmeAcmInterceptor; -import com.oransc.rappmanager.models.RappDeployer; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rappinstance.RappACMInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; import java.util.UUID; import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; @@ -45,6 +34,17 @@ import org.onap.policy.clamp.models.acm.messages.rest.instantiation.AcInstanceSt import org.onap.policy.clamp.models.acm.messages.rest.instantiation.DeployOrder; import org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstantiationResponse; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; +import org.oransc.rappmanager.acm.configuration.ACMConfiguration; +import org.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient; +import org.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient; +import org.oransc.rappmanager.dme.service.DmeAcmInterceptor; +import org.oransc.rappmanager.models.RappDeployer; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappEvent; +import org.oransc.rappmanager.models.rappinstance.RappACMInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -133,8 +133,8 @@ public class AcmDeployer implements RappDeployer { @Override public boolean deployRappInstance(Rapp rapp, RappInstance rappInstance) { try { - String instantiationPayload = rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappInstance, - rapp.getCompositionId()); + String instantiationPayload = + rappCsarConfigurationHandler.getInstantiationPayload(rapp, rappInstance, rapp.getCompositionId()); AutomationComposition automationComposition = gson.fromJson(instantiationPayload, AutomationComposition.class); if (rappInstance.isDMEEnabled()) { diff --git a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java b/rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/AcmDeployerTest.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java rename to rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/AcmDeployerTest.java index 36e0ba4..134b30a --- a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/AcmDeployerTest.java +++ b/rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/AcmDeployerTest.java @@ -17,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.acm.service; +package org.oransc.rappmanager.acm.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -34,19 +34,6 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.acm.configuration.ACMConfiguration; -import com.oransc.rappmanager.dme.service.DmeAcmInterceptor; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rapp.RappResourceBuilder; -import com.oransc.rappmanager.models.rapp.RappResources; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig; import java.io.IOException; import java.util.UUID; import java.util.stream.Stream; @@ -66,6 +53,19 @@ import org.onap.policy.clamp.models.acm.messages.rest.commissioning.Commissionin import org.onap.policy.clamp.models.acm.messages.rest.commissioning.PrimeOrder; import org.onap.policy.clamp.models.acm.messages.rest.instantiation.InstantiationResponse; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; +import org.oransc.rappmanager.acm.configuration.ACMConfiguration; +import org.oransc.rappmanager.dme.service.DmeAcmInterceptor; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappEvent; +import org.oransc.rappmanager.models.rapp.RappResourceBuilder; +import org.oransc.rappmanager.models.rapp.RappResources; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; diff --git a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/BeanTestConfiguration.java b/rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/BeanTestConfiguration.java old mode 100755 new mode 100644 similarity index 88% rename from rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/BeanTestConfiguration.java rename to rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/BeanTestConfiguration.java index 5242f90..027a4b4 --- a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/acm/service/BeanTestConfiguration.java +++ b/rapp-manager-acm/src/test/java/org/oransc/rappmanager/acm/service/BeanTestConfiguration.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. - * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,18 +17,18 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.acm.service; +package org.oransc.rappmanager.acm.service; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.oransc.rappmanager.acm.ApiClient; -import com.oransc.rappmanager.acm.configuration.ACMConfiguration; -import com.oransc.rappmanager.acm.configuration.JacksonMessageConverterConfiguration; -import com.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient; -import com.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient; -import com.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.acm.ApiClient; +import org.oransc.rappmanager.acm.configuration.ACMConfiguration; +import org.oransc.rappmanager.acm.configuration.JacksonMessageConverterConfiguration; +import org.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient; +import org.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient; +import org.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.web.client.RestTemplateBuilder; diff --git a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/models/rapp/RappResourceBuilder.java b/rapp-manager-acm/src/test/java/org/oransc/rappmanager/models/rapp/RappResourceBuilder.java old mode 100755 new mode 100644 similarity index 88% rename from rapp-manager-acm/src/test/java/com/oransc/rappmanager/models/rapp/RappResourceBuilder.java rename to rapp-manager-acm/src/test/java/org/oransc/rappmanager/models/rapp/RappResourceBuilder.java index 9da38fb..a87bb13 --- a/rapp-manager-acm/src/test/java/com/oransc/rappmanager/models/rapp/RappResourceBuilder.java +++ b/rapp-manager-acm/src/test/java/org/oransc/rappmanager/models/rapp/RappResourceBuilder.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. - * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rapp; +package org.oransc.rappmanager.models.rapp; -import com.oransc.rappmanager.models.rappinstance.RappACMInstance; -import com.oransc.rappmanager.models.rappinstance.RappDMEInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstance; import java.util.Set; +import org.oransc.rappmanager.models.rappinstance.RappACMInstance; +import org.oransc.rappmanager.models.rappinstance.RappDMEInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstance; public class RappResourceBuilder { diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/BeanConfiguration.java b/rapp-manager-application/src/main/java/org/oransc/rappmanager/BeanConfiguration.java old mode 100755 new mode 100644 similarity index 70% rename from rapp-manager-application/src/main/java/com/oransc/rappmanager/BeanConfiguration.java rename to rapp-manager-application/src/main/java/org/oransc/rappmanager/BeanConfiguration.java index 4e7f7fd..c39da0e --- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/BeanConfiguration.java +++ b/rapp-manager-application/src/main/java/org/oransc/rappmanager/BeanConfiguration.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,19 +17,19 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager; - -import com.oransc.rappmanager.acm.ApiClient; -import com.oransc.rappmanager.acm.configuration.ACMConfiguration; -import com.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient; -import com.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient; -import com.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient; -import com.oransc.rappmanager.dme.configuration.DmeConfiguration; -import com.oransc.rappmanager.dme.rest.DataConsumerApiClient; -import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient; -import com.oransc.rappmanager.sme.configuration.SmeConfiguration; -import com.oransc.rappmanager.sme.provider.rest.DefaultApiClient; +package org.oransc.rappmanager; + import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.acm.ApiClient; +import org.oransc.rappmanager.acm.configuration.ACMConfiguration; +import org.oransc.rappmanager.acm.rest.AutomationCompositionDefinitionApiClient; +import org.oransc.rappmanager.acm.rest.AutomationCompositionInstanceApiClient; +import org.oransc.rappmanager.acm.rest.ParticipantMonitoringApiClient; +import org.oransc.rappmanager.dme.configuration.DmeConfiguration; +import org.oransc.rappmanager.dme.rest.DataConsumerApiClient; +import org.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient; +import org.oransc.rappmanager.sme.configuration.SmeConfiguration; +import org.oransc.rappmanager.sme.provider.rest.DefaultApiClient; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cache.CacheManager; @@ -59,18 +60,18 @@ public class BeanConfiguration { } @Bean("smeProviderApiClient") - public com.oransc.rappmanager.sme.provider.ApiClient smeProviderApiClient(RestTemplate restTemplate) { - return new com.oransc.rappmanager.sme.provider.ApiClient(restTemplate); + public org.oransc.rappmanager.sme.provider.ApiClient smeProviderApiClient(RestTemplate restTemplate) { + return new org.oransc.rappmanager.sme.provider.ApiClient(restTemplate); } @Bean("smePublishServiceApiClient") - public com.oransc.rappmanager.sme.publishservice.ApiClient smePublishServiceApiClient(RestTemplate restTemplate) { - return new com.oransc.rappmanager.sme.publishservice.ApiClient(restTemplate); + public org.oransc.rappmanager.sme.publishservice.ApiClient smePublishServiceApiClient(RestTemplate restTemplate) { + return new org.oransc.rappmanager.sme.publishservice.ApiClient(restTemplate); } @Bean("smeInvokerApiClient") - public com.oransc.rappmanager.sme.invoker.ApiClient smeInvokerApiClient(RestTemplate restTemplate) { - return new com.oransc.rappmanager.sme.invoker.ApiClient(restTemplate); + public org.oransc.rappmanager.sme.invoker.ApiClient smeInvokerApiClient(RestTemplate restTemplate) { + return new org.oransc.rappmanager.sme.invoker.ApiClient(restTemplate); } @Bean @@ -93,39 +94,39 @@ public class BeanConfiguration { @Bean public DefaultApiClient defaultProviderApiClient( - @Qualifier("smeProviderApiClient") com.oransc.rappmanager.sme.provider.ApiClient apiClient) { + @Qualifier("smeProviderApiClient") org.oransc.rappmanager.sme.provider.ApiClient apiClient) { apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getProviderBasePath()); return new DefaultApiClient(apiClient); } @Bean - public com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient defaultPublishServiceApiClient( - @Qualifier("smePublishServiceApiClient") com.oransc.rappmanager.sme.publishservice.ApiClient apiClient) { + public org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient defaultPublishServiceApiClient( + @Qualifier("smePublishServiceApiClient") org.oransc.rappmanager.sme.publishservice.ApiClient apiClient) { apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath()); - return new com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient(apiClient); + return new org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient(apiClient); } @Bean - public com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient defaultInvokerApiClient( - @Qualifier("smeInvokerApiClient") com.oransc.rappmanager.sme.invoker.ApiClient apiClient) { + public org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient defaultInvokerApiClient( + @Qualifier("smeInvokerApiClient") org.oransc.rappmanager.sme.invoker.ApiClient apiClient) { apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getInvokerBasePath()); - return new com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient); + return new org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient); } @Bean - public com.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) { - com.oransc.rappmanager.dme.ApiClient apiClient = new com.oransc.rappmanager.dme.ApiClient(restTemplate); + public org.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) { + org.oransc.rappmanager.dme.ApiClient apiClient = new org.oransc.rappmanager.dme.ApiClient(restTemplate); return apiClient.setBasePath(dmeConfiguration.getBaseUrl()); } @Bean public DataProducerRegistrationApiClient dataProducerRegistrationApiClient( - com.oransc.rappmanager.dme.ApiClient apiClient) { + org.oransc.rappmanager.dme.ApiClient apiClient) { return new DataProducerRegistrationApiClient(apiClient); } @Bean - public DataConsumerApiClient dataConsumerApiClient(com.oransc.rappmanager.dme.ApiClient apiClient) { + public DataConsumerApiClient dataConsumerApiClient(org.oransc.rappmanager.dme.ApiClient apiClient) { return new DataConsumerApiClient(apiClient); } diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/RappManagerApplication.java b/rapp-manager-application/src/main/java/org/oransc/rappmanager/RappManagerApplication.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-application/src/main/java/com/oransc/rappmanager/RappManagerApplication.java rename to rapp-manager-application/src/main/java/org/oransc/rappmanager/RappManagerApplication.java index 31fbd28..077ac30 --- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/RappManagerApplication.java +++ b/rapp-manager-application/src/main/java/org/oransc/rappmanager/RappManagerApplication.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager; +package org.oransc.rappmanager; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/configuration/RappManagerConfiguration.java b/rapp-manager-application/src/main/java/org/oransc/rappmanager/configuration/RappManagerConfiguration.java old mode 100755 new mode 100644 similarity index 90% rename from rapp-manager-application/src/main/java/com/oransc/rappmanager/configuration/RappManagerConfiguration.java rename to rapp-manager-application/src/main/java/org/oransc/rappmanager/configuration/RappManagerConfiguration.java index 85d3498..839163d --- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/configuration/RappManagerConfiguration.java +++ b/rapp-manager-application/src/main/java/org/oransc/rappmanager/configuration/RappManagerConfiguration.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.configuration; +package org.oransc.rappmanager.configuration; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappController.java b/rapp-manager-application/src/main/java/org/oransc/rappmanager/rest/RappController.java old mode 100755 new mode 100644 similarity index 87% rename from rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappController.java rename to rapp-manager-application/src/main/java/org/oransc/rappmanager/rest/RappController.java index 9b448cd..9638d5f --- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappController.java +++ b/rapp-manager-application/src/main/java/org/oransc/rappmanager/rest/RappController.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2023-2024 Nordix Foundation. All rights reserved. + * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +17,8 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.rest; +package org.oransc.rappmanager.rest; -import com.oransc.rappmanager.configuration.RappManagerConfiguration; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.csar.validator.RappValidationHandler; -import com.oransc.rappmanager.models.exception.RappHandlerException; -import com.oransc.rappmanager.models.rapp.PrimeOrder; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappPrimeOrder; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.service.RappService; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -35,6 +26,16 @@ import java.nio.file.StandardCopyOption; import java.util.Collection; import java.util.Optional; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.configuration.RappManagerConfiguration; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.csar.validator.RappValidationHandler; +import org.oransc.rappmanager.models.exception.RappHandlerException; +import org.oransc.rappmanager.models.rapp.PrimeOrder; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappPrimeOrder; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.service.RappService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappInstanceController.java b/rapp-manager-application/src/main/java/org/oransc/rappmanager/rest/RappInstanceController.java old mode 100755 new mode 100644 similarity index 90% rename from rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappInstanceController.java rename to rapp-manager-application/src/main/java/org/oransc/rappmanager/rest/RappInstanceController.java index ee48f84..ee15d82 --- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/rest/RappInstanceController.java +++ b/rapp-manager-application/src/main/java/org/oransc/rappmanager/rest/RappInstanceController.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,21 +17,21 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.rest; +package org.oransc.rappmanager.rest; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.exception.RappHandlerException; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rappinstance.DeployOrder; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; -import com.oransc.rappmanager.service.RappService; import java.util.Map; import java.util.Optional; import java.util.UUID; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.tuple.Pair; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.exception.RappHandlerException; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rappinstance.DeployOrder; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; +import org.oransc.rappmanager.service.RappService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/DeploymentArtifactsService.java b/rapp-manager-application/src/main/java/org/oransc/rappmanager/service/DeploymentArtifactsService.java old mode 100755 new mode 100644 similarity index 90% rename from rapp-manager-application/src/main/java/com/oransc/rappmanager/service/DeploymentArtifactsService.java rename to rapp-manager-application/src/main/java/org/oransc/rappmanager/service/DeploymentArtifactsService.java index a037f02..6921c4d --- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/DeploymentArtifactsService.java +++ b/rapp-manager-application/src/main/java/org/oransc/rappmanager/service/DeploymentArtifactsService.java @@ -17,14 +17,14 @@ * */ -package com.oransc.rappmanager.service; +package org.oransc.rappmanager.service; -import com.oransc.rappmanager.models.csar.DeploymentItem; -import com.oransc.rappmanager.models.csar.DeploymentItemArtifactType; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.exception.RappHandlerException; -import com.oransc.rappmanager.models.rapp.Rapp; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.models.csar.DeploymentItem; +import org.oransc.rappmanager.models.csar.DeploymentItemArtifactType; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.exception.RappHandlerException; +import org.oransc.rappmanager.models.rapp.Rapp; import org.springframework.core.io.ByteArrayResource; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java b/rapp-manager-application/src/main/java/org/oransc/rappmanager/service/RappService.java old mode 100755 new mode 100644 similarity index 91% rename from rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java rename to rapp-manager-application/src/main/java/org/oransc/rappmanager/service/RappService.java index d704480..241c95d --- a/rapp-manager-application/src/main/java/com/oransc/rappmanager/service/RappService.java +++ b/rapp-manager-application/src/main/java/org/oransc/rappmanager/service/RappService.java @@ -17,22 +17,22 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.service; +package org.oransc.rappmanager.service; -import com.oransc.rappmanager.acm.service.AcmDeployer; -import com.oransc.rappmanager.models.RappDeployer; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.exception.RappHandlerException; -import com.oransc.rappmanager.models.exception.RappValidationException; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstanceState; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; import java.util.List; import java.util.UUID; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.acm.service.AcmDeployer; +import org.oransc.rappmanager.models.RappDeployer; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.exception.RappHandlerException; +import org.oransc.rappmanager.models.exception.RappValidationException; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappEvent; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstanceState; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java b/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappControllerTest.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java rename to rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappControllerTest.java index 1a5369b..15165b7 --- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappControllerTest.java +++ b/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappControllerTest.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.rest; +package org.oransc.rappmanager.rest; import static org.hamcrest.Matchers.hasSize; import static org.mockito.ArgumentMatchers.any; @@ -25,15 +25,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.acm.service.AcmDeployer; -import com.oransc.rappmanager.dme.service.DmeDeployer; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.csar.AsdMetadata; -import com.oransc.rappmanager.models.rapp.PrimeOrder; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappPrimeOrder; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.sme.service.SmeLifecycleManager; import java.io.File; import java.io.FileInputStream; import java.util.List; @@ -43,6 +34,15 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; +import org.oransc.rappmanager.acm.service.AcmDeployer; +import org.oransc.rappmanager.dme.service.DmeDeployer; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.csar.AsdMetadata; +import org.oransc.rappmanager.models.rapp.PrimeOrder; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappPrimeOrder; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.sme.service.SmeLifecycleManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java b/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappInstanceControllerTest.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java rename to rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappInstanceControllerTest.java index d237d2f..21b865b --- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/rest/RappInstanceControllerTest.java +++ b/rapp-manager-application/src/test/java/org/oransc/rappmanager/rest/RappInstanceControllerTest.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.rest; +package org.oransc.rappmanager.rest; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; @@ -25,22 +25,22 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.acm.service.AcmDeployer; -import com.oransc.rappmanager.dme.service.DmeDeployer; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.models.rappinstance.DeployOrder; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder; -import com.oransc.rappmanager.models.rappinstance.RappInstanceState; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; -import com.oransc.rappmanager.sme.service.SmeDeployer; -import com.oransc.rappmanager.sme.service.SmeLifecycleManager; import java.util.HashMap; import java.util.Map; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.oransc.rappmanager.acm.service.AcmDeployer; +import org.oransc.rappmanager.dme.service.DmeDeployer; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.models.rappinstance.DeployOrder; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstanceDeployOrder; +import org.oransc.rappmanager.models.rappinstance.RappInstanceState; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; +import org.oransc.rappmanager.sme.service.SmeDeployer; +import org.oransc.rappmanager.sme.service.SmeLifecycleManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; @@ -300,8 +300,7 @@ class RappInstanceControllerTest { Map instances = new HashMap(); instances.put(rappInstanceId, rappInstance); return Rapp.builder().rappId(rappId).name(String.valueOf(rappId)).packageName(validRappFile) - .packageLocation(validCsarFileLocation).state(RappState.PRIMED).rappInstances(instances) - .build(); + .packageLocation(validCsarFileLocation).state(RappState.PRIMED).rappInstances(instances).build(); } } diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java b/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-application/src/test/java/com/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java rename to rapp-manager-application/src/test/java/org/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java index b8364d9..854e205 --- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java +++ b/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/DeploymentArtifactsServiceTest.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.service; +package org.oransc.rappmanager.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -30,12 +30,6 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus; import static org.springframework.test.web.client.response.MockRestResponseCreators.withTooManyRequests; -import com.oransc.rappmanager.models.csar.DeploymentItem; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.exception.RappHandlerException; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.sme.service.SmeLifecycleManager; import java.io.IOException; import java.util.List; import java.util.UUID; @@ -43,6 +37,12 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; +import org.oransc.rappmanager.models.csar.DeploymentItem; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.exception.RappHandlerException; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.sme.service.SmeLifecycleManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; @@ -80,8 +80,7 @@ class DeploymentArtifactsServiceTest { @EnumSource(value = HttpStatus.class, names = {"CREATED", "CONFLICT"}) void testChartUpload(HttpStatus status) { Rapp rapp = Rapp.builder().rappId(UUID.randomUUID()).name("").packageName(validRappFile) - .packageLocation(validCsarFileLocation) - .state(RappState.COMMISSIONED).build(); + .packageLocation(validCsarFileLocation).state(RappState.COMMISSIONED).build(); rapp.setAsdMetadata(rappCsarConfigurationHandler.getAsdMetadata(rapp)); List deploymentItems = rapp.getAsdMetadata().getDeploymentItems(); deploymentItems.forEach(deploymentItem -> mockServer.expect(ExpectedCount.once(), diff --git a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java b/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/RappServiceTest.java old mode 100755 new mode 100644 similarity index 96% rename from rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java rename to rapp-manager-application/src/test/java/org/oransc/rappmanager/service/RappServiceTest.java index 672bda9..7ba82d1 --- a/rapp-manager-application/src/test/java/com/oransc/rappmanager/service/RappServiceTest.java +++ b/rapp-manager-application/src/test/java/org/oransc/rappmanager/service/RappServiceTest.java @@ -17,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.service; +package org.oransc.rappmanager.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -25,21 +25,21 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.when; -import com.oransc.rappmanager.acm.service.AcmDeployer; -import com.oransc.rappmanager.dme.service.DmeDeployer; -import com.oransc.rappmanager.models.exception.RappHandlerException; -import com.oransc.rappmanager.models.exception.RappValidationException; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstanceState; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; -import com.oransc.rappmanager.sme.service.SmeDeployer; -import com.oransc.rappmanager.sme.service.SmeLifecycleManager; import java.util.HashMap; import java.util.Map; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.oransc.rappmanager.acm.service.AcmDeployer; +import org.oransc.rappmanager.dme.service.DmeDeployer; +import org.oransc.rappmanager.models.exception.RappHandlerException; +import org.oransc.rappmanager.models.exception.RappValidationException; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstanceState; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; +import org.oransc.rappmanager.sme.service.SmeDeployer; +import org.oransc.rappmanager.sme.service.SmeLifecycleManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; diff --git a/rapp-manager-dme/pom.xml b/rapp-manager-dme/pom.xml index 49c5546..eb17432 100755 --- a/rapp-manager-dme/pom.xml +++ b/rapp-manager-dme/pom.xml @@ -4,6 +4,7 @@ * O-RAN-SC * %% * Copyright (C) 2023 Nordix Foundation +* Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,9 +92,9 @@ src/main/java true - com.oransc.rappmanager.dme - com.oransc.rappmanager.dme.rest - com.oransc.rappmanager.dme.data + org.oransc.rappmanager.dme + org.oransc.rappmanager.dme.rest + org.oransc.rappmanager.dme.data false diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/configuration/DmeConfiguration.java b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/configuration/DmeConfiguration.java old mode 100755 new mode 100644 similarity index 90% rename from rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/configuration/DmeConfiguration.java rename to rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/configuration/DmeConfiguration.java index e7cc151..3c05544 --- a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/configuration/DmeConfiguration.java +++ b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/configuration/DmeConfiguration.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.configuration; +package org.oransc.rappmanager.dme.configuration; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -26,5 +27,6 @@ import org.springframework.context.annotation.Configuration; @ConfigurationProperties(prefix = "rappmanager.dme") @Data public class DmeConfiguration { + String baseUrl; } diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/DataConsumerEntity.java b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/DataConsumerEntity.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/DataConsumerEntity.java rename to rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/DataConsumerEntity.java index b67ec7b..2127b77 --- a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/DataConsumerEntity.java +++ b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/DataConsumerEntity.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.models; +package org.oransc.rappmanager.dme.models; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.validation.constraints.NotNull; diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/DataProducerEntity.java b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/DataProducerEntity.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/DataProducerEntity.java rename to rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/DataProducerEntity.java index 515a126..137b08a --- a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/DataProducerEntity.java +++ b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/DataProducerEntity.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.models; +package org.oransc.rappmanager.dme.models; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.validation.constraints.NotNull; diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/InfoTypeEntity.java b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/InfoTypeEntity.java old mode 100755 new mode 100644 similarity index 91% rename from rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/InfoTypeEntity.java rename to rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/InfoTypeEntity.java index a71efe4..e7635bd --- a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/models/InfoTypeEntity.java +++ b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/models/InfoTypeEntity.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.models; +package org.oransc.rappmanager.dme.models; import com.fasterxml.jackson.annotation.JsonIgnore; import jakarta.validation.constraints.NotNull; diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeAcmInterceptor.java b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/service/DmeAcmInterceptor.java old mode 100755 new mode 100644 similarity index 96% rename from rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeAcmInterceptor.java rename to rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/service/DmeAcmInterceptor.java index cd8a4f7..b13f175 --- a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeAcmInterceptor.java +++ b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/service/DmeAcmInterceptor.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +17,9 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.service; +package org.oransc.rappmanager.dme.service; import com.google.gson.JsonParser; -import com.oransc.rappmanager.dme.models.DataConsumerEntity; -import com.oransc.rappmanager.dme.models.DataProducerEntity; -import com.oransc.rappmanager.dme.models.InfoTypeEntity; -import com.oransc.rappmanager.models.AcmInterceptor; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rappinstance.RappInstance; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -40,6 +34,13 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType; import org.onap.policy.models.tosca.authorative.concepts.ToscaProperty; import org.onap.policy.models.tosca.authorative.concepts.ToscaSchemaDefinition; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; +import org.oransc.rappmanager.dme.models.DataConsumerEntity; +import org.oransc.rappmanager.dme.models.DataProducerEntity; +import org.oransc.rappmanager.dme.models.InfoTypeEntity; +import org.oransc.rappmanager.models.AcmInterceptor; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rappinstance.RappInstance; import org.springframework.stereotype.Service; @Service diff --git a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/service/DmeDeployer.java old mode 100755 new mode 100644 similarity index 91% rename from rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java rename to rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/service/DmeDeployer.java index 901b0e2..605b3ce --- a/rapp-manager-dme/src/main/java/com/oransc/rappmanager/dme/service/DmeDeployer.java +++ b/rapp-manager-dme/src/main/java/org/oransc/rappmanager/dme/service/DmeDeployer.java @@ -17,19 +17,19 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.service; +package org.oransc.rappmanager.dme.service; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.dme.data.ConsumerJob; -import com.oransc.rappmanager.dme.data.ProducerRegistrationInfo; -import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient; -import com.oransc.rappmanager.models.RappDeployer; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rappinstance.RappInstance; import java.util.HashSet; import java.util.Set; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.dme.data.ConsumerJob; +import org.oransc.rappmanager.dme.data.ProducerRegistrationInfo; +import org.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient; +import org.oransc.rappmanager.models.RappDeployer; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rappinstance.RappInstance; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/BeanTestConfiguration.java b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/BeanTestConfiguration.java old mode 100755 new mode 100644 similarity index 82% rename from rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/BeanTestConfiguration.java rename to rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/BeanTestConfiguration.java index d22e939..400b33c --- a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/BeanTestConfiguration.java +++ b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/BeanTestConfiguration.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,14 +17,14 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.service; +package org.oransc.rappmanager.dme.service; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.dme.configuration.DmeConfiguration; -import com.oransc.rappmanager.dme.rest.DataConsumerApiClient; -import com.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.dme.configuration.DmeConfiguration; +import org.oransc.rappmanager.dme.rest.DataConsumerApiClient; +import org.oransc.rappmanager.dme.rest.DataProducerRegistrationApiClient; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.cache.CacheManager; @@ -60,19 +61,19 @@ public class BeanTestConfiguration { } @Bean - public com.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) { - com.oransc.rappmanager.dme.ApiClient apiClient = new com.oransc.rappmanager.dme.ApiClient(restTemplate); + public org.oransc.rappmanager.dme.ApiClient dmeApiClient(RestTemplate restTemplate) { + org.oransc.rappmanager.dme.ApiClient apiClient = new org.oransc.rappmanager.dme.ApiClient(restTemplate); return apiClient.setBasePath(dmeConfiguration.getBaseUrl()); } @Bean public DataProducerRegistrationApiClient dataProducerRegistrationApiClient( - com.oransc.rappmanager.dme.ApiClient apiClient) { + org.oransc.rappmanager.dme.ApiClient apiClient) { return new DataProducerRegistrationApiClient(apiClient); } @Bean - public DataConsumerApiClient dataConsumerApiClient(com.oransc.rappmanager.dme.ApiClient apiClient) { + public DataConsumerApiClient dataConsumerApiClient(org.oransc.rappmanager.dme.ApiClient apiClient) { return new DataConsumerApiClient(apiClient); } } diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeAcmInterceptorTest.java b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeAcmInterceptorTest.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeAcmInterceptorTest.java rename to rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeAcmInterceptorTest.java index eaee4b7..17cd63e --- a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeAcmInterceptorTest.java +++ b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeAcmInterceptorTest.java @@ -16,19 +16,13 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.service; +package org.oransc.rappmanager.dme.service; import static org.junit.jupiter.api.Assertions.assertEquals; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.JsonArray; import com.google.gson.JsonParser; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappDmeResourceBuilder; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.models.rappinstance.RappInstance; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -46,6 +40,12 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappDmeResourceBuilder; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.models.rappinstance.RappInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeDeployerTest.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java rename to rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeDeployerTest.java index ab0c5f5..dac4345 --- a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/dme/service/DmeDeployerTest.java +++ b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/dme/service/DmeDeployerTest.java @@ -17,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.dme.service; +package org.oransc.rappmanager.dme.service; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -29,17 +29,6 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.dme.configuration.DmeConfiguration; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappDmeResourceBuilder; -import com.oransc.rappmanager.models.rapp.RappResources; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -54,6 +43,17 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; +import org.oransc.rappmanager.dme.configuration.DmeConfiguration; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappDmeResourceBuilder; +import org.oransc.rappmanager.models.rapp.RappResources; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; diff --git a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java old mode 100755 new mode 100644 similarity index 89% rename from rapp-manager-dme/src/test/java/com/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java rename to rapp-manager-dme/src/test/java/org/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java index e20be29..874d4a3 --- a/rapp-manager-dme/src/test/java/com/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java +++ b/rapp-manager-dme/src/test/java/org/oransc/rappmanager/models/rapp/RappDmeResourceBuilder.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +17,11 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rapp; +package org.oransc.rappmanager.models.rapp; -import com.oransc.rappmanager.models.rappinstance.RappDMEInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstance; import java.util.Set; +import org.oransc.rappmanager.models.rappinstance.RappDMEInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstance; public class RappDmeResourceBuilder { diff --git a/rapp-manager-models/pom.xml b/rapp-manager-models/pom.xml index 3024064..7275e88 100755 --- a/rapp-manager-models/pom.xml +++ b/rapp-manager-models/pom.xml @@ -4,7 +4,7 @@ * O-RAN-SC * %% * Copyright (C) 2023 Nordix Foundation -* Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. +* Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/AcmInterceptor.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/AcmInterceptor.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/AcmInterceptor.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/AcmInterceptor.java index b205ef2..7e329d1 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/AcmInterceptor.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/AcmInterceptor.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models; +package org.oransc.rappmanager.models; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonParser; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rappinstance.RappInstance; import java.util.Map; import java.util.UUID; import org.onap.policy.clamp.models.acm.concepts.AutomationComposition; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/RappDeployer.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/RappDeployer.java old mode 100755 new mode 100644 similarity index 83% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/RappDeployer.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/RappDeployer.java index 9aa3fca..f17090d --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/RappDeployer.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/RappDeployer.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 Nordix Foundation. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +16,10 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models; +package org.oransc.rappmanager.models; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rappinstance.RappInstance; public interface RappDeployer { diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/cache/RappCacheService.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/cache/RappCacheService.java index cdc42c6..b593039 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/cache/RappCacheService.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/cache/RappCacheService.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,9 +17,9 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.cache; +package org.oransc.rappmanager.models.cache; -import com.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.Rapp; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/configuration/RappsEnvironmentConfiguration.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/configuration/RappsEnvironmentConfiguration.java similarity index 95% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/configuration/RappsEnvironmentConfiguration.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/configuration/RappsEnvironmentConfiguration.java index 941556e..4dadb6e 100644 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/configuration/RappsEnvironmentConfiguration.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/configuration/RappsEnvironmentConfiguration.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.configuration; +package org.oransc.rappmanager.models.configuration; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/AsdMetadata.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/AsdMetadata.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/AsdMetadata.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/AsdMetadata.java index bc97d1e..fbab8d5 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/AsdMetadata.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/AsdMetadata.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== * */ -package com.oransc.rappmanager.models.csar; +package org.oransc.rappmanager.models.csar; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItem.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItem.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItem.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItem.java index 6e4a121..e8ecb36 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItem.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItem.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.csar; +package org.oransc.rappmanager.models.csar; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItemArtifactType.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItemArtifactType.java old mode 100755 new mode 100644 similarity index 96% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItemArtifactType.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItemArtifactType.java index 46f007d..62e51a5 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItemArtifactType.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItemArtifactType.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar; +package org.oransc.rappmanager.models.csar; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItemTargetServer.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItemTargetServer.java old mode 100755 new mode 100644 similarity index 96% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItemTargetServer.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItemTargetServer.java index 2bc91e9..7815ccc --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/DeploymentItemTargetServer.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/DeploymentItemTargetServer.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar; +package org.oransc.rappmanager.models.csar; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java index cb071b9..c0fd2d5 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java @@ -17,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.csar; +package org.oransc.rappmanager.models.csar; import static com.google.common.base.Splitter.on; import static com.google.common.collect.Iterables.filter; @@ -26,11 +26,11 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappResources; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappSMEInstance; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappResources; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappSMEInstance; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarPathProvider.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/RappCsarPathProvider.java old mode 100755 new mode 100644 similarity index 98% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarPathProvider.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/RappCsarPathProvider.java index 57a650c..8265ef5 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarPathProvider.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/RappCsarPathProvider.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar; +package org.oransc.rappmanager.models.csar; import lombok.experimental.UtilityClass; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidator.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidator.java old mode 100755 new mode 100644 similarity index 91% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidator.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidator.java index 082a156..c7d5482 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidator.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidator.java @@ -17,12 +17,12 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import com.fasterxml.jackson.databind.JsonNode; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.csar.RappCsarPathProvider; -import com.oransc.rappmanager.models.exception.RappValidationException; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.csar.RappCsarPathProvider; +import org.oransc.rappmanager.models.exception.RappValidationException; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/AsdDescriptorValidator.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidator.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/AsdDescriptorValidator.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidator.java index 643714e..16936dc --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/AsdDescriptorValidator.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidator.java @@ -17,13 +17,13 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import com.fasterxml.jackson.databind.JsonNode; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.csar.RappCsarPathProvider; -import com.oransc.rappmanager.models.exception.RappValidationException; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.csar.RappCsarPathProvider; +import org.oransc.rappmanager.models.exception.RappValidationException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/FileExistenceValidator.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidator.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/FileExistenceValidator.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidator.java index 3ed6124..a32e993 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/FileExistenceValidator.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidator.java @@ -16,9 +16,9 @@ * ============LICENSE_END======================================================================== * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; -import com.oransc.rappmanager.models.csar.RappCsarPathProvider; +import org.oransc.rappmanager.models.csar.RappCsarPathProvider; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/NamingValidator.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/NamingValidator.java old mode 100755 new mode 100644 similarity index 93% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/NamingValidator.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/NamingValidator.java index 00348af..3773f0a --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/NamingValidator.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/NamingValidator.java @@ -17,9 +17,9 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; -import com.oransc.rappmanager.models.exception.RappValidationException; +import org.oransc.rappmanager.models.exception.RappValidationException; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; import org.springframework.web.multipart.MultipartFile; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandler.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandler.java old mode 100755 new mode 100644 similarity index 96% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandler.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandler.java index 8df2154..f44ed92 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandler.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandler.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import java.util.Comparator; import java.util.List; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidationUtils.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtils.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidationUtils.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtils.java index 29be2d3..ebf6d1b --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidationUtils.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtils.java @@ -17,11 +17,11 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.csar.RappCsarPathProvider; -import com.oransc.rappmanager.models.exception.RappValidationException; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.csar.RappCsarPathProvider; +import org.oransc.rappmanager.models.exception.RappValidationException; import java.io.ByteArrayOutputStream; import java.io.IOException; import lombok.RequiredArgsConstructor; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidator.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidator.java old mode 100755 new mode 100644 similarity index 95% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidator.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidator.java index a1f3930..727f2e9 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/validator/RappValidator.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/csar/validator/RappValidator.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import org.springframework.validation.Validator; import org.springframework.web.multipart.MultipartFile; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/ErrorResponse.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/ErrorResponse.java old mode 100755 new mode 100644 similarity index 88% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/ErrorResponse.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/ErrorResponse.java index da3cce9..c19bba4 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/ErrorResponse.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/ErrorResponse.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START====================================================================== - * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.exception; +package org.oransc.rappmanager.models.exception; import lombok.Value; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/ExceptionControllerHandler.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/ExceptionControllerHandler.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/ExceptionControllerHandler.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/ExceptionControllerHandler.java index ae26a5e..a4ebb64 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/ExceptionControllerHandler.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/ExceptionControllerHandler.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.exception; +package org.oransc.rappmanager.models.exception; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/RappHandlerException.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/RappHandlerException.java old mode 100755 new mode 100644 similarity index 96% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/RappHandlerException.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/RappHandlerException.java index 48b5067..ac0ce4a --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/RappHandlerException.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/RappHandlerException.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.exception; +package org.oransc.rappmanager.models.exception; import lombok.Getter; import org.springframework.http.HttpStatusCode; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/RappValidationException.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/RappValidationException.java old mode 100755 new mode 100644 similarity index 96% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/RappValidationException.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/RappValidationException.java index f8c291c..a92be91 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/exception/RappValidationException.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/exception/RappValidationException.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.exception; +package org.oransc.rappmanager.models.exception; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/PrimeOrder.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/PrimeOrder.java old mode 100755 new mode 100644 similarity index 88% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/PrimeOrder.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/PrimeOrder.java index 9ad0d36..6369318 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/PrimeOrder.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/PrimeOrder.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rapp; +package org.oransc.rappmanager.models.rapp; public enum PrimeOrder { PRIME, DEPRIME; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/Rapp.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/Rapp.java old mode 100755 new mode 100644 similarity index 93% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/Rapp.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/Rapp.java index 6619061..8f04428 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/Rapp.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/Rapp.java @@ -17,11 +17,9 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rapp; +package org.oransc.rappmanager.models.rapp; -import com.oransc.rappmanager.models.csar.AsdMetadata; -import com.oransc.rappmanager.models.rappinstance.RappInstance; import java.beans.Transient; import java.util.HashMap; import java.util.Map; @@ -29,6 +27,8 @@ import java.util.UUID; import java.util.stream.Stream; import lombok.Builder; import lombok.Data; +import org.oransc.rappmanager.models.csar.AsdMetadata; +import org.oransc.rappmanager.models.rappinstance.RappInstance; @Data @Builder(toBuilder = true) diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappEvent.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappEvent.java old mode 100755 new mode 100644 similarity index 90% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappEvent.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappEvent.java index 7cb00be..ac0a712 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappEvent.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappEvent.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rapp; +package org.oransc.rappmanager.models.rapp; public enum RappEvent { DEPLOYING, diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappPrimeOrder.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappPrimeOrder.java old mode 100755 new mode 100644 similarity index 89% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappPrimeOrder.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappPrimeOrder.java index b0b3592..17a18d8 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappPrimeOrder.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappPrimeOrder.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rapp; +package org.oransc.rappmanager.models.rapp; import lombok.Data; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappResources.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappResources.java old mode 100755 new mode 100644 similarity index 93% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappResources.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappResources.java index 826fd25..6bf3c25 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappResources.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappResources.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rapp; +package org.oransc.rappmanager.models.rapp; import java.util.Set; import lombok.Builder; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappState.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappState.java old mode 100755 new mode 100644 similarity index 89% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappState.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappState.java index c7b54a0..6b5ef96 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rapp/RappState.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rapp/RappState.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rapp; +package org.oransc.rappmanager.models.rapp; public enum RappState { COMMISSIONED, PRIMING, PRIMED, DEPRIMING, diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/DeployOrder.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/DeployOrder.java old mode 100755 new mode 100644 similarity index 88% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/DeployOrder.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/DeployOrder.java index 5e838a1..fd7553d --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/DeployOrder.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/DeployOrder.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rappinstance; +package org.oransc.rappmanager.models.rappinstance; public enum DeployOrder { DEPLOY, UNDEPLOY; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappACMInstance.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappACMInstance.java old mode 100755 new mode 100644 similarity index 89% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappACMInstance.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappACMInstance.java index e50bb86..08cf068 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappACMInstance.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappACMInstance.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rappinstance; +package org.oransc.rappmanager.models.rappinstance; import java.util.UUID; import lombok.Data; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappDMEInstance.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappDMEInstance.java old mode 100755 new mode 100644 similarity index 89% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappDMEInstance.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappDMEInstance.java index bd1d19d..b10543b --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappDMEInstance.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappDMEInstance.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rappinstance; +package org.oransc.rappmanager.models.rappinstance; import java.util.Set; import lombok.Data; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstance.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstance.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstance.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstance.java index aec6ee2..8d14e11 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstance.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstance.java @@ -17,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rappinstance; +package org.oransc.rappmanager.models.rappinstance; import java.util.UUID; import java.util.stream.Stream; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstanceDeployOrder.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstanceDeployOrder.java old mode 100755 new mode 100644 similarity index 88% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstanceDeployOrder.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstanceDeployOrder.java index 1dc9754..7f8808c --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstanceDeployOrder.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstanceDeployOrder.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rappinstance; +package org.oransc.rappmanager.models.rappinstance; import lombok.Data; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstanceState.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstanceState.java old mode 100755 new mode 100644 similarity index 88% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstanceState.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstanceState.java index cb5e6b1..3f6afca --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappInstanceState.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappInstanceState.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rappinstance; +package org.oransc.rappmanager.models.rappinstance; public enum RappInstanceState { DEPLOYED, DEPLOYING, UNDEPLOYED, UNDEPLOYING; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappSMEInstance.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappSMEInstance.java old mode 100755 new mode 100644 similarity index 90% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappSMEInstance.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappSMEInstance.java index 1ec24b3..7d76045 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/rappinstance/RappSMEInstance.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/rappinstance/RappSMEInstance.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.rappinstance; +package org.oransc.rappmanager.models.rappinstance; import java.util.List; import lombok.Data; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachine.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachine.java old mode 100755 new mode 100644 similarity index 93% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachine.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachine.java index b776df7..5bc2df1 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachine.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachine.java @@ -17,11 +17,11 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.statemachine; +package org.oransc.rappmanager.models.statemachine; -import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstanceState; +import org.oransc.rappmanager.models.rapp.RappEvent; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstanceState; import java.util.HashMap; import java.util.Map; import java.util.UUID; diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java rename to rapp-manager-models/src/main/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java index d9dbd3a..d7b6609 --- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java +++ b/rapp-manager-models/src/main/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfig.java @@ -17,10 +17,10 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.statemachine; +package org.oransc.rappmanager.models.statemachine; -import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rappinstance.RappInstanceState; +import org.oransc.rappmanager.models.rapp.RappEvent; +import org.oransc.rappmanager.models.rappinstance.RappInstanceState; import java.util.EnumSet; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/AcmInterceptorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/AcmInterceptorTest.java old mode 100755 new mode 100644 similarity index 95% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/AcmInterceptorTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/AcmInterceptorTest.java index 0deadfa..82501fb --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/AcmInterceptorTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/AcmInterceptorTest.java @@ -1,6 +1,6 @@ /*- * ============LICENSE_START====================================================================== - * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,13 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models; +package org.oransc.rappmanager.models; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import com.google.gson.JsonArray; import com.google.gson.JsonParser; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rappinstance.RappInstance; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -36,6 +34,8 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaNodeType; import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate; import org.onap.policy.models.tosca.authorative.concepts.ToscaTopologyTemplate; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rappinstance.RappInstance; class AcmInterceptorTest implements AcmInterceptor { diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/BeanTestConfiguration.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/BeanTestConfiguration.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/BeanTestConfiguration.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/BeanTestConfiguration.java index 8089502..6203e3c --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/BeanTestConfiguration.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/BeanTestConfiguration.java @@ -16,7 +16,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models; +package org.oransc.rappmanager.models; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.cache.CacheManager; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/RappServiceEnablerTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/RappServiceEnablerTest.java old mode 100755 new mode 100644 similarity index 93% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/RappServiceEnablerTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/RappServiceEnablerTest.java index 4c0a63c..0155e5d --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/RappServiceEnablerTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/RappServiceEnablerTest.java @@ -16,22 +16,22 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models; +package org.oransc.rappmanager.models; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappResources; -import com.oransc.rappmanager.models.rappinstance.RappACMInstance; -import com.oransc.rappmanager.models.rappinstance.RappDMEInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappSMEInstance; import java.util.Set; import org.junit.jupiter.api.Test; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappResources; +import org.oransc.rappmanager.models.rappinstance.RappACMInstance; +import org.oransc.rappmanager.models.rappinstance.RappDMEInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappSMEInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ContextConfiguration; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/RappCacheServiceTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/cache/RappCacheServiceTest.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/RappCacheServiceTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/cache/RappCacheServiceTest.java index a89f344..669818e --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/cache/RappCacheServiceTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/cache/RappCacheServiceTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START====================================================================== - * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,16 +16,16 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.cache; +package org.oransc.rappmanager.models.cache; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import com.oransc.rappmanager.models.BeanTestConfiguration; -import com.oransc.rappmanager.models.rapp.Rapp; import java.util.UUID; import org.junit.jupiter.api.Test; +import org.oransc.rappmanager.models.BeanTestConfiguration; +import org.oransc.rappmanager.models.rapp.Rapp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java old mode 100755 new mode 100644 similarity index 97% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java index 7565859..d9ee602 --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java @@ -17,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.csar; +package org.oransc.rappmanager.models.csar; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -32,13 +32,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.JsonSyntaxException; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappResources; -import com.oransc.rappmanager.models.rappinstance.RappACMInstance; -import com.oransc.rappmanager.models.rappinstance.RappDMEInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappSMEInstance; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -51,6 +44,13 @@ import org.json.JSONObject; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappResources; +import org.oransc.rappmanager.models.rappinstance.RappACMInstance; +import org.oransc.rappmanager.models.rappinstance.RappDMEInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappSMEInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.context.SpringBootTest; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java old mode 100755 new mode 100644 similarity index 95% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java index c220c54..8c02988 --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/ArtifactDefinitionValidatorTest.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -27,9 +27,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doCallRealMethod; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.exception.RappValidationException; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -39,6 +36,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.NullSource; import org.junit.jupiter.params.provider.ValueSource; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.exception.RappValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.SpyBean; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java index eb60567..e01138c --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/AsdDescriptorValidatorTest.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -27,13 +27,6 @@ import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doReturn; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.models.BeanTestConfiguration; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.AsdMetadata; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.exception.RappValidationException; -import com.oransc.rappmanager.models.rapp.Rapp; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; @@ -44,6 +37,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.NullSource; import org.junit.jupiter.params.provider.ValueSource; +import org.oransc.rappmanager.models.BeanTestConfiguration; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.AsdMetadata; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.exception.RappValidationException; +import org.oransc.rappmanager.models.rapp.Rapp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.SpyBean; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java index 22ca62c..15d9a4e --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/FileExistenceValidatorTest.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -25,14 +25,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.exception.RappValidationException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import org.apache.http.entity.ContentType; import org.junit.jupiter.api.Test; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.exception.RappValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java old mode 100755 new mode 100644 similarity index 96% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java index e059cf3..b1fd091 --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/NamingValidatorTest.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -25,12 +25,12 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.oransc.rappmanager.models.exception.RappValidationException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import org.apache.http.entity.ContentType; import org.junit.jupiter.api.Test; +import org.oransc.rappmanager.models.exception.RappValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java index 9487739..cd4486f --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java @@ -17,18 +17,13 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.mock; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.models.BeanTestConfiguration; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.exception.RappValidationException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -38,6 +33,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.oransc.rappmanager.models.BeanTestConfiguration; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.exception.RappValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java old mode 100755 new mode 100644 similarity index 94% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java index 5245d54..13bcb2f --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/csar/validator/RappValidationUtilsTest.java @@ -17,7 +17,7 @@ * */ -package com.oransc.rappmanager.models.csar.validator; +package org.oransc.rappmanager.models.csar.validator; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -27,15 +27,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.csar.RappCsarPathProvider; -import com.oransc.rappmanager.models.exception.RappValidationException; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import org.apache.http.entity.ContentType; import org.junit.jupiter.api.Test; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.csar.RappCsarPathProvider; +import org.oransc.rappmanager.models.exception.RappValidationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpStatus; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java old mode 100755 new mode 100644 similarity index 99% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java index 1c7b97e..24f08ec --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineConfigTest.java @@ -17,10 +17,8 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.statemachine; +package org.oransc.rappmanager.models.statemachine; -import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rappinstance.RappInstanceState; import java.util.UUID; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -28,6 +26,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; +import org.oransc.rappmanager.models.rapp.RappEvent; +import org.oransc.rappmanager.models.rappinstance.RappInstanceState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.statemachine.StateMachine; diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineTest.java b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineTest.java old mode 100755 new mode 100644 similarity index 91% rename from rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineTest.java rename to rapp-manager-models/src/test/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineTest.java index f86db34..7b06eff --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/statemachine/RappInstanceStateMachineTest.java +++ b/rapp-manager-models/src/test/java/org/oransc/rappmanager/models/statemachine/RappInstanceStateMachineTest.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START====================================================================== - * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,18 +16,18 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.models.statemachine; +package org.oransc.rappmanager.models.statemachine; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappInstanceState; import java.util.UUID; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.oransc.rappmanager.models.rapp.RappEvent; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappInstanceState; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; diff --git a/rapp-manager-sme/pom.xml b/rapp-manager-sme/pom.xml index 14c37a7..5526ffb 100755 --- a/rapp-manager-sme/pom.xml +++ b/rapp-manager-sme/pom.xml @@ -167,9 +167,9 @@ src/main/java true - com.oransc.rappmanager.sme.provider - com.oransc.rappmanager.sme.provider.rest - com.oransc.rappmanager.sme.provider.data + org.oransc.rappmanager.sme.provider + org.oransc.rappmanager.sme.provider.rest + org.oransc.rappmanager.sme.provider.data false @@ -196,9 +196,9 @@ src/main/java true - com.oransc.rappmanager.sme.publishservice - com.oransc.rappmanager.sme.publishservice.rest - com.oransc.rappmanager.sme.publishservice.data + org.oransc.rappmanager.sme.publishservice + org.oransc.rappmanager.sme.publishservice.rest + org.oransc.rappmanager.sme.publishservice.data false @@ -225,9 +225,9 @@ src/main/java true - com.oransc.rappmanager.sme.invoker - com.oransc.rappmanager.sme.invoker.rest - com.oransc.rappmanager.sme.invoker.data + org.oransc.rappmanager.sme.invoker + org.oransc.rappmanager.sme.invoker.rest + org.oransc.rappmanager.sme.invoker.data false diff --git a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/configuration/SmeConfiguration.java b/rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/configuration/SmeConfiguration.java old mode 100755 new mode 100644 similarity index 91% rename from rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/configuration/SmeConfiguration.java rename to rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/configuration/SmeConfiguration.java index 2a1f0ce..2198adf --- a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/configuration/SmeConfiguration.java +++ b/rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/configuration/SmeConfiguration.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.sme.configuration; +package org.oransc.rappmanager.sme.configuration; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java b/rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/service/SmeDeployer.java old mode 100755 new mode 100644 similarity index 92% rename from rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java rename to rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/service/SmeDeployer.java index 8989e82..e7fa608 --- a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeDeployer.java +++ b/rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/service/SmeDeployer.java @@ -17,25 +17,25 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.sme.service; +package org.oransc.rappmanager.sme.service; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.models.RappDeployer; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappEvent; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; -import com.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails; -import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; -import com.oransc.rappmanager.sme.provider.data.APIProviderFunctionDetails; -import com.oransc.rappmanager.sme.provider.data.ApiProviderFuncRole; -import com.oransc.rappmanager.sme.provider.data.RegistrationInformation; -import com.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription; import java.util.List; import java.util.Optional; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.models.RappDeployer; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappEvent; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; +import org.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails; +import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; +import org.oransc.rappmanager.sme.provider.data.APIProviderFunctionDetails; +import org.oransc.rappmanager.sme.provider.data.ApiProviderFuncRole; +import org.oransc.rappmanager.sme.provider.data.RegistrationInformation; +import org.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -46,12 +46,12 @@ public class SmeDeployer implements RappDeployer { Logger logger = LoggerFactory.getLogger(SmeDeployer.class); - private final com.oransc.rappmanager.sme.provider.rest.DefaultApiClient providerDefaultApiClient; + private final org.oransc.rappmanager.sme.provider.rest.DefaultApiClient providerDefaultApiClient; - private final com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient publishServiceDefaultApiClient; + private final org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient publishServiceDefaultApiClient; - private final com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient invokerDefaultApiClient; + private final org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient invokerDefaultApiClient; private final RappCsarConfigurationHandler rappCsarConfigurationHandler; diff --git a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeLifecycleManager.java b/rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/service/SmeLifecycleManager.java old mode 100755 new mode 100644 similarity index 91% rename from rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeLifecycleManager.java rename to rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/service/SmeLifecycleManager.java index e4511a8..e89b2d4 --- a/rapp-manager-sme/src/main/java/com/oransc/rappmanager/sme/service/SmeLifecycleManager.java +++ b/rapp-manager-sme/src/main/java/org/oransc/rappmanager/sme/service/SmeLifecycleManager.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,10 +17,10 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.sme.service; +package org.oransc.rappmanager.sme.service; -import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.SmartLifecycle; diff --git a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/BeanTestConfiguration.java b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/BeanTestConfiguration.java old mode 100755 new mode 100644 similarity index 75% rename from rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/BeanTestConfiguration.java rename to rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/BeanTestConfiguration.java index 90d1821..d68d97f --- a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/BeanTestConfiguration.java +++ b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/BeanTestConfiguration.java @@ -1,6 +1,6 @@ /* * ============LICENSE_START====================================================================== - * Copyright (C) 2023 OpenInfra Foundation Europe. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,13 +16,13 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.sme.service; +package org.oransc.rappmanager.sme.service; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.sme.configuration.SmeConfiguration; -import com.oransc.rappmanager.sme.provider.rest.DefaultApiClient; import lombok.RequiredArgsConstructor; +import org.oransc.rappmanager.sme.configuration.SmeConfiguration; +import org.oransc.rappmanager.sme.provider.rest.DefaultApiClient; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.web.client.RestTemplateBuilder; @@ -60,38 +60,38 @@ public class BeanTestConfiguration { } @Bean("smeProviderApiClient") - public com.oransc.rappmanager.sme.provider.ApiClient smeProviderApiClient(RestTemplate restTemplate) { - return new com.oransc.rappmanager.sme.provider.ApiClient(restTemplate); + public org.oransc.rappmanager.sme.provider.ApiClient smeProviderApiClient(RestTemplate restTemplate) { + return new org.oransc.rappmanager.sme.provider.ApiClient(restTemplate); } @Bean("smePublishServiceApiClient") - public com.oransc.rappmanager.sme.publishservice.ApiClient smePublishServiceApiClient(RestTemplate restTemplate) { - return new com.oransc.rappmanager.sme.publishservice.ApiClient(restTemplate); + public org.oransc.rappmanager.sme.publishservice.ApiClient smePublishServiceApiClient(RestTemplate restTemplate) { + return new org.oransc.rappmanager.sme.publishservice.ApiClient(restTemplate); } @Bean("smeInvokerApiClient") - public com.oransc.rappmanager.sme.invoker.ApiClient smeInvokerApiClient(RestTemplate restTemplate) { - return new com.oransc.rappmanager.sme.invoker.ApiClient(restTemplate); + public org.oransc.rappmanager.sme.invoker.ApiClient smeInvokerApiClient(RestTemplate restTemplate) { + return new org.oransc.rappmanager.sme.invoker.ApiClient(restTemplate); } @Bean public DefaultApiClient defaultProviderApiClient( - @Qualifier("smeProviderApiClient") com.oransc.rappmanager.sme.provider.ApiClient apiClient) { + @Qualifier("smeProviderApiClient") org.oransc.rappmanager.sme.provider.ApiClient apiClient) { apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getProviderBasePath()); return new DefaultApiClient(apiClient); } @Bean - public com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient defaultPublishServiceApiClient( - @Qualifier("smePublishServiceApiClient") com.oransc.rappmanager.sme.publishservice.ApiClient apiClient) { + public org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient defaultPublishServiceApiClient( + @Qualifier("smePublishServiceApiClient") org.oransc.rappmanager.sme.publishservice.ApiClient apiClient) { apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath()); - return new com.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient(apiClient); + return new org.oransc.rappmanager.sme.publishservice.rest.DefaultApiClient(apiClient); } @Bean - public com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient defaultInvokerApiClient( - @Qualifier("smeInvokerApiClient") com.oransc.rappmanager.sme.invoker.ApiClient apiClient) { + public org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient defaultInvokerApiClient( + @Qualifier("smeInvokerApiClient") org.oransc.rappmanager.sme.invoker.ApiClient apiClient) { apiClient.setBasePath(smeConfiguration.getBaseUrl() + smeConfiguration.getInvokerBasePath()); - return new com.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient); + return new org.oransc.rappmanager.sme.invoker.rest.DefaultApiClient(apiClient); } } diff --git a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeDeployerTest.java old mode 100755 new mode 100644 similarity index 90% rename from rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java rename to rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeDeployerTest.java index 50307a5..f5cbe8a --- a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeDeployerTest.java +++ b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeDeployerTest.java @@ -17,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.sme.service; +package org.oransc.rappmanager.sme.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -29,22 +29,6 @@ import static org.springframework.test.web.client.response.MockRestResponseCreat import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.oransc.rappmanager.models.cache.RappCacheService; -import com.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; -import com.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; -import com.oransc.rappmanager.models.rapp.Rapp; -import com.oransc.rappmanager.models.rapp.RappState; -import com.oransc.rappmanager.models.rappinstance.RappInstance; -import com.oransc.rappmanager.models.rappinstance.RappSMEInstance; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; -import com.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig; -import com.oransc.rappmanager.sme.configuration.SmeConfiguration; -import com.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails; -import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; -import com.oransc.rappmanager.sme.provider.data.APIProviderFunctionDetails; -import com.oransc.rappmanager.sme.provider.data.ApiProviderFuncRole; -import com.oransc.rappmanager.sme.publishservice.data.AefProfile; -import com.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription; import java.util.List; import java.util.Map; import java.util.UUID; @@ -52,6 +36,22 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; +import org.oransc.rappmanager.models.cache.RappCacheService; +import org.oransc.rappmanager.models.configuration.RappsEnvironmentConfiguration; +import org.oransc.rappmanager.models.csar.RappCsarConfigurationHandler; +import org.oransc.rappmanager.models.rapp.Rapp; +import org.oransc.rappmanager.models.rapp.RappState; +import org.oransc.rappmanager.models.rappinstance.RappInstance; +import org.oransc.rappmanager.models.rappinstance.RappSMEInstance; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachine; +import org.oransc.rappmanager.models.statemachine.RappInstanceStateMachineConfig; +import org.oransc.rappmanager.sme.configuration.SmeConfiguration; +import org.oransc.rappmanager.sme.invoker.data.APIInvokerEnrolmentDetails; +import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; +import org.oransc.rappmanager.sme.provider.data.APIProviderFunctionDetails; +import org.oransc.rappmanager.sme.provider.data.ApiProviderFuncRole; +import org.oransc.rappmanager.sme.publishservice.data.AefProfile; +import org.oransc.rappmanager.sme.publishservice.data.ServiceAPIDescription; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; @@ -84,8 +84,7 @@ class SmeDeployerTest { @Autowired ObjectMapper objectMapper; private final String validRappFile = "valid-rapp-package.csar"; - String uriProviderRegistrations, uriProviderRegistration, uriPublishApis, uriPublishApi, uriInvokers, - uriInvoker; + String uriProviderRegistrations, uriProviderRegistration, uriPublishApis, uriPublishApi, uriInvokers, uriInvoker; @BeforeAll void initSmeUri() { @@ -94,8 +93,7 @@ class SmeDeployerTest { uriProviderRegistration = smeConfiguration.getBaseUrl() + smeConfiguration.getProviderBasePath() + "registrations/%s"; uriPublishApis = smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath() + "%s/service-apis"; - uriPublishApi = - smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath() + "%s/service-apis/%s"; + uriPublishApi = smeConfiguration.getBaseUrl() + smeConfiguration.getPublishApiBasePath() + "%s/service-apis/%s"; uriInvokers = smeConfiguration.getBaseUrl() + smeConfiguration.getInvokerBasePath() + "onboardedInvokers"; uriInvoker = smeConfiguration.getBaseUrl() + smeConfiguration.getInvokerBasePath() + "onboardedInvokers/%s"; } @@ -109,10 +107,9 @@ class SmeDeployerTest { void testCreateAMF() throws JsonProcessingException { String apiProvDomId = UUID.randomUUID().toString(); APIProviderEnrolmentDetails apiProviderEnrolmentDetails = new APIProviderEnrolmentDetails(apiProvDomId); - mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)) - .andExpect(method(HttpMethod.POST)).andRespond( - withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) - .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); + mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) + .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); APIProviderEnrolmentDetails apiProviderEnrolmentResponse = smeDeployer.createAMF(); mockServer.verify(); assertEquals(apiProvDomId, apiProviderEnrolmentResponse.getApiProvDomId()); @@ -120,8 +117,8 @@ class SmeDeployerTest { @Test void testCreateAMFFailure() { - mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)) - .andExpect(method(HttpMethod.POST)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); + mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); APIProviderEnrolmentDetails apiProviderEnrolmentResponse = smeDeployer.createAMF(); mockServer.verify(); assertNull(apiProviderEnrolmentResponse); @@ -131,10 +128,9 @@ class SmeDeployerTest { void testDeleteAMF() throws JsonProcessingException { String apiProvDomId = UUID.randomUUID().toString(); APIProviderEnrolmentDetails apiProviderEnrolmentDetails = new APIProviderEnrolmentDetails(apiProvDomId); - mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)) - .andExpect(method(HttpMethod.POST)).andRespond( - withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) - .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); + mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) + .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); mockServer.expect(ExpectedCount.once(), requestTo(String.format(uriProviderRegistration, apiProvDomId))) .andExpect(method(HttpMethod.DELETE)).andRespond(withStatus(HttpStatus.NO_CONTENT)); smeDeployer.createAMF(); @@ -149,10 +145,9 @@ class SmeDeployerTest { Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation) .state(RappState.COMMISSIONED).build(); APIProviderEnrolmentDetails apiProviderEnrolmentDetails = getProviderDomainApiEnrollmentDetails(); - mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)) - .andExpect(method(HttpMethod.POST)).andRespond( - withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) - .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); + mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) + .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); RappInstance rappInstance = getRappInstance(); boolean createProviderDomain = smeDeployer.createProviderDomain(rapp, rappInstance); mockServer.verify(); @@ -165,8 +160,8 @@ class SmeDeployerTest { Rapp rapp = Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation) .state(RappState.COMMISSIONED).build(); - mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)) - .andExpect(method(HttpMethod.POST)).andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); + mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.INTERNAL_SERVER_ERROR)); RappInstance rappInstance = getRappInstance(); boolean createProviderDomain = smeDeployer.createProviderDomain(rapp, rappInstance); mockServer.verify(); @@ -278,10 +273,9 @@ class SmeDeployerTest { Rapp rapp = Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation) .state(RappState.COMMISSIONED).build(); - mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)) - .andExpect(method(HttpMethod.POST)).andRespond( - withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) - .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); + mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) + .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); ServiceAPIDescription serviceAPIDescription = getServiceApiDescription(); mockServer.expect(ExpectedCount.once(), requestTo(String.format(uriPublishApis, apfProviderFunctionDetails.getApiProvFuncId()))) @@ -310,10 +304,9 @@ class SmeDeployerTest { Rapp rapp = Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation) .state(RappState.COMMISSIONED).build(); - mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)) - .andExpect(method(HttpMethod.POST)).andRespond( - withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) - .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); + mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) + .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); ServiceAPIDescription serviceAPIDescription = getServiceApiDescription(); mockServer.expect(ExpectedCount.once(), requestTo(String.format(uriPublishApis, apfProviderFunctionDetails.getApiProvFuncId()))) @@ -370,10 +363,9 @@ class SmeDeployerTest { Rapp rapp = Rapp.builder().rappId(rappId).name("").packageName(validRappFile).packageLocation(validCsarFileLocation) .state(RappState.COMMISSIONED).build(); - mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)) - .andExpect(method(HttpMethod.POST)).andRespond( - withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) - .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); + mockServer.expect(ExpectedCount.once(), requestTo(uriProviderRegistrations)).andExpect(method(HttpMethod.POST)) + .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON) + .body(objectMapper.writeValueAsString(apiProviderEnrolmentDetails))); ServiceAPIDescription serviceAPIDescription = getServiceApiDescription(); mockServer.expect(ExpectedCount.once(), requestTo(String.format(uriPublishApis, apfProviderFunctionDetails.getApiProvFuncId()))) @@ -568,8 +560,8 @@ class SmeDeployerTest { APIInvokerEnrolmentDetails getApiInvokerEnrollmentDetails() { APIInvokerEnrolmentDetails apiInvokerEnrolmentDetails = new APIInvokerEnrolmentDetails(String.valueOf(UUID.randomUUID())); - com.oransc.rappmanager.sme.invoker.data.ServiceAPIDescription serviceAPIDescription = - new com.oransc.rappmanager.sme.invoker.data.ServiceAPIDescription(); + org.oransc.rappmanager.sme.invoker.data.ServiceAPIDescription serviceAPIDescription = + new org.oransc.rappmanager.sme.invoker.data.ServiceAPIDescription(); serviceAPIDescription.setApiId(String.valueOf(UUID.randomUUID())); apiInvokerEnrolmentDetails.setApiList(List.of(serviceAPIDescription)); return apiInvokerEnrolmentDetails; diff --git a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java old mode 100755 new mode 100644 similarity index 93% rename from rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java rename to rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java index c7bdb7c..e29faa4 --- a/rapp-manager-sme/src/test/java/com/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java +++ b/rapp-manager-sme/src/test/java/org/oransc/rappmanager/sme/service/SmeLifecycleManagerTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START====================================================================== * Copyright (C) 2023 Nordix Foundation. All rights reserved. + * Copyright (C) 2023-2024 OpenInfra Foundation Europe. All rights reserved. * =============================================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +17,7 @@ * ============LICENSE_END======================================================================== */ -package com.oransc.rappmanager.sme.service; +package org.oransc.rappmanager.sme.service; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -25,8 +26,8 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; import org.junit.jupiter.api.Test; +import org.oransc.rappmanager.sme.provider.data.APIProviderEnrolmentDetails; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; -- 2.16.6