From cc13243cd39426ba34f8da04d5f2200e02734289 Mon Sep 17 00:00:00 2001 From: strangelookingnerd <49242855+strangelookingnerd@users.noreply.github.com> Date: Thu, 27 Jun 2024 10:49:05 +0200 Subject: [PATCH] Minor code cleanup --- .../cache/TestByteArrayCacheEntrySerializer.java | 13 ------------- .../cache/TestCachedResponseSuitabilityChecker.java | 3 --- .../http/impl/cache/TestCachingExecChain.java | 2 +- .../TestHttpByteArrayCacheEntrySerializer.java | 4 ++-- .../http/impl/cache/TestProtocolRequirements.java | 2 -- .../async/TestHttp1AsyncStatefulConnManagement.java | 1 - .../testing/sync/TestClientAuthentication.java | 2 -- .../client5/testing/sync/TestConnectionReuse.java | 2 -- .../hc/client5/testing/sync/TestContentCodings.java | 1 - .../testing/sync/TestDefaultClientTlsStrategy.java | 3 --- .../sync/TestFutureRequestExecutionService.java | 1 - .../sync/TestMinimalClientRequestExecution.java | 2 -- .../testing/sync/TestStatefulConnManagement.java | 3 --- .../http/examples/AsyncClientH2ServerPush.java | 2 -- .../examples/AsyncClientHttpExchangeStreaming.java | 2 -- .../http/examples/AsyncClientInterceptors.java | 2 -- .../client5/http/examples/ClientInterceptors.java | 2 -- .../http/impl/classic/TestHttpRequestRetryExec.java | 2 +- .../http/impl/classic/TestMainClientExec.java | 2 +- .../apache/hc/client5/http/utils/TestDateUtils.java | 6 ------ 20 files changed, 5 insertions(+), 52 deletions(-) diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java index 57d2d64ad1..c46e047020 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestByteArrayCacheEntrySerializer.java @@ -32,10 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; -import java.math.BigDecimal; import java.time.Instant; import java.util.Date; import java.util.HashSet; @@ -249,15 +245,6 @@ private static void assertIsAllowedClassNameFalse(final String className) { assertFalse(ByteArrayCacheEntrySerializer.RestrictedObjectInputStream.isAllowedClassName(className)); } - private byte[] serializeProhibitedObject() throws IOException { - final BigDecimal bigDecimal = new BigDecimal("1000.00"); - final ByteArrayOutputStream baos = new ByteArrayOutputStream(); - try (ObjectOutputStream oos = new ObjectOutputStream(baos)) { - oos.writeObject(bigDecimal); - } - return baos.toByteArray(); - } - public void readWriteVerify(final HttpCacheStorageEntry writeEntry) throws Exception { // write the entry final byte[] bytes = impl.serialize(writeEntry); diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java index 899dc51073..416fe15f3c 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachedResponseSuitabilityChecker.java @@ -436,9 +436,6 @@ void testSuitableForGETIfHeadResponseCachingEnabledAndEntryDoesNotSpecifyAReques void testSuitableForHEADIfHeadResponseCachingEnabledAndEntryDoesNotSpecifyARequestMethod() { final HttpRequest headRequest = new BasicHttpRequest("HEAD", "/foo"); impl = new CachedResponseSuitabilityChecker(CacheConfig.custom().build()); - final Header[] headers = { - - }; entry = makeEntry(Method.GET, "/foo", new BasicHeader("Date", DateUtils.formatStandardDate(tenSecondsAgo))); responseCacheControl = ResponseCacheControl.builder() diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java index 9a8592ec19..c76b1ece05 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java @@ -1279,7 +1279,7 @@ void testNoCacheFieldsRevalidation() throws Exception { Mockito.when(mockExecChain.proceed(Mockito.any(), Mockito.any())).thenReturn(resp2); execute(req2); - final ClassicHttpResponse result = execute(req3); + execute(req3); // Verify that the backend was called to revalidate the response, as per the new logic Mockito.verify(mockExecChain, Mockito.times(5)).proceed(Mockito.any(), Mockito.any()); diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpByteArrayCacheEntrySerializer.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpByteArrayCacheEntrySerializer.java index 7a60f31db8..a3f8dff078 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpByteArrayCacheEntrySerializer.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestHttpByteArrayCacheEntrySerializer.java @@ -261,7 +261,7 @@ void testInvalidHeaderCacheEntry() { "Cache-control: public, max-age=31536000\n" + "\n" + "Hello World"; - final byte[] bytes2 = content1.getBytes(StandardCharsets.UTF_8); + final byte[] bytes2 = content2.getBytes(StandardCharsets.UTF_8); final ResourceIOException exception2 = Assertions.assertThrows(ResourceIOException.class, () -> httpCacheEntrySerializer.deserialize(bytes2)); Assertions.assertEquals("Invalid cache header format", exception2.getMessage()); @@ -432,7 +432,7 @@ void testDeserializeCacheEntryWithTrailingGarbage() { final byte[] bytes2 = content2.getBytes(StandardCharsets.UTF_8); final ResourceIOException exception2 = Assertions.assertThrows(ResourceIOException.class, () -> httpCacheEntrySerializer.deserialize(bytes2)); - Assertions.assertEquals("Unexpected content at the end of cache content", exception1.getMessage()); + Assertions.assertEquals("Unexpected content at the end of cache content", exception2.getMessage()); } static HeapResource load(final URL resource) throws IOException { diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java index 02d22a80cd..08fb1e2c76 100644 --- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java +++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java @@ -465,8 +465,6 @@ void test304GeneratedFromCacheOnWeakValidatorDoesNotIncludeOtherEntityHeaders() @Test void testNotModifiedOfNonCachedEntityShouldRevalidateWithUnconditionalGET() throws Exception { - final Instant now = Instant.now(); - // load cache with cacheable entry final ClassicHttpRequest req1 = new BasicClassicHttpRequest("GET", "/"); final ClassicHttpResponse resp1 = HttpTestUtils.make200Response(); diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java index 651539ff33..7eff2c1bc8 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/async/TestHttp1AsyncStatefulConnManagement.java @@ -39,7 +39,6 @@ import org.apache.hc.client5.testing.extension.async.TestAsyncClient; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.EndpointDetails; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.HttpStatus; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java index d54f252232..c3b0987b5a 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestClientAuthentication.java @@ -29,7 +29,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.io.ByteArrayInputStream; -import java.io.IOException; import java.nio.charset.StandardCharsets; import java.security.SecureRandom; import java.util.Arrays; @@ -71,7 +70,6 @@ import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HeaderElements; import org.apache.hc.core5.http.HttpEntity; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java index 3b11dd0d36..74f8a06946 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestConnectionReuse.java @@ -28,7 +28,6 @@ package org.apache.hc.client5.testing.sync; import java.io.ByteArrayInputStream; -import java.io.IOException; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -46,7 +45,6 @@ import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HeaderElements; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java index 8a5e4c1c1f..5103c97565 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestContentCodings.java @@ -50,7 +50,6 @@ import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.HeaderElement; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.URIScheme; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestDefaultClientTlsStrategy.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestDefaultClientTlsStrategy.java index 736e21f6d2..6cc605094b 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestDefaultClientTlsStrategy.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestDefaultClientTlsStrategy.java @@ -32,9 +32,6 @@ import java.io.IOException; import java.net.InetAddress; import java.net.Socket; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; import java.util.Objects; import javax.net.ssl.HostnameVerifier; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestFutureRequestExecutionService.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestFutureRequestExecutionService.java index 3a366ca12b..1c40f580f2 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestFutureRequestExecutionService.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestFutureRequestExecutionService.java @@ -28,7 +28,6 @@ import static org.hamcrest.MatcherAssert.assertThat; -import java.io.IOException; import java.util.LinkedList; import java.util.Queue; import java.util.concurrent.CancellationException; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java index ad213718ec..b15669a57d 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestMinimalClientRequestExecution.java @@ -26,7 +26,6 @@ */ package org.apache.hc.client5.testing.sync; -import java.io.IOException; import java.util.HashSet; import java.util.Locale; import java.util.Set; @@ -38,7 +37,6 @@ import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.Header; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpStatus; diff --git a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java index b0d631f77d..a4f0273c2c 100644 --- a/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java +++ b/httpclient5-testing/src/test/java/org/apache/hc/client5/testing/sync/TestStatefulConnManagement.java @@ -26,8 +26,6 @@ */ package org.apache.hc.client5.testing.sync; -import java.io.IOException; - import org.apache.hc.client5.http.UserTokenHandler; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; @@ -38,7 +36,6 @@ import org.apache.hc.core5.http.ClassicHttpRequest; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.EndpointDetails; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpStatus; import org.apache.hc.core5.http.URIScheme; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientH2ServerPush.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientH2ServerPush.java index 49c752a1f6..676aed477d 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientH2ServerPush.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientH2ServerPush.java @@ -26,7 +26,6 @@ */ package org.apache.hc.client5.http.examples; -import java.io.IOException; import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.util.concurrent.Future; @@ -39,7 +38,6 @@ import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder; import org.apache.hc.core5.function.Supplier; import org.apache.hc.core5.http.ContentType; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.impl.routing.RequestRouter; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java index 79e5acd1f2..38685db5dc 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientHttpExchangeStreaming.java @@ -26,7 +26,6 @@ */ package org.apache.hc.client5.http.examples; -import java.io.IOException; import java.nio.CharBuffer; import java.util.concurrent.Future; @@ -34,7 +33,6 @@ import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient; import org.apache.hc.client5.http.impl.async.HttpAsyncClients; import org.apache.hc.core5.http.ContentType; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpHost; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.message.BasicHttpRequest; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java index 3b1dd4c0a0..550265b8fe 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/AsyncClientInterceptors.java @@ -27,7 +27,6 @@ package org.apache.hc.client5.http.examples; -import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.concurrent.Future; @@ -43,7 +42,6 @@ import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.Header; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpRequestInterceptor; import org.apache.hc.core5.http.HttpResponse; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientInterceptors.java b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientInterceptors.java index 6256240560..9d9f9a66cc 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientInterceptors.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/examples/ClientInterceptors.java @@ -27,7 +27,6 @@ package org.apache.hc.client5.http.examples; -import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; import org.apache.hc.client5.http.classic.methods.HttpGet; @@ -38,7 +37,6 @@ import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.EntityDetails; import org.apache.hc.core5.http.Header; -import org.apache.hc.core5.http.HttpException; import org.apache.hc.core5.http.HttpRequest; import org.apache.hc.core5.http.HttpRequestInterceptor; import org.apache.hc.core5.http.HttpStatus; diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestHttpRequestRetryExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestHttpRequestRetryExec.java index 1792387d2d..5672587c50 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestHttpRequestRetryExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestHttpRequestRetryExec.java @@ -111,7 +111,7 @@ void testRetrySleepOnIOException() throws Exception { final HttpGet request = new HttpGet("/test"); final HttpClientContext context = HttpClientContext.create(); - final ClassicHttpResponse response = Mockito.mock(ClassicHttpResponse.class); + Mockito.mock(ClassicHttpResponse.class); Mockito.when(chain.proceed( Mockito.same(request), diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestMainClientExec.java b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestMainClientExec.java index aa40efb933..aa58ff1263 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestMainClientExec.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/impl/classic/TestMainClientExec.java @@ -100,7 +100,7 @@ void testFundamentals() throws Exception { Mockito.any())).thenReturn(response); final ExecChain.Scope scope = new ExecChain.Scope("test", route, request, execRuntime, context); - final ClassicHttpResponse finalResponse = mainClientExec.execute(request, scope, null); + mainClientExec.execute(request, scope, null); Mockito.verify(httpProcessor).process(request, null, context); Mockito.verify(execRuntime).execute(Mockito.eq("test"), Mockito.same(request), Mockito.any(), Mockito.any()); diff --git a/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java index 67eef84755..531febeef2 100644 --- a/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java +++ b/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestDateUtils.java @@ -33,7 +33,6 @@ import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; -import java.util.Date; import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.message.BasicHeader; @@ -50,11 +49,6 @@ private static Instant createInstant(final int year, final Month month, final in return LocalDate.of(year, month, day).atStartOfDay(ZoneId.of("GMT")).toInstant(); } - private static Date createDate(final int year, final Month month, final int day) { - final Instant instant = createInstant(year, month, day); - return new Date(instant.toEpochMilli()); - } - @Test void testBasicDateParse() { final Instant instant = createInstant(2005, Month.OCTOBER, 14);