You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2020/11/24 14:22:38 UTC

[httpcomponents-client] 01/06: Use try-with-resources.

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git

commit 460abd7474e1a700f387298dedfb9fc217388389
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Nov 23 10:43:21 2020 -0500

    Use try-with-resources.
---
 .../impl/cache/HttpByteArrayCacheEntrySerializerTestUtils.java    | 8 +-------
 .../http/impl/cache/TestByteArrayCacheEntrySerializer.java        | 5 +----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpByteArrayCacheEntrySerializerTestUtils.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpByteArrayCacheEntrySerializerTestUtils.java
index 2b71e84..23767c5 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpByteArrayCacheEntrySerializerTestUtils.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/HttpByteArrayCacheEntrySerializerTestUtils.java
@@ -283,14 +283,8 @@ class HttpByteArrayCacheEntrySerializerTestUtils {
     static void saveEntryToFile(final HttpCacheEntrySerializer<byte[]> serializer, final HttpCacheStorageEntry httpCacheStorageEntry, final File outFile) throws Exception {
         final byte[] bytes = serializer.serialize(httpCacheStorageEntry);
 
-        OutputStream out = null;
-        try {
-            out = new FileOutputStream(outFile);
+        try (OutputStream out = new FileOutputStream(outFile)) {
             out.write(bytes);
-        } finally {
-            if (out != null) {
-                out.close();
-            }
         }
     }
 
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 ccdedf9..2ea0e44 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
@@ -240,11 +240,8 @@ public class TestByteArrayCacheEntrySerializer {
     private byte[] serializeProhibitedObject() throws IOException {
         final BigDecimal bigDecimal = new BigDecimal("1000.00");
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        final ObjectOutputStream oos = new ObjectOutputStream(baos);
-        try {
+        try (ObjectOutputStream oos = new ObjectOutputStream(baos)) {
             oos.writeObject(bigDecimal);
-        } finally {
-            oos.close();
         }
         return baos.toByteArray();
     }