Set up Paris branch

Set up paris branch for sdncp/apps and fix compilation errors.

Issue-ID: CCSDK-4136
Change-Id: I2eb5d49a9699a22b56e391c7a39f10278d18e3d6
Signed-off-by: Dan Timoney <dt5972@att.com>

diff --git a/.gitreview b/.gitreview
index 81c40b0..6ba12a5 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=gerrit.onap.org
 port=29418
 project=sdnc/apps.git
+defaultbranch=paris

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java
index 9c3aa91..ba4499b 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigContrailRouteAllottedResourcesRepository.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface ConfigContrailRouteAllottedResourcesRepository extends CrudRepository<ConfigContrailRouteAllottedResources, Long> {
+public interface ConfigContrailRouteAllottedResourcesRepository extends CrudRepository<ConfigContrailRouteAllottedResources, String> {
 
     List<ConfigContrailRouteAllottedResources> findByAllottedResourceId(String allottedResourceId);
     long deleteByAllottedResourceId(String allottedResourceId);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java
index 56fc56c..bb5cd01 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigNetworksRepository.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface ConfigNetworksRepository extends CrudRepository<ConfigNetworks, Long> {
+public interface ConfigNetworksRepository extends CrudRepository<ConfigNetworks, NetworksKey> {
 
     List<ConfigNetworks> findBySvcInstanceId(String svcInstanceId);
     List<ConfigNetworks> findBySvcInstanceIdAndNetworkId(String svcInstanceId, String networkId);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java
index 9ca148b..197b34e 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPortMirrorConfigurationsRepository.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface ConfigPortMirrorConfigurationsRepository extends CrudRepository<ConfigPortMirrorConfigurations, Long> {
+public interface ConfigPortMirrorConfigurationsRepository extends CrudRepository<ConfigPortMirrorConfigurations, String> {
 
     List<ConfigPortMirrorConfigurations> findByConfigurationId(String configurationId);
     long deleteByConfigurationId(String configurationId);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java
index 0ec45b7..1105310 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigPreloadDataRepository.java
@@ -26,7 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface ConfigPreloadDataRepository extends CrudRepository<ConfigPreloadData, Long> {
+public interface ConfigPreloadDataRepository extends CrudRepository<ConfigPreloadData, PreloadDataKey> {
 
     List<ConfigPreloadData> findByPreloadIdAndPreloadType(String preloadId, String preloadType);
     long deleteByPreloadIdAndPreloadType(String preloadId, String preloadType);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java
index 5b43947..4f87129 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigServicesRepository.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface ConfigServicesRepository extends CrudRepository<ConfigServices, Long> {
+public interface ConfigServicesRepository extends CrudRepository<ConfigServices, String> {
 
     List<ConfigServices> findBySvcInstanceId(String svcInstanceId);
     long deleteBySvcInstanceId(String svcInstanceId);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java
index 8203483..914dbfd 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVfModulesRepository.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface ConfigVfModulesRepository extends CrudRepository<ConfigVfModules, Long> {
+public interface ConfigVfModulesRepository extends CrudRepository<ConfigVfModules, VfModulesKey> {
 
     List<ConfigVfModules> findBySvcInstanceId(String svcInstanceId);
     List<ConfigVfModules> findBySvcInstanceIdAndVnfId(String svcInstanceId, String vnfId);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java
index 3909eb3..4df562c 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/ConfigVnfsRepository.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface ConfigVnfsRepository extends CrudRepository<ConfigVnfs, Long> {
+public interface ConfigVnfsRepository extends CrudRepository<ConfigVnfs, VnfsKey> {
 
     List<ConfigVnfs> findBySvcInstanceId(String svcInstanceId);
     List<ConfigVnfs> findBySvcInstanceIdAndVnfId(String svcInstanceId, String vnfId);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java
index c737721..31ef57f 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalContrailRouteAllottedResourcesRepository.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface OperationalContrailRouteAllottedResourcesRepository extends CrudRepository<OperationalContrailRouteAllottedResources, Long> {
+public interface OperationalContrailRouteAllottedResourcesRepository extends CrudRepository<OperationalContrailRouteAllottedResources, String> {
 
     List<OperationalContrailRouteAllottedResources> findByAllottedResourceId(String allottedResourceId);
     long deleteByAllottedResourceId(String allottedResourceId);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java
index 1d57c86..bbc25f0 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalPortMirrorConfigurationsRepository.java
@@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.List;
 
 @Transactional
-public interface OperationalPortMirrorConfigurationsRepository extends CrudRepository<OperationalPortMirrorConfigurations, Long> {
+public interface OperationalPortMirrorConfigurationsRepository extends CrudRepository<OperationalPortMirrorConfigurations, String> {
 
     List<OperationalPortMirrorConfigurations> findByConfigurationId(String configurationId);
     long deleteByConfigurationId(String configurationId);

diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java
index 7c5975d..1c3fd6e 100644 (file)
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/data/OperationalServicesRepository.java
@@ -27,7 +27,7 @@ import java.util.List;
 import jakarta.transaction.Transactional;
 
 @Transactional
-public interface OperationalServicesRepository extends CrudRepository<OperationalServices, Long> {
+public interface OperationalServicesRepository extends CrudRepository<OperationalServices, String> {
 
     List<OperationalServices> findBySvcInstanceId(String svcInstanceId);
     long deleteBySvcInstanceId(String svcInstanceId);

diff --git a/pom.xml b/pom.xml
index 6d4c451..2000eb2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -19,11 +19,11 @@
 
     <properties>
         <aaf.cadi.version>2.1.21</aaf.cadi.version>
-        <ccsdk.apps.version>2.1.0-SNAPSHOT</ccsdk.apps.version>
-        <ccsdk.docker.version>2.1.0-STAGING-latest</ccsdk.docker.version>
-        <ccsdk.distribution.version>2.1.0-SNAPSHOT</ccsdk.distribution.version>
-        <sdnc.northbound.version>3.1.0-SNAPSHOT</sdnc.northbound.version>
-        <sdnc.oam.version>3.1.0-SNAPSHOT</sdnc.oam.version>
+        <ccsdk.apps.version>2.1.0</ccsdk.apps.version>
+        <ccsdk.docker.version>2.1.0</ccsdk.docker.version>
+        <ccsdk.distribution.version>2.1.0</ccsdk.distribution.version>
+        <sdnc.northbound.version>3.1.0</sdnc.northbound.version>
+        <sdnc.oam.version>3.1.0</sdnc.oam.version>
     </properties>
 
     <modules>