From f66566aa176b8a0a7fc682b84c9ebdb13d833165 Mon Sep 17 00:00:00 2001 From: Ravi Khadiwala Date: Mon, 8 Jan 2024 14:39:18 -0600 Subject: [PATCH] Fix default configuratiton in MonitoredS3ObjectConfiguration --- .../MonitoredS3ObjectConfiguration.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MonitoredS3ObjectConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MonitoredS3ObjectConfiguration.java index 7ffe2dfe2..53a0ecf87 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MonitoredS3ObjectConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/MonitoredS3ObjectConfiguration.java @@ -5,8 +5,6 @@ package org.whispersystems.textsecuregcm.configuration; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.common.annotations.VisibleForTesting; import java.time.Duration; import javax.validation.constraints.NotBlank; @@ -14,14 +12,18 @@ public record MonitoredS3ObjectConfiguration( @NotBlank String s3Region, @NotBlank String s3Bucket, @NotBlank String objectKey, - long maxSize, - Duration refreshInterval -) { + Long maxSize, + Duration refreshInterval) { - static long DEFAULT_MAXSIZE = 16*1024*1024; - static Duration DEFAULT_DURATION = Duration.ofMinutes(5); + private static long DEFAULT_MAXSIZE = 16*1024*1024; + private static Duration DEFAULT_REFRESH_INTERVAL = Duration.ofMinutes(5); - public MonitoredS3ObjectConfiguration(String s3Region, String s3Bucket, String objectKey) { - this(s3Region, s3Bucket, objectKey, DEFAULT_MAXSIZE, DEFAULT_DURATION); + public MonitoredS3ObjectConfiguration { + if (maxSize == null) { + maxSize = DEFAULT_MAXSIZE; + } + if (refreshInterval == null) { + refreshInterval = DEFAULT_REFRESH_INTERVAL; + } } }