Remove AutoCloseable from internal PackFile and friends

PackFile is held by the block cache and cannot be auto closed in a
try-with-resources statement.  Remove the interface as JGit does
explicit management of the instances.

ObjectDatabase and RefDatabase are internal details of Repository
and are managed with the Repository. Marking them AutoCloseable
provides no value to the library or an application using the API.

Change-Id: Ibee19eadd66233e6666b601583daa1834a7778f1

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
index 45e9fc15585218354fe11d038647622afac20fa5..58df895b4e35f4d0da0213349fb31f218a4c01fd 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java
@@ -88,7 +88,7 @@ import org.eclipse.jgit.util.LongList;
  * delta packed format yielding high compression of lots of object where some
  * objects are similar.
  */
-public final class DfsPackFile implements AutoCloseable {
+public final class DfsPackFile {
        /**
         * File offset used to cache {@link #index} in {@link DfsBlockCache}.
         * <p>

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
index 223689b0f6cb9fbf3a193ba801ae9d62dd1656ad..eb2293874f71519bb595dc0f559c2262179d2a91 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java
@@ -89,8 +89,7 @@ import org.eclipse.jgit.util.RawParseUtils;
  * delta packed format yielding high compression of lots of object where some
  * objects are similar.
  */
-public class PackFile implements Iterable<PackIndex.MutableEntry>,
-               AutoCloseable {
+public class PackFile implements Iterable<PackIndex.MutableEntry> {
        /** Sorts PackFiles to be most recently created to least recently created. */
        public static final Comparator<PackFile> SORT = new Comparator<PackFile>() {
                public int compare(final PackFile a, final PackFile b) {

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectDatabase.java
index 3e77a101811c6972669d77377978cf03c79752b4..0cc51d1a52d9da2ba50890dd59412ee6ba52769e 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectDatabase.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectDatabase.java
@@ -54,7 +54,7 @@ import org.eclipse.jgit.errors.MissingObjectException;
  * An object database stores one or more Git objects, indexed by their unique
  * {@link ObjectId}.
  */
-public abstract class ObjectDatabase implements AutoCloseable {
+public abstract class ObjectDatabase {
        /** Initialize a new database instance for access. */
        protected ObjectDatabase() {
                // Protected to force extension.

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java
index b10f8063ac5ab60491b0e9ea737e219818f3c0f7..7fea880612c28373a00c1b0e8beb8c43a80c36a8 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java
@@ -57,7 +57,7 @@ import java.util.Map;
  * Every {@link Repository} has a single reference database, mapping names to
  * the tips of the object graph contained by the {@link ObjectDatabase}.
  */
-public abstract class RefDatabase implements AutoCloseable {
+public abstract class RefDatabase {
        /**
         * Order of prefixes to search when using non-absolute references.
         * <p>