Package name modified

Package name modified. Issue-ID: NONRTRIC-872 Change-Id: Ie50c74e1a4b82dcaeac536a3904a471b613aedbf Signed-off-by: aravind.est <[email protected]>
o-ran-sc · Jul 25, 2024 · 4702cde · 4702cde
1 parent ab9137b
commit 4702cde
Show file tree

Hide file tree

Showing 86 changed files with 467 additions and 446 deletions.
diff --git 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 @@
                             <configOptions>
                                 <sourceFolder>src/main/java</sourceFolder>
                                 <useJakartaEe>true</useJakartaEe>
-                                <invokerPackage>com.oransc.rappmanager.acm</invokerPackage>
-                                <apiPackage>com.oransc.rappmanager.acm.rest</apiPackage>
-                                <modelPackage>com.oransc.rappmanager.acm.data</modelPackage>
+                                <invokerPackage>org.oransc.rappmanager.acm</invokerPackage>
+                                <apiPackage>org.oransc.rappmanager.acm.rest</apiPackage>
+                                <modelPackage>org.oransc.rappmanager.acm.data</modelPackage>
                                 <generateClientAsBean>false</generateClientAsBean>
                             </configOptions>
                         </configuration>

diff --git a/...r/acm/configuration/ACMConfiguration.java → ...r/acm/configuration/ACMConfiguration.java b/...r/acm/configuration/ACMConfiguration.java → ...r/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/...JacksonMessageConverterConfiguration.java → ...JacksonMessageConverterConfiguration.java b/...JacksonMessageConverterConfiguration.java → ...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/.../rappmanager/acm/service/AcmDeployer.java → .../rappmanager/acm/service/AcmDeployer.java b/.../rappmanager/acm/service/AcmDeployer.java → .../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.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 @@ boolean waitForCompositionInstanceTargetState(UUID compositionId, RappInstance r
     @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/...pmanager/acm/service/AcmDeployerTest.java → ...pmanager/acm/service/AcmDeployerTest.java b/...pmanager/acm/service/AcmDeployerTest.java → ...pmanager/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 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.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/...er/acm/service/BeanTestConfiguration.java → ...er/acm/service/BeanTestConfiguration.java b/...er/acm/service/BeanTestConfiguration.java → ...er/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/...ager/models/rapp/RappResourceBuilder.java → ...ager/models/rapp/RappResourceBuilder.java b/...ager/models/rapp/RappResourceBuilder.java → ...ager/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/...oransc/rappmanager/BeanConfiguration.java → ...oransc/rappmanager/BeanConfiguration.java b/...oransc/rappmanager/BeanConfiguration.java → ...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 ApiClient acmApiClient(RestTemplate restTemplate) {
     }
 
     @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 AutomationCompositionInstanceApiClient automationCompositionInstanceApiCl
 
     @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/...c/rappmanager/RappManagerApplication.java → ...c/rappmanager/RappManagerApplication.java b/...c/rappmanager/RappManagerApplication.java → ...c/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/...nfiguration/RappManagerConfiguration.java → ...nfiguration/RappManagerConfiguration.java b/...nfiguration/RappManagerConfiguration.java → ...nfiguration/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;