Merge branch 'master' of...

Merge branch 'master' of https://community.opengroup.org/osdu/platform/system/register into lach/master/fullApiUrl

NOTICE

@@ -146,7 +146,6 @@ The following software have components provided under the terms of this license:
 - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
 - Jakarta RESTful WS API (from https://github.com/eclipse-ee4j/jaxrs-api)
 - Jakarta Validation API (from https://beanvalidation.org)
-- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
 - Java Architecture for XML Binding (from http://jaxb.java.net/, https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api)
 - Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
 - Java Native Access Platform (from https://github.com/java-native-access/jna)
@@ -511,11 +510,9 @@ The following software have components provided under the terms of this license:
 - JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/)
-- JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/)
 - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/)
 - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca)
 - Jakarta Validation API (from https://beanvalidation.org)
-- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
 - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic)
 - Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core)
 - Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson)
@@ -703,7 +700,6 @@ The following software have components provided under the terms of this license:
 - ClassGraph (from https://github.com/classgraph/classgraph)
 - JUL to SLF4J bridge (from http://www.slf4j.org)
 - Jackson-core (from http://wiki.fasterxml.com/JacksonHome, https://github.com/FasterXML/jackson-core)
-- Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api, https://repo1.maven.org/maven2/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.3_spec)
 - Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
 - Java JWT (from http://www.jwt.io, https://github.com/auth0/java-jwt)
 - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core)

provider/register-aws/pom.xml

@@ -67,7 +67,7 @@
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-core</artifactId>
-                <version>5.8.2</version>
+                <version>5.8.9</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

provider/register-gc/src/main/java/org/opengroup/osdu/register/provider/gcp/action/OsmActionRepo.java

@@ -59,12 +59,14 @@ public class OsmActionRepo implements IActionRepo {
     private final TenantInfo tenantInfo;
     ReentrantLock actionDeleteLock = new ReentrantLock();
 
-    private static final Namespace NAMESPACE = new Namespace("DE");
     private static final Kind KIND = new Kind("ACTION");
 
-    //queries addressed to tenant specific GCP project and namespace and to a certain kind.
     private Destination getDestination() {
-        return Destination.builder().partitionId(tenantInfo.getDataPartitionId()).namespace(NAMESPACE).kind(KIND).build();
+        return Destination.builder()
+            .partitionId(tenantInfo.getDataPartitionId())
+            .namespace(new Namespace(tenantInfo.getName()))
+            .kind(KIND)
+            .build();
     }
 
     @Override

provider/register-gc/src/main/java/org/opengroup/osdu/register/provider/gcp/ddms/OsmDdmsRepository.java

@@ -54,12 +54,15 @@ public class OsmDdmsRepository implements IDdmsRepository {
     private final TenantInfo tenantInfo;
     ReentrantLock ddmsDeleteLock = new ReentrantLock();
 
-    private static final Namespace NAMESPACE = new Namespace("DE");
     private static final Kind KIND = new Kind("DDMS");
 
     //queries addressed to tenant specific GCP project and namespace and to a certain kind.
     private Destination getDestination() {
-        return Destination.builder().partitionId(tenantInfo.getDataPartitionId()).namespace(NAMESPACE).kind(KIND).build();
+        return Destination.builder()
+            .partitionId(tenantInfo.getDataPartitionId())
+            .namespace(new Namespace(tenantInfo.getName()))
+            .kind(KIND)
+            .build();
     }
 
     @Override

provider/register-gc/src/main/java/org/opengroup/osdu/register/provider/gcp/subscriber/OsmAccess.java

@@ -69,15 +69,17 @@ public class OsmAccess implements IDatastoreAccess {
     private static final String CONFLICT_REASON = "Conflict";
     private static final String ABORTED_DUE_TO_CONFLICT_MSG = "ABORTED due to conflict";
 
-    private static final Namespace NAMESPACE = new Namespace("DE");
     private static final Kind KIND = new Kind("SUBSCRIPTION");
     private static final String SUBSCRIPTION_CREATED = "Subscription Created";
     private static final String SUBSCRIPTION_UPDATED = "Subscription Updated";
     private static final String SUBSCRIPTION_DELETED = "Subscription Deleted";
 
-    //queries addressed to tenant specific GCP project and namespace and to a certain kind.
     private Destination getDestination() {
-        return Destination.builder().partitionId(tenantInfo.getDataPartitionId()).namespace(NAMESPACE).kind(KIND).build();
+        return Destination.builder()
+            .partitionId(tenantInfo.getDataPartitionId())
+            .namespace(new Namespace(tenantInfo.getName()))
+            .kind(KIND)
+            .build();
     }
 
     @PostConstruct
@@ -101,7 +103,6 @@ public class OsmAccess implements IDatastoreAccess {
         return getSubscriptionByDto(existingSubscription);
     }
 
-    // TODO: Remove this api when switch notification to use cache
     @Override
     public List<Subscription> query(String notificationId) {
         GetQuery<SubscriptionDto> q = new GetQuery<>(SubscriptionDto.class, getDestination(), eq("notificationId", notificationId));