Suppress resource warnings with Java 7

For streams that should not be closed, i.e. don't own an underlying
stream, and in-memory streams that do not need to be closed we just
suppress the warning. This mostly apply to test cases. GC is enough.

For streams with external resources (i.e. files) we add the necessary
call to close().

Change-Id: I4d883ba2e7d07f199fe57ccb3459ece00441a570

org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java

@@ -297,6 +297,7 @@ public class GitSmartHttpTools {
 
 	private static void writeSideBand(OutputStream out, String textForGit)
 			throws IOException {
+		@SuppressWarnings("resource" /* java 7 */)
 		OutputStream msg = new SideBandOutputStream(CH_ERROR, SMALL_BUF, out);
 		msg.write(Constants.encode("error: " + textForGit));
 		msg.flush();

org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java

@@ -119,6 +119,7 @@ class ShowPackDelta extends TextBuiltin {
 			ptr++;
 		ptr++;
 
+		@SuppressWarnings("resource" /* java 7 */)
 		TemporaryBuffer.Heap raw = new TemporaryBuffer.Heap(bufArray.length);
 		InflaterInputStream inf = new InflaterInputStream(
 				new ByteArrayInputStream(bufArray, ptr, bufArray.length));

org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CheckoutCommandTest.java

@@ -162,8 +162,9 @@ public class CheckoutCommandTest extends RepositoryTestCase {
 		} catch (IOException e) {
 			// the test makes only sense if deletion of
 			// a file with open stream fails
+		} finally {
+			fis.close();
 		}
-		fis.close();
 		FileUtils.delete(testFile);
 		CheckoutCommand co = git.checkout();
 		// delete Test.txt in branch test

org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/FileRepositoryBuilderTest.java

@@ -112,6 +112,7 @@ public class FileRepositoryBuilderTest extends LocalDiskRepositoryTestCase {
 		}
 	}
 
+	@SuppressWarnings("resource" /* java 7 */)
 	@Test
 	public void absoluteGitDirRef() throws Exception {
 		FileRepository repo1 = createWorkRepository();
@@ -129,6 +130,7 @@ public class FileRepositoryBuilderTest extends LocalDiskRepositoryTestCase {
 		assertEquals(dir, repo2.getWorkTree());
 	}
 
+	@SuppressWarnings("resource" /* java 7 */)
 	@Test
 	public void relativeGitDirRef() throws Exception {
 		FileRepository repo1 = createWorkRepository();
@@ -147,6 +149,7 @@ public class FileRepositoryBuilderTest extends LocalDiskRepositoryTestCase {
 		assertEquals(dir, repo2.getWorkTree());
 	}
 
+	@SuppressWarnings("resource" /* java 7 */)
 	@Test
 	public void scanWithGitDirRef() throws Exception {
 		FileRepository repo1 = createWorkRepository();

org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleWalkTest.java

@@ -128,6 +128,7 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
 		assertFalse(gen.next());
 	}
 
+	@SuppressWarnings("resource" /* java 7 */)
 	@Test
 	public void repositoryWithRootLevelSubmoduleAbsoluteRef()
 			throws IOException, ConfigInvalidException {
@@ -176,6 +177,7 @@ public class SubmoduleWalkTest extends RepositoryTestCase {
 		assertFalse(gen.next());
 	}
 
+	@SuppressWarnings("resource" /* java 7 */)
 	@Test
 	public void repositoryWithRootLevelSubmoduleRelativeRef()
 			throws IOException, ConfigInvalidException {

org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/SideBandOutputStreamTest.java

@@ -78,8 +78,9 @@ public class SideBandOutputStreamTest {
 
 	@Test
 	public void testWrite_CH_DATA() throws IOException {
-		final SideBandOutputStream out;
+		@SuppressWarnings("resource" /* java 7 */)
-		out = new SideBandOutputStream(CH_DATA, SMALL_BUF, rawOut);
+		final SideBandOutputStream out = new SideBandOutputStream(CH_DATA,
+				SMALL_BUF, rawOut);
 		out.write(new byte[] { 'a', 'b', 'c' });
 		out.flush();
 		assertBuffer("0008\001abc");
@@ -87,8 +88,9 @@ public class SideBandOutputStreamTest {
 
 	@Test
 	public void testWrite_CH_PROGRESS() throws IOException {
-		final SideBandOutputStream out;
+		@SuppressWarnings("resource" /* java 7 */)
-		out = new SideBandOutputStream(CH_PROGRESS, SMALL_BUF, rawOut);
+		final SideBandOutputStream out = new SideBandOutputStream(CH_PROGRESS,
+				SMALL_BUF, rawOut);
 		out.write(new byte[] { 'a', 'b', 'c' });
 		out.flush();
 		assertBuffer("0008\002abc");
@@ -96,8 +98,9 @@ public class SideBandOutputStreamTest {
 
 	@Test
 	public void testWrite_CH_ERROR() throws IOException {
-		final SideBandOutputStream out;
+		@SuppressWarnings("resource" /* java 7 */)
-		out = new SideBandOutputStream(CH_ERROR, SMALL_BUF, rawOut);
+		final SideBandOutputStream out = new SideBandOutputStream(CH_ERROR,
+				SMALL_BUF, rawOut);
 		out.write(new byte[] { 'a', 'b', 'c' });
 		out.flush();
 		assertBuffer("0008\003abc");
@@ -105,8 +108,9 @@ public class SideBandOutputStreamTest {
 
 	@Test
 	public void testWrite_Small() throws IOException {
-		final SideBandOutputStream out;
+		@SuppressWarnings("resource" /* java 7 */)
-		out = new SideBandOutputStream(CH_DATA, SMALL_BUF, rawOut);
+		final SideBandOutputStream out = new SideBandOutputStream(CH_DATA,
+				SMALL_BUF, rawOut);
 		out.write('a');
 		out.write('b');
 		out.write('c');
@@ -116,8 +120,9 @@ public class SideBandOutputStreamTest {
 
 	@Test
 	public void testWrite_SmallBlocks1() throws IOException {
-		final SideBandOutputStream out;
+		@SuppressWarnings("resource" /* java 7 */)
-		out = new SideBandOutputStream(CH_DATA, 6, rawOut);
+		final SideBandOutputStream out = new SideBandOutputStream(CH_DATA, 6,
+				rawOut);
 		out.write('a');
 		out.write('b');
 		out.write('c');
@@ -127,8 +132,9 @@ public class SideBandOutputStreamTest {
 
 	@Test
 	public void testWrite_SmallBlocks2() throws IOException {
-		final SideBandOutputStream out;
+		@SuppressWarnings("resource" /* java 7 */)
-		out = new SideBandOutputStream(CH_DATA, 6, rawOut);
+		final SideBandOutputStream out = new SideBandOutputStream(CH_DATA, 6,
+				rawOut);
 		out.write(new byte[] { 'a', 'b', 'c' });
 		out.flush();
 		assertBuffer("0006\001a0006\001b0006\001c");
@@ -136,8 +142,9 @@ public class SideBandOutputStreamTest {
 
 	@Test
 	public void testWrite_SmallBlocks3() throws IOException {
-		final SideBandOutputStream out;
+		@SuppressWarnings("resource" /* java 7 */)
-		out = new SideBandOutputStream(CH_DATA, 7, rawOut);
+		final SideBandOutputStream out = new SideBandOutputStream(CH_DATA, 7,
+				rawOut);
 		out.write('a');
 		out.write(new byte[] { 'b', 'c' });
 		out.flush();
@@ -152,8 +159,9 @@ public class SideBandOutputStreamTest {
 			buf[i] = (byte) i;
 		}
 
-		final SideBandOutputStream out;
+		@SuppressWarnings("resource" /* java 7 */)
-		out = new SideBandOutputStream(CH_DATA, MAX_BUF, rawOut);
+		final SideBandOutputStream out = new SideBandOutputStream(CH_DATA,
+				MAX_BUF, rawOut);
 		out.write(buf);
 		out.flush();
 
@@ -167,6 +175,7 @@ public class SideBandOutputStreamTest {
 		}
 	}
 
+	@SuppressWarnings("resource" /* java 7 */)
 	@Test
 	public void testFlush() throws IOException {
 		final int[] flushCnt = new int[1];

org.eclipse.jgit.test/tst/org/eclipse/jgit/util/TemporaryBufferTest.java

@@ -353,6 +353,7 @@ public class TemporaryBufferTest {
 
 	@Test
 	public void testDestroyWhileOpen() throws IOException {
+		@SuppressWarnings("resource" /* java 7 */)
 		final TemporaryBuffer b = new TemporaryBuffer.LocalFile();
 		try {
 			b.write(new TestRng(getName())
@@ -411,6 +412,7 @@ public class TemporaryBufferTest {
 
 	@Test
 	public void testHeap() throws IOException {
+		@SuppressWarnings("resource" /* java 7 */)
 		final TemporaryBuffer b = new TemporaryBuffer.Heap(2 * 8 * 1024);
 		final byte[] r = new byte[8 * 1024];
 		b.write(r);

org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/EolCanonicalizingInputStreamTest.java

@@ -121,7 +121,9 @@ public class EolCanonicalizingInputStreamTest {
 			}
 
 			assertEquals(expected.length, read);
+			cis2.close();
 		}
+		cis1.close();
 	}
 
 	private static byte[] asBytes(String in) {

org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/UnionInputStreamTest.java

@@ -69,6 +69,7 @@ public class UnionInputStreamTest {
 
 	@Test
 	public void testReadSingleBytes() throws IOException {
+		@SuppressWarnings("resource" /* java 7 */)
 		final UnionInputStream u = new UnionInputStream();
 
 		assertTrue(u.isEmpty());
@@ -101,6 +102,7 @@ public class UnionInputStreamTest {
 
 	@Test
 	public void testReadByteBlocks() throws IOException {
+		@SuppressWarnings("resource" /* java 7 */)
 		final UnionInputStream u = new UnionInputStream();
 		u.add(new ByteArrayInputStream(new byte[] { 1, 0, 2 }));
 		u.add(new ByteArrayInputStream(new byte[] { 3 }));
@@ -124,6 +126,7 @@ public class UnionInputStreamTest {
 
 	@Test
 	public void testArrayConstructor() throws IOException {
+		@SuppressWarnings("resource" /* java 7 */)
 		final UnionInputStream u = new UnionInputStream(
 				new ByteArrayInputStream(new byte[] { 1, 0, 2 }),
 				new ByteArrayInputStream(new byte[] { 3 }),
@@ -141,6 +144,7 @@ public class UnionInputStreamTest {
 
 	@Test
 	public void testMarkSupported() {
+		@SuppressWarnings("resource" /* java 7 */)
 		final UnionInputStream u = new UnionInputStream();
 		assertFalse(u.markSupported());
 		u.add(new ByteArrayInputStream(new byte[] { 1, 0, 2 }));
@@ -149,6 +153,7 @@ public class UnionInputStreamTest {
 
 	@Test
 	public void testSkip() throws IOException {
+		@SuppressWarnings("resource" /* java 7 */)
 		final UnionInputStream u = new UnionInputStream();
 		u.add(new ByteArrayInputStream(new byte[] { 1, 0, 2 }));
 		u.add(new ByteArrayInputStream(new byte[] { 3 }));
@@ -171,6 +176,7 @@ public class UnionInputStreamTest {
 
 	@Test
 	public void testAutoCloseDuringRead() throws IOException {
+		@SuppressWarnings("resource" /* java 7 */)
 		final UnionInputStream u = new UnionInputStream();
 		final boolean closed[] = new boolean[2];
 		u.add(new ByteArrayInputStream(new byte[] { 1 }) {
@@ -248,6 +254,7 @@ public class UnionInputStreamTest {
 				throw new IOException("Expected");
 			}
 		};
+		@SuppressWarnings("resource" /* java 7 */)
 		final UnionInputStream u = new UnionInputStream(
 				new ByteArrayInputStream(new byte[]{1,2,3}),
 				errorReadStream);

org.eclipse.jgit/src/org/eclipse/jgit/storage/file/GC.java

@@ -662,6 +662,7 @@ public class GC {
 						JGitText.get().cannotCreateIndexfile, tmpIdx.getPath()));
 
 			// write the packfile
+			@SuppressWarnings("resource" /* java 7 */)
 			FileChannel channel = new FileOutputStream(tmpPack).getChannel();
 			OutputStream channelStream = Channels.newOutputStream(channel);
 			try {
@@ -673,6 +674,7 @@ public class GC {
 			}
 
 			// write the packindex
+			@SuppressWarnings("resource")
 			FileChannel idxChannel = new FileOutputStream(tmpIdx).getChannel();
 			OutputStream idxStream = Channels.newOutputStream(idxChannel);
 			try {

org.eclipse.jgit/src/org/eclipse/jgit/storage/file/ObjectDirectoryInserter.java

@@ -146,6 +146,7 @@ class ObjectDirectoryInserter extends ObjectInserter {
 		}
 	}
 
+	@SuppressWarnings("resource" /* java 7 */)
 	private File toTemp(final MessageDigest md, final int type, long len,
 			final InputStream is) throws IOException, FileNotFoundException,
 			Error {
@@ -185,6 +186,7 @@ class ObjectDirectoryInserter extends ObjectInserter {
 		}
 	}
 
+	@SuppressWarnings("resource" /* java 7 */)
 	private File toTemp(final int type, final byte[] buf, final int pos,
 			final int len) throws IOException, FileNotFoundException {
 		boolean delete = true;

org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java

@@ -1079,7 +1079,7 @@ public class UploadPack {
 
 	private boolean reportInternalServerErrorOverSideband() {
 		try {
-			@SuppressWarnings("resource")
+			@SuppressWarnings("resource" /* java 7 */)
 			SideBandOutputStream err = new SideBandOutputStream(
 					SideBandOutputStream.CH_ERROR,
 					SideBandOutputStream.SMALL_BUF,
@@ -1121,7 +1121,7 @@ public class UploadPack {
 		} catch (ServiceMayNotContinueException noPack) {
 			if (sideband && noPack.getMessage() != null) {
 				noPack.setOutput();
-				@SuppressWarnings("resource")
+				@SuppressWarnings("resource" /* java 7 */)
 				SideBandOutputStream err = new SideBandOutputStream(
 						SideBandOutputStream.CH_ERROR,
 						SideBandOutputStream.SMALL_BUF, rawOut);

org.eclipse.jgit/src/org/eclipse/jgit/util/IO.java

@@ -216,6 +216,7 @@ public class IO {
 		if (last < 0)
 			return ByteBuffer.wrap(out, 0, pos);
 
+		@SuppressWarnings("resource" /* java 7 */)
 		TemporaryBuffer.Heap tmp = new TemporaryBuffer.Heap(Integer.MAX_VALUE);
 		tmp.write(out);
 		tmp.write(last);