From f4a5952f88ddb42d4bdca2617e1b6374a5b7f8a1 Mon Sep 17 00:00:00 2001
From: "Riabokon Stanislav(EPAM)[GCP]" <stanislav_riabokon@epam.com>
Date: Wed, 26 Apr 2023 11:35:50 +0000
Subject: [PATCH] Added a check for RabbitMQ Retry (GONRG-6705)
---
provider/notification-gc/pom.xml | 10 ++++++++--
.../notification/provider/gcp/config/CacheConfig.java | 8 ++++++++
.../provider/gcp/pubsub/OqmSubscriptionProvider.java | 2 +-
.../src/main/resources/application.properties | 2 ++
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/provider/notification-gc/pom.xml b/provider/notification-gc/pom.xml
index a81b7af3b..c74cf1f64 100644
--- a/provider/notification-gc/pom.xml
+++ b/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>
diff --git a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/CacheConfig.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/CacheConfig.java
index 67e844ae4..24673cf69 100644
--- a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/config/CacheConfig.java
+++ b/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
diff --git a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriptionProvider.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriptionProvider.java
index e3a59167c..fb0daad86 100644
--- a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/pubsub/OqmSubscriptionProvider.java
+++ b/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;
diff --git a/provider/notification-gc/src/main/resources/application.properties b/provider/notification-gc/src/main/resources/application.properties
index 0b2d7993f..8cc65690e 100644
--- a/provider/notification-gc/src/main/resources/application.properties
+++ b/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
--
GitLab