From dfc96aebe0714e181afce789cac292324f36b639 Mon Sep 17 00:00:00 2001 From: Peter Nied Date: Wed, 24 Apr 2024 21:06:06 +0000 Subject: [PATCH] spotless fixes Signed-off-by: Peter Nied --- .../security/transport/SecurityInterceptor.java | 1 - .../opensearch/security/support/Base64HelperTest.java | 10 ++++------ .../security/transport/SecurityInterceptorTests.java | 2 -- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/opensearch/security/transport/SecurityInterceptor.java b/src/main/java/org/opensearch/security/transport/SecurityInterceptor.java index a3a73d265c..f55d9ac338 100644 --- a/src/main/java/org/opensearch/security/transport/SecurityInterceptor.java +++ b/src/main/java/org/opensearch/security/transport/SecurityInterceptor.java @@ -39,7 +39,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.opensearch.Version; import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsAction; import org.opensearch.action.admin.cluster.shards.ClusterSearchShardsResponse; import org.opensearch.action.get.GetRequest; diff --git a/src/test/java/org/opensearch/security/support/Base64HelperTest.java b/src/test/java/org/opensearch/security/support/Base64HelperTest.java index 01bcc9ab90..32d96767d8 100644 --- a/src/test/java/org/opensearch/security/support/Base64HelperTest.java +++ b/src/test/java/org/opensearch/security/support/Base64HelperTest.java @@ -17,8 +17,8 @@ import org.junit.Assert; import org.junit.Test; -import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.closeTo; +import static org.hamcrest.Matchers.equalTo; import static org.opensearch.security.support.Base64Helper.deserializeObject; import static org.opensearch.security.support.Base64Helper.serializeObject; import static org.junit.Assert.assertThat; @@ -59,18 +59,16 @@ public void testDuplicatedItemSizes() { var largeObject = new HashMap(); var hm = new HashMap<>(); IntStream.range(0, 100).forEach(i -> { hm.put("c" + i, "cvalue" + i); }); - IntStream.range(0, 100).forEach(i -> { - largeObject.put("b" + i, hm); - }); + IntStream.range(0, 100).forEach(i -> { largeObject.put("b" + i, hm); }); final var jdkSerialized = Base64Helper.serializeObject(largeObject, true); final var customSerialized = Base64Helper.serializeObject(largeObject, false); final var customSerializedOnlyHashMap = Base64Helper.serializeObject(hm, false); assertThat(jdkSerialized.length(), equalTo(3832)); - // The custom serializer is ~50x larger than the jdk serialized version + // The custom serializer is ~50x larger than the jdk serialized version assertThat(customSerialized.length(), equalTo(184792)); // Show that the majority of the size of the custom serialized large object is the map duplicated ~100 times - assertThat( (double)customSerializedOnlyHashMap.length(), closeTo(customSerialized.length() / 100, 70d)); + assertThat((double) customSerializedOnlyHashMap.length(), closeTo(customSerialized.length() / 100, 70d)); } } diff --git a/src/test/java/org/opensearch/security/transport/SecurityInterceptorTests.java b/src/test/java/org/opensearch/security/transport/SecurityInterceptorTests.java index 35eb30cadd..8d902ed498 100644 --- a/src/test/java/org/opensearch/security/transport/SecurityInterceptorTests.java +++ b/src/test/java/org/opensearch/security/transport/SecurityInterceptorTests.java @@ -13,8 +13,6 @@ import java.net.InetSocketAddress; import java.net.UnknownHostException; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference;