PackWriter: Remove constructor with only Reader as param

At construction time, PackWriter receives the PackConfig as a
parameter or reads it from the repository. The only exception is when
the constructor receives only a reader (no repo nor conf
provided?!).

Remove PackWriter(Reader) and let callers be explicit what conf to
use. This makes clearer the flow of conf in the PackWriter.

Change-Id: If12e122797ffc8c44fc3c435ca1b000ca016645b

diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java
index c95f1384e883a12fb2c58d6c29cda30d142f1c8d..74e322ff7f1ea50b3408187e08d022fc45f71f5b 100644 (file)
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java
@@ -31,6 +31,7 @@ import org.eclipse.jgit.pgm.Command;
 import org.eclipse.jgit.pgm.TextBuiltin;
 import org.eclipse.jgit.revwalk.RevObject;
 import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.storage.pack.PackConfig;
 import org.eclipse.jgit.util.TemporaryBuffer;
 import org.kohsuke.args4j.Argument;
 
@@ -68,7 +69,7 @@ class ShowPackDelta extends TextBuiltin {
                ObjectReuseAsIs asis = (ObjectReuseAsIs) reader;
                ObjectToPack target = asis.newObjectToPack(obj, obj.getType());
 
-               PackWriter pw = new PackWriter(reader) {
+               PackWriter pw = new PackWriter(new PackConfig(), reader) {
                        @Override
                        public void select(ObjectToPack otp, StoredObjectRepresentation next) {
                                otp.select(next);

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java
index bc851f8ddeedcbe990d1a57483e9f11294c5f27d..9680019f887b2081cfbe5b378240d9698cf65247 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java
@@ -41,6 +41,7 @@ import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.NullProgressMonitor;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.storage.pack.PackConfig;
 import org.eclipse.jgit.transport.ReceiveCommand;
 import org.junit.Before;
 import org.junit.Test;
@@ -309,7 +310,7 @@ public class DfsPackFileTest {
 
        private void assertPackSize() throws IOException {
                try (DfsReader ctx = db.getObjectDatabase().newReader();
-                               PackWriter pw = new PackWriter(ctx);
+                    PackWriter pw = new PackWriter(new PackConfig(), ctx);
                                ByteArrayOutputStream os = new ByteArrayOutputStream();
                                PackOutputStream out = new PackOutputStream(
                                                NullProgressMonitor.INSTANCE, os, pw)) {

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
index 4350f9791555b0a0672ddb64b36b9fe9a5bb23db..d3e30f3f6c56643ea5235683e45c880cb4af285f 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java
@@ -302,19 +302,6 @@ public class PackWriter implements AutoCloseable {
                this(repo, repo.newObjectReader());
        }
 
-       /**
-        * Create a writer to load objects from the specified reader.
-        * <p>
-        * Objects for packing are specified in {@link #preparePack(Iterator)} or
-        * {@link #preparePack(ProgressMonitor, Set, Set)}.
-        *
-        * @param reader
-        *            reader to read from the repository with.
-        */
-       public PackWriter(ObjectReader reader) {
-               this(new PackConfig(), reader);
-       }
-
        /**
         * Create writer for specified repository.
         * <p>