DumbClientSmartServerTest: Open auto-closeable resources in try-with-resource

Change-Id: I599c6e274fe80af7bfd2205f56f469c22d1dd3e0
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>

diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java
index 727f9bab003fd6b8807d6b92f445d5f1bce79ebf..4ff81c5474d04eeb2f3601921b4b2f1dd93383e3 100644 (file)
--- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java
+++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/DumbClientSmartServerTest.java
@@ -140,9 +140,8 @@ public class DumbClientSmartServerTest extends HttpTestCase {
                assertEquals("http", remoteURI.getScheme());
 
                Map<String, Ref> map;
-               Transport t = Transport.open(dst, remoteURI);
+               try (Transport t = Transport.open(dst, remoteURI)) {
                ((TransportHttp) t).setUseSmartHttp(false);
-               try {
                        // I didn't make up these public interface names, I just
                        // approved them for inclusion into the code base. Sorry.
                        // --spearce
@@ -150,14 +149,9 @@ public class DumbClientSmartServerTest extends HttpTestCase {
                        assertTrue("isa TransportHttp", t instanceof TransportHttp);
                        assertTrue("isa HttpTransport", t instanceof HttpTransport);
 
-                       FetchConnection c = t.openFetch();
-                       try {
+                       try (FetchConnection c = t.openFetch()) {
                                map = c.getRefsMap();
-                       } finally {
-                               c.close();
                        }
-               } finally {
-                       t.close();
                }
 
                assertNotNull("have map of refs", map);
@@ -201,12 +195,9 @@ public class DumbClientSmartServerTest extends HttpTestCase {
                Repository dst = createBareRepository();
                assertFalse(dst.hasObject(A_txt));
 
-               Transport t = Transport.open(dst, remoteURI);
+               try (Transport t = Transport.open(dst, remoteURI)) {
                ((TransportHttp) t).setUseSmartHttp(false);
-               try {
                        t.fetch(NullProgressMonitor.INSTANCE, mirror(master));
-               } finally {
-                       t.close();
                }
 
                assertTrue(dst.hasObject(A_txt));
@@ -229,12 +220,9 @@ public class DumbClientSmartServerTest extends HttpTestCase {
                Repository dst = createBareRepository();
                assertFalse(dst.hasObject(A_txt));
 
-               Transport t = Transport.open(dst, remoteURI);
-               ((TransportHttp) t).setUseSmartHttp(false);
-               try {
+               try (Transport t = Transport.open(dst, remoteURI)) {
+                       ((TransportHttp) t).setUseSmartHttp(false);
                        t.fetch(NullProgressMonitor.INSTANCE, mirror(master));
-               } finally {
-                       t.close();
                }
 
                assertTrue(dst.hasObject(A_txt));
@@ -265,9 +253,8 @@ public class DumbClientSmartServerTest extends HttpTestCase {
                final RevCommit Q = src.commit().create();
                final Repository db = src.getRepository();
 
-               Transport t = Transport.open(db, remoteURI);
-               ((TransportHttp) t).setUseSmartHttp(false);
-               try {
+               try (Transport t = Transport.open(db, remoteURI)) {
+                       ((TransportHttp) t).setUseSmartHttp(false);
                        try {
                                t.push(NullProgressMonitor.INSTANCE, push(src, Q));
                                fail("push incorrectly completed against a smart server");
@@ -275,8 +262,6 @@ public class DumbClientSmartServerTest extends HttpTestCase {
                                String exp = "smart HTTP push disabled";
                                assertEquals(exp, nse.getMessage());
                        }
-               } finally {
-                       t.close();
                }
        }
 }