From 5df24edebf601ba0d8b92481fa41da1d44bc154f Mon Sep 17 00:00:00 2001 From: Ehren Kret Date: Wed, 25 May 2022 17:15:20 -0500 Subject: [PATCH] Remove all unused imports remaining in project --- .../textsecuregcm/currency/FixerClientTest.java | 14 ++++++-------- .../limits/RateLimitChallengeManagerTest.java | 1 - .../textsecuregcm/metrics/NstatCountersTest.java | 12 ++++++------ .../textsecuregcm/redis/ClusterLuaScriptTest.java | 2 -- .../controllers/CertificateControllerTest.java | 1 - .../tests/controllers/KeysControllerTest.java | 1 - .../textsecuregcm/tests/util/JsonHelpers.java | 9 +++------ .../textsecuregcm/tests/util/ValidNumberTest.java | 11 +++-------- .../websocket/WebSocketConnectionTest.java | 3 +-- 9 files changed, 19 insertions(+), 35 deletions(-) diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/currency/FixerClientTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/currency/FixerClientTest.java index 6a31bcd3d..b869c6e86 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/currency/FixerClientTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/currency/FixerClientTest.java @@ -1,6 +1,10 @@ package org.whispersystems.textsecuregcm.currency; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import static org.whispersystems.textsecuregcm.tests.util.JsonHelpers.jsonFixture; import java.io.IOException; import java.math.BigDecimal; @@ -9,13 +13,7 @@ import java.net.http.HttpRequest; import java.net.http.HttpResponse; import java.net.http.HttpResponse.BodyHandler; import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.whispersystems.textsecuregcm.tests.util.JsonHelpers.jsonFixture; +import org.junit.jupiter.api.Test; public class FixerClientTest { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManagerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManagerTest.java index 4c980eced..3e86aae85 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManagerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/limits/RateLimitChallengeManagerTest.java @@ -7,7 +7,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoInteractions; import static org.mockito.Mockito.when; -import java.util.List; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.params.ParameterizedTest; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/NstatCountersTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/NstatCountersTest.java index b1b565af9..3534b5768 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/NstatCountersTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/NstatCountersTest.java @@ -5,6 +5,12 @@ package org.whispersystems.textsecuregcm.metrics; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.io.IOException; +import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -13,12 +19,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.whispersystems.textsecuregcm.metrics.NstatCounters.NetworkStatistics; -import java.io.IOException; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.*; -import static org.junit.jupiter.api.Assumptions.assumeTrue; - class NstatCountersTest { @Test diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScriptTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScriptTest.java index feccf3bb7..22d731321 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScriptTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/redis/ClusterLuaScriptTest.java @@ -20,8 +20,6 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.whispersystems.textsecuregcm.tests.util.RedisClusterHelper; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java index ac34653dd..a689df864 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/CertificateControllerTest.java @@ -19,7 +19,6 @@ import io.dropwizard.testing.junit5.DropwizardExtensionsSupport; import io.dropwizard.testing.junit5.ResourceExtension; import java.io.IOException; import java.util.Base64; -import java.util.Optional; import java.util.UUID; import javax.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java index b02d87b5c..cfbf8c1e1 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/KeysControllerTest.java @@ -52,7 +52,6 @@ import org.whispersystems.textsecuregcm.entities.PreKeyState; import org.whispersystems.textsecuregcm.entities.SignedPreKey; import org.whispersystems.textsecuregcm.limits.RateLimiter; import org.whispersystems.textsecuregcm.limits.RateLimiters; -import org.whispersystems.textsecuregcm.mappers.RateLimitChallengeExceptionMapper; import org.whispersystems.textsecuregcm.mappers.RateLimitExceededExceptionMapper; import org.whispersystems.textsecuregcm.mappers.ServerRejectedExceptionMapper; import org.whispersystems.textsecuregcm.storage.Account; diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/JsonHelpers.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/JsonHelpers.java index dc368c0fb..3205f2a6f 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/JsonHelpers.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/JsonHelpers.java @@ -5,16 +5,13 @@ package org.whispersystems.textsecuregcm.tests.util; -import com.fasterxml.jackson.core.JsonParseException; +import static io.dropwizard.testing.FixtureHelpers.fixture; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; - -import org.whispersystems.textsecuregcm.util.SystemMapper; - import java.io.IOException; - -import static io.dropwizard.testing.FixtureHelpers.fixture; +import org.whispersystems.textsecuregcm.util.SystemMapper; public class JsonHelpers { diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/ValidNumberTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/ValidNumberTest.java index 475c835a1..669794aad 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/ValidNumberTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/util/ValidNumberTest.java @@ -5,21 +5,16 @@ package org.whispersystems.textsecuregcm.tests.util; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; import org.whispersystems.textsecuregcm.util.ImpossiblePhoneNumberException; import org.whispersystems.textsecuregcm.util.NonNormalizedPhoneNumberException; import org.whispersystems.textsecuregcm.util.Util; -import java.util.stream.Stream; - -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; - class ValidNumberTest { @ParameterizedTest diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java index 2a1430990..2f80ff784 100644 --- a/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java +++ b/service/src/test/java/org/whispersystems/textsecuregcm/websocket/WebSocketConnectionTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.whispersystems.textsecuregcm.entities.MessageProtos.Envelope; -import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import io.dropwizard.auth.basic.BasicCredentials; import io.lettuce.core.RedisException; @@ -45,8 +44,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.lang3.RandomStringUtils; import org.eclipse.jetty.websocket.api.UpgradeRequest; -import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer;