diff --git a/src/main/java/it/pagopa/interop/signalhub/updater/cache/repository/ConsumerEServiceCacheRepository.java b/src/main/java/it/pagopa/interop/signalhub/updater/cache/repository/ConsumerEServiceCacheRepository.java index b4ae665..d711dd2 100644 --- a/src/main/java/it/pagopa/interop/signalhub/updater/cache/repository/ConsumerEServiceCacheRepository.java +++ b/src/main/java/it/pagopa/interop/signalhub/updater/cache/repository/ConsumerEServiceCacheRepository.java @@ -2,7 +2,7 @@ import it.pagopa.interop.signalhub.updater.cache.model.ConsumerEServiceCache; -import it.pagopa.interop.signalhub.updater.utility.CacheUtils; +import it.pagopa.interop.signalhub.updater.utility.Utils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -21,12 +21,12 @@ public class ConsumerEServiceCacheRepository { public void updateConsumerEService(ConsumerEServiceCache item){ Long index = this.findByEservice(item); if(index != null) { - redisTemplate.opsForList().set(CacheUtils.getCacheKey(item.getEserviceId(), item.getConsumerId()), index, item); + redisTemplate.opsForList().set(Utils.getCacheKey(item.getEserviceId(), item.getConsumerId()), index, item); log.info("Redis update OrganizationEService: {} ", item.getEserviceId()); } } private Long findByEservice(ConsumerEServiceCache consumerEServiceCache) { - return redisTemplate.opsForList().indexOf(CacheUtils.getCacheKey(consumerEServiceCache.getEserviceId(), consumerEServiceCache.getConsumerId()), consumerEServiceCache); + return redisTemplate.opsForList().indexOf(Utils.getCacheKey(consumerEServiceCache.getEserviceId(), consumerEServiceCache.getConsumerId()), consumerEServiceCache); } } \ No newline at end of file diff --git a/src/main/java/it/pagopa/interop/signalhub/updater/controller/AutoUpdaterController.java b/src/main/java/it/pagopa/interop/signalhub/updater/controller/AutoUpdaterController.java index 8258c00..c6355b9 100644 --- a/src/main/java/it/pagopa/interop/signalhub/updater/controller/AutoUpdaterController.java +++ b/src/main/java/it/pagopa/interop/signalhub/updater/controller/AutoUpdaterController.java @@ -6,15 +6,13 @@ import it.pagopa.interop.signalhub.updater.model.*; import it.pagopa.interop.signalhub.updater.service.*; import it.pagopa.interop.signalhub.updater.utility.Predicates; +import it.pagopa.interop.signalhub.updater.utility.Utils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; import org.springframework.stereotype.Component; import java.time.Instant; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; @@ -22,7 +20,6 @@ @Component @AllArgsConstructor public class AutoUpdaterController { - private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss"); private final InteropService interopService; private final OrganizationService organizationService; private final ConsumerService consumerService; @@ -31,8 +28,7 @@ public class AutoUpdaterController { public void scheduleUpdater(String applicationType) { - ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(Instant.now(), ZoneId.systemDefault()); - log.info("ScheduleUpdater of {} started at {}", applicationType, dateTimeFormatter.format(zonedDateTime)); + log.info("ScheduleUpdater of {} started at {}", applicationType, Utils.getFormatHour(Instant.now())); Long lastEventId = this.tracingBatchService.getLastEventIdByTracingBatchAndType(applicationType); lastEventId = updateRecursiveFlow(lastEventId, applicationType); tracingBatchService.terminateTracingBatch(TracingBatchStateEnum.ENDED, lastEventId+1, applicationType); diff --git a/src/main/java/it/pagopa/interop/signalhub/updater/utility/CacheUtils.java b/src/main/java/it/pagopa/interop/signalhub/updater/utility/CacheUtils.java deleted file mode 100644 index ae60dd7..0000000 --- a/src/main/java/it/pagopa/interop/signalhub/updater/utility/CacheUtils.java +++ /dev/null @@ -1,12 +0,0 @@ -package it.pagopa.interop.signalhub.updater.utility; - -public class CacheUtils { - private static final String KEY_SEPARATOR= "-"; - - - private CacheUtils() {} - - public static String getCacheKey(String eServiceId, String consumerId) { - return eServiceId.concat(KEY_SEPARATOR).concat(consumerId); - } -} \ No newline at end of file diff --git a/src/main/java/it/pagopa/interop/signalhub/updater/utility/Utils.java b/src/main/java/it/pagopa/interop/signalhub/updater/utility/Utils.java new file mode 100644 index 0000000..1d9283c --- /dev/null +++ b/src/main/java/it/pagopa/interop/signalhub/updater/utility/Utils.java @@ -0,0 +1,24 @@ +package it.pagopa.interop.signalhub.updater.utility; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; + +public class Utils { + private static final String KEY_SEPARATOR= "-"; + private static final ZoneId UTC_ZONE = ZoneId.of("UTC"); + private static final DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss"); + + + private Utils() {} + + public static String getCacheKey(String eServiceId, String consumerId) { + return eServiceId.concat(KEY_SEPARATOR).concat(consumerId); + } + + public static String getFormatHour(Instant instant){ + ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(instant, UTC_ZONE); + return dateTimeFormatter.format(zonedDateTime); + } +} \ No newline at end of file