From e88de9dcacefad2b5f768150fb3d96c7a6fd3124 Mon Sep 17 00:00:00 2001
From: Rustam_Lotsmanenko <rustam_lotsmanenko@epam.com>
Date: Wed, 20 Dec 2023 10:51:54 +0200
Subject: [PATCH] remove not necessary while loop
---
.../provider/gcp/repo/SubscriptionCacheRepo.java | 14 ++++++--------
.../gcp/service/ExternalSubscriptionsManager.java | 3 +--
.../gcp/service/SubscriptionServiceGc.java | 2 +-
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/repo/SubscriptionCacheRepo.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/repo/SubscriptionCacheRepo.java
index 20f43abab..d9788610e 100644
--- a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/repo/SubscriptionCacheRepo.java
+++ b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/repo/SubscriptionCacheRepo.java
@@ -112,18 +112,16 @@ public class SubscriptionCacheRepo {
private HashSet<Subscription> getSubscriptions(String pattern) {
ScanOptions options = ScanOptions.scanOptions()
.match(pattern)
- .count(10)
.build();
- boolean done = false;
+
HashSet<String> keys = new HashSet<>();
- while (!done) {
- try (Cursor<String> scan = redisTemplate.scan(options)) {
- while (scan.hasNext()) {
- keys.add(scan.next());
- }
+
+ try (Cursor<String> cursor = redisTemplate.scan(options)) {
+ while (cursor.hasNext()) {
+ keys.add(cursor.next());
}
- done = true;
}
+
return new HashSet<>(Optional.ofNullable(redisTemplate.opsForValue().multiGet(keys))
.orElse(Collections.emptyList()));
}
diff --git a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/service/ExternalSubscriptionsManager.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/service/ExternalSubscriptionsManager.java
index 0006c8336..2be560afb 100644
--- a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/service/ExternalSubscriptionsManager.java
+++ b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/service/ExternalSubscriptionsManager.java
@@ -89,8 +89,7 @@ public class ExternalSubscriptionsManager {
}
private void reloadSubscriptionInfoCache(String dataPartitionId) {
- List<Subscription> fragmentarySubInfos = subscriptionService.getAllSubscriptionInfos(
- dataPartitionId);
+ List<Subscription> fragmentarySubInfos = subscriptionService.getAllSubscriptionInfos(dataPartitionId);
for (Subscription freagmentedSubscription : fragmentarySubInfos) {
Subscription subscription = subscriptionService.getSubscriptionsByNotificationId(dataPartitionId, freagmentedSubscription.getNotificationId());
if(Objects.isNull(subscription)){
diff --git a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/service/SubscriptionServiceGc.java b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/service/SubscriptionServiceGc.java
index ae1914887..a89b06e7b 100644
--- a/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/service/SubscriptionServiceGc.java
+++ b/provider/notification-gc/src/main/java/org/opengroup/osdu/notification/provider/gcp/service/SubscriptionServiceGc.java
@@ -45,7 +45,7 @@ public class SubscriptionServiceGc {
if (response.isSuccessCode()) {
try {
ObjectMapper objectMapper = new ObjectMapper();
- return objectMapper.readValue(response.getBody(), new TypeReference<List<Subscription>>(){});
+ return objectMapper.readValue(response.getBody(), new TypeReference<>() {});
} catch (IOException ex) {
throw new SubscriptionException("Exception in deserializing response", response, ex);
}
--
GitLab