Merge remote-tracking branch 'origin/master' into aws-integration-maven

provider/notification-azure/pom.xml

@@ -39,7 +39,7 @@
     <springframework.version>4.3.0.RELEASE</springframework.version>
     <reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
     <reactor.core.version>3.3.0.RELEASE</reactor.core.version>
-    <osdu.corelibazure.version>0.19.0-rc8</osdu.corelibazure.version>
+    <osdu.corelibazure.version>0.21.0-rc3</osdu.corelibazure.version>
     <osdu.oscorecommon.version>0.19.0-rc6</osdu.oscorecommon.version>
     <junit.version>5.6.0</junit.version>
     <jjwt.version>3.8.1</jjwt.version>

provider/notification-azure/src/main/java/org/opengroup/osdu/notification/provider/azure/messageBus/ProcessNotification.java

@@ -71,8 +71,6 @@ public class ProcessNotification {
             MDC.setContextMap(mdcContextMap.getContextMap(correlationId, dataPartitionId, collaborationId));
             dpsHeaders.setThreadContext(dataPartitionId, correlationId, collaborationId);
 
-            LOGGER.debug("Notification process started for message with id: {}", message.getMessageId());
-
             HttpResponse response = notificationHandler.notifySubscriber(notificationContent.getNotificationId(),
                     notificationContent.getData(), notificationContent.getExtractAttributes());
 

provider/notification-gc/pom.xml

@@ -43,11 +43,12 @@
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
             <artifactId>os-core-common</artifactId>
+            <version>0.21.0-rc4</version>
         </dependency>
         <dependency>
             <groupId>org.opengroup.osdu</groupId>
-            <artifactId>core-lib-gcp</artifactId>
-            <version>0.20.0-rc1</version>
+            <artifactId>core-lib-gc</artifactId>
+            <version>0.21.0-rc4</version>
         </dependency>
 
         <dependency>
@@ -112,6 +113,11 @@
             <artifactId>jackson-annotations</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opengroup.osdu</groupId>
+            <artifactId>oqm</artifactId>
+            <version>0.21.0-rc3</version>
+        </dependency>
     </dependencies>
 
     <build>

provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/CacheConfig.java

@@ -18,7 +18,10 @@
 package org.opengroup.osdu.notification.provider.gcp.config;
 
 import lombok.RequiredArgsConstructor;
+import org.opengroup.osdu.core.common.cache.ICache;
 import org.opengroup.osdu.core.common.cache.IRedisCache;
+import org.opengroup.osdu.core.common.cache.VmCache;
+import org.opengroup.osdu.core.common.partition.PartitionInfo;
 import org.opengroup.osdu.core.gcp.cache.RedisCacheBuilder;
 import org.opengroup.osdu.notification.provider.gcp.model.ExternalSubscriptions;
 import org.springframework.context.annotation.Bean;
@@ -42,4 +45,9 @@ public class CacheConfig {
                 ExternalSubscriptions.class
         );
     }
+
+  @Bean
+  public ICache<String, PartitionInfo> partitionInfoCache() {
+    return new VmCache<>(600, 2000);
+  }
 }
\ No newline at end of file

provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriptionProvider.java

@@ -2,7 +2,6 @@ package org.opengroup.osdu.notification.provider.gcp.pubsub;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.opengroup.osdu.core.common.model.tenant.TenantInfo;
 import org.opengroup.osdu.core.common.provider.interfaces.ITenantFactory;
 import org.opengroup.osdu.core.gcp.oqm.driver.OqmDriver;
@@ -13,6 +12,7 @@ import org.opengroup.osdu.notification.provider.gcp.config.OqmConfigurationPrope
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
+import javax.validation.constraints.NotNull;
 import java.util.Collections;
 import java.util.List;
 

provider/notification-gc/src/main/resources/application.properties

@@ -48,3 +48,5 @@ redis-port=${REDIS_USER_INFO_PORT:6379}
 redis-password=${REDIS_USER_INFO_PASSWORD:}
 redis-with-ssl=${REDIS_USER_INFO_WITH_SSL:false}
 cache.codec=jackson
+
+propertyResolver.strategy=partition
\ No newline at end of file