diff --git a/abusive-message-filter b/abusive-message-filter index 45e09e2ad..6094634b5 160000 --- a/abusive-message-filter +++ b/abusive-message-filter @@ -1 +1 @@ -Subproject commit 45e09e2ad842513e495f64332fb8e45e1ac7b2da +Subproject commit 6094634b57ba6b3ce6df4cfd7f9f63b03de30292 diff --git a/gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java b/gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java index 3aa77f963..84fc57769 100644 --- a/gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java +++ b/gcm-sender-async/src/main/java/org/whispersystems/gcm/server/Sender.java @@ -7,12 +7,9 @@ package org.whispersystems.gcm.server; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.annotations.VisibleForTesting; -import io.github.resilience4j.retry.IntervalFunction; +import io.github.resilience4j.core.IntervalFunction; import io.github.resilience4j.retry.Retry; import io.github.resilience4j.retry.RetryConfig; -import org.whispersystems.gcm.server.internal.GcmResponseEntity; -import org.whispersystems.gcm.server.internal.GcmResponseListEntity; - import java.io.IOException; import java.net.URI; import java.net.http.HttpClient; @@ -26,6 +23,8 @@ import java.util.concurrent.CompletionException; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeoutException; +import org.whispersystems.gcm.server.internal.GcmResponseEntity; +import org.whispersystems.gcm.server.internal.GcmResponseListEntity; /** * The main interface to sending GCM messages. Thread safe. diff --git a/pom.xml b/pom.xml index 41d42b53b..c5a1f6893 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ 2.9.0 2.0.28 1.1.13 - 2.8.8 + 2.9.0 30.1.1-jre 2.13.2.20220328 2.3.1 diff --git a/redis-dispatch/src/main/java/org/whispersystems/dispatch/redis/PubSubConnection.java b/redis-dispatch/src/main/java/org/whispersystems/dispatch/redis/PubSubConnection.java index 8c2f55398..322f6e5b7 100644 --- a/redis-dispatch/src/main/java/org/whispersystems/dispatch/redis/PubSubConnection.java +++ b/redis-dispatch/src/main/java/org/whispersystems/dispatch/redis/PubSubConnection.java @@ -115,7 +115,7 @@ public class PubSubConnection { byte[] channelName = inputStream.readFully(channelNameHeader.getStringLength()); inputStream.readLine(); - IntReply subscriptionCount = new IntReply(inputStream.readLine()); + new IntReply(inputStream.readLine()); return new String(channelName); } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/BasicAuthorizationHeader.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/BasicAuthorizationHeader.java index 122a8c4dd..05e4f4f27 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/BasicAuthorizationHeader.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/BasicAuthorizationHeader.java @@ -5,9 +5,7 @@ package org.whispersystems.textsecuregcm.auth; import java.util.Base64; -import java.util.UUID; import org.apache.commons.lang3.StringUtils; -import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.util.Pair; public class BasicAuthorizationHeader { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/CertificateGenerator.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/CertificateGenerator.java index a3a189add..86a927e6e 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/CertificateGenerator.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/CertificateGenerator.java @@ -7,6 +7,9 @@ package org.whispersystems.textsecuregcm.auth; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; +import java.security.InvalidKeyException; +import java.util.Base64; +import java.util.concurrent.TimeUnit; import org.signal.libsignal.protocol.ecc.Curve; import org.signal.libsignal.protocol.ecc.ECPrivateKey; import org.whispersystems.textsecuregcm.entities.MessageProtos.SenderCertificate; @@ -14,11 +17,6 @@ import org.whispersystems.textsecuregcm.entities.MessageProtos.ServerCertificate import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.storage.Device; -import java.io.IOException; -import java.security.InvalidKeyException; -import java.util.Base64; -import java.util.concurrent.TimeUnit; - public class CertificateGenerator { private final ECPrivateKey privateKey; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/PhoneNumberChangeRefreshRequirementProvider.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/PhoneNumberChangeRefreshRequirementProvider.java index b51978687..4ba8db0a5 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/PhoneNumberChangeRefreshRequirementProvider.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/PhoneNumberChangeRefreshRequirementProvider.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Optional; import java.util.UUID; import java.util.stream.Collectors; -import org.glassfish.jersey.server.ContainerRequest; import org.glassfish.jersey.server.monitoring.RequestEvent; import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.util.Pair; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/auth/WebsocketRefreshRequirementProvider.java b/service/src/main/java/org/whispersystems/textsecuregcm/auth/WebsocketRefreshRequirementProvider.java index 862c31238..2f75127ec 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/auth/WebsocketRefreshRequirementProvider.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/auth/WebsocketRefreshRequirementProvider.java @@ -7,7 +7,6 @@ package org.whispersystems.textsecuregcm.auth; import java.util.List; import java.util.UUID; -import org.glassfish.jersey.server.ContainerRequest; import org.glassfish.jersey.server.monitoring.RequestEvent; import org.whispersystems.textsecuregcm.util.Pair; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RateLimitsConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RateLimitsConfiguration.java index d00ff5dba..32ba05d4c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RateLimitsConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/RateLimitsConfiguration.java @@ -5,7 +5,6 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import java.time.Duration; public class RateLimitsConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioVerificationTextConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioVerificationTextConfiguration.java index 693713039..1affb77a2 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioVerificationTextConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/TwilioVerificationTextConfiguration.java @@ -1,9 +1,6 @@ package org.whispersystems.textsecuregcm.configuration; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import com.fasterxml.jackson.databind.annotation.JsonNaming; - import javax.validation.constraints.NotEmpty; public class TwilioVerificationTextConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicTurnConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicTurnConfiguration.java index 3c6cd0e61..524898eb5 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicTurnConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/dynamic/DynamicTurnConfiguration.java @@ -6,12 +6,10 @@ package org.whispersystems.textsecuregcm.configuration.dynamic; import com.fasterxml.jackson.annotation.JsonProperty; -import org.whispersystems.textsecuregcm.configuration.TurnUriConfiguration; import java.util.Collections; import java.util.List; import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import org.whispersystems.textsecuregcm.configuration.TurnUriConfiguration; public class DynamicTurnConfiguration { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerV3.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerV3.java index 8eb98e555..631730420 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerV3.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/AttachmentControllerV3.java @@ -14,7 +14,6 @@ import java.security.spec.InvalidKeySpecException; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.util.Base64; -import java.util.HashMap; import java.util.Map; import javax.annotation.Nonnull; import javax.ws.rs.GET; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ChallengeController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ChallengeController.java index 7a12e42e8..3a938832a 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ChallengeController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/ChallengeController.java @@ -5,8 +5,12 @@ package org.whispersystems.textsecuregcm.controllers; +import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name; + import com.codahale.metrics.annotation.Timed; import io.dropwizard.auth.Auth; +import io.micrometer.core.instrument.Metrics; +import io.micrometer.core.instrument.Tags; import java.util.NoSuchElementException; import javax.validation.Valid; import javax.ws.rs.Consumes; @@ -18,9 +22,6 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import io.micrometer.core.instrument.Metrics; -import io.micrometer.core.instrument.Tag; -import io.micrometer.core.instrument.Tags; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.entities.AnswerChallengeRequest; import org.whispersystems.textsecuregcm.entities.AnswerPushChallengeRequest; @@ -30,8 +31,6 @@ import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil; import org.whispersystems.textsecuregcm.push.NotPushRegisteredException; import org.whispersystems.textsecuregcm.util.ForwardedIpUtil; -import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name; - @Path("/v1/challenge") public class ChallengeController { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryV2Controller.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryV2Controller.java index 33775a27f..8f16ee73d 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryV2Controller.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/DirectoryV2Controller.java @@ -6,7 +6,6 @@ package org.whispersystems.textsecuregcm.controllers; import com.codahale.metrics.annotation.Timed; import io.dropwizard.auth.Auth; -import java.util.Base64; import java.util.UUID; import javax.ws.rs.GET; import javax.ws.rs.Path; @@ -16,9 +15,6 @@ import javax.ws.rs.core.Response; import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentialGenerator; import org.whispersystems.textsecuregcm.auth.ExternalServiceCredentials; -import org.whispersystems.textsecuregcm.util.ByteUtil; -import org.whispersystems.textsecuregcm.util.UUIDUtil; -import org.whispersystems.textsecuregcm.util.Util; @Path("/v2/directory") public class DirectoryV2Controller { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java index dba83839a..4bce8991a 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/controllers/MessageController.java @@ -23,7 +23,6 @@ import java.util.Base64; import java.util.Collection; import java.util.Collections; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -35,7 +34,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.Nonnull; import javax.validation.Valid; import javax.validation.constraints.NotNull; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ActiveUserTally.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ActiveUserTally.java index 0bb7f3b32..ac9496a7b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/ActiveUserTally.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/ActiveUserTally.java @@ -6,7 +6,6 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Map; -import java.util.HashMap; import java.util.UUID; public class ActiveUserTally { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java index ed5feae53..c7ec4782e 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/AnswerChallengeRequest.java @@ -7,7 +7,6 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import javax.validation.constraints.NotBlank; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type") @JsonSubTypes({ diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java index 40afb0b08..c4fa3a74c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/RedeemReceiptRequest.java @@ -8,8 +8,6 @@ package org.whispersystems.textsecuregcm.entities; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import javax.validation.constraints.NotEmpty; -import org.signal.libsignal.zkgroup.receipts.ReceiptCredentialPresentation; -import org.whispersystems.textsecuregcm.util.ExactlySize; public class RedeemReceiptRequest { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/entities/VersionedProfileResponse.java b/service/src/main/java/org/whispersystems/textsecuregcm/entities/VersionedProfileResponse.java index 3b9de8960..30e71a101 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/entities/VersionedProfileResponse.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/entities/VersionedProfileResponse.java @@ -5,12 +5,8 @@ package org.whispersystems.textsecuregcm.entities; -import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonUnwrapped; -import javax.annotation.Nullable; -import java.util.List; -import java.util.UUID; public class VersionedProfileResponse { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManager.java index 69aaea9b0..e288e3ed1 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManager.java @@ -3,11 +3,11 @@ package org.whispersystems.textsecuregcm.limits; import static com.codahale.metrics.MetricRegistry.name; import io.micrometer.core.instrument.Metrics; +import io.micrometer.core.instrument.Tag; +import io.micrometer.core.instrument.Tags; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import io.micrometer.core.instrument.Tag; -import io.micrometer.core.instrument.Tags; import org.whispersystems.textsecuregcm.abuse.RateLimitChallengeListener; import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException; import org.whispersystems.textsecuregcm.metrics.UserAgentTagUtil; @@ -15,7 +15,6 @@ import org.whispersystems.textsecuregcm.push.NotPushRegisteredException; import org.whispersystems.textsecuregcm.recaptcha.RecaptchaClient; import org.whispersystems.textsecuregcm.storage.Account; import org.whispersystems.textsecuregcm.util.Util; -import org.whispersystems.textsecuregcm.util.ua.ClientPlatform; public class RateLimitChallengeManager { diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/LogstashTcpSocketAppenderFactory.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/LogstashTcpSocketAppenderFactory.java index f3e1325e8..e199bab73 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/LogstashTcpSocketAppenderFactory.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/LogstashTcpSocketAppenderFactory.java @@ -20,8 +20,6 @@ import io.dropwizard.logging.AbstractAppenderFactory; import io.dropwizard.logging.async.AsyncAppenderFactory; import io.dropwizard.logging.filter.LevelFilterFactory; import io.dropwizard.logging.layout.LayoutFactory; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.time.Duration; import javax.validation.constraints.NotEmpty; import net.logstash.logback.appender.LogstashTcpSocketAppender; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScript.java b/service/src/main/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScript.java index 089d3f37a..dc187cfed 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScript.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScript.java @@ -15,7 +15,6 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.codec.binary.Hex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AbusiveHostRules.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AbusiveHostRules.java index 781acd49c..4c88a169b 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/AbusiveHostRules.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/AbusiveHostRules.java @@ -11,15 +11,11 @@ import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.SharedMetricRegistries; import com.codahale.metrics.Timer; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.storage.mappers.AbusiveHostRuleRowMapper; import org.whispersystems.textsecuregcm.util.Constants; public class AbusiveHostRules { - private static final Logger logger = LoggerFactory.getLogger(AbusiveHostRules.class); - public static final String ID = "id"; public static final String HOST = "host"; public static final String BLOCKED = "blocked"; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java index 0ffb68f80..8b253c534 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/Accounts.java @@ -29,7 +29,6 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionStage; -import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import java.util.stream.Collectors; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTableCrawler.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTableCrawler.java index 6e905ba3f..c6e83b702 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTableCrawler.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DeletedAccountsTableCrawler.java @@ -10,7 +10,6 @@ import io.micrometer.core.instrument.Metrics; import java.io.IOException; import java.time.Duration; import java.util.List; -import java.util.UUID; import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; import org.whispersystems.textsecuregcm.entities.DirectoryReconciliationRequest.User; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java index 74775b6f7..b70190600 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/DynamicConfigurationManager.java @@ -1,22 +1,21 @@ package org.whispersystems.textsecuregcm.storage; +import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.google.common.annotations.VisibleForTesting; +import io.micrometer.core.instrument.Metrics; import java.time.Duration; -import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.UUID; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicReference; import javax.validation.ConstraintViolation; import javax.validation.Validation; import javax.validation.Validator; -import io.micrometer.core.instrument.Metrics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.util.Util; @@ -27,8 +26,6 @@ import software.amazon.awssdk.services.appconfigdata.model.GetLatestConfiguratio import software.amazon.awssdk.services.appconfigdata.model.StartConfigurationSessionRequest; import software.amazon.awssdk.services.appconfigdata.model.StartConfigurationSessionResponse; -import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name; - public class DynamicConfigurationManager { private final String application; diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java index 00f14f635..a6767714c 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesManager.java @@ -14,8 +14,6 @@ import java.util.List; import java.util.Optional; import java.util.UUID; import java.util.stream.Collectors; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope; import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntity; import org.whispersystems.textsecuregcm.entities.OutgoingMessageEntityList; @@ -25,8 +23,6 @@ import org.whispersystems.textsecuregcm.util.Constants; public class MessagesManager { - private static final Logger logger = LoggerFactory.getLogger(MessagesManager.class); - private static final int RESULT_SET_CHUNK_SIZE = 100; private static final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME); diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CheckDynamicConfigurationCommand.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CheckDynamicConfigurationCommand.java index 348b3aa32..aeaaef826 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CheckDynamicConfigurationCommand.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CheckDynamicConfigurationCommand.java @@ -11,8 +11,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; -import net.sourceforge.argparse4j.inf.ArgumentAction; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparser; import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;