diff --git a/provider/notification-gc/pom.xml b/provider/notification-gc/pom.xml index a81b7af3b7d6afedd5f3f5eeee502a3d2fb8dc8d..c74cf1f64b60af1910e1fd402246bc0fc467feb5 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 67e844ae4ec9a4bec853a5163314696419cc132a..24673cf6985135590b59eee2561420f636dcc947 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 e3a59167cf31d7b36914c0e79ce1df6f3efe5c0d..fb0daad8697a47c723f3187fdb29452de2355e68 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 0b2d7993f8df49644a0d0d8641f837dea729c739..8cc65690eda213d5ae3b56e1406d62de56f168b1 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