Use AnyLongObjectId instead of LongObjectId in LFS API

Change-Id: I083ad1ea3e8d3685df7c306854c2498c92b05ffb
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Lfs.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Lfs.java
index f099c5a761b49a484bb42ac31f1a8bd6b0276584..75e34e0f637378e9d422df6d90116c151b767564 100644 (file)
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Lfs.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Lfs.java
@@ -46,7 +46,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import org.eclipse.jgit.lfs.lib.LongObjectId;
+import org.eclipse.jgit.lfs.lib.AnyLongObjectId;
 
 /**
  * Class which represents the lfs folder hierarchy inside a .git folder
@@ -104,8 +104,8 @@ public class Lfs {
         *         underneath
         *         "<repo>/.git/lfs/objects/<firstTwoLettersOfID>/<remainingLettersOfID>"
         */
-       public Path getMediaFile(LongObjectId id) {
-               String idStr = LongObjectId.toString(id);
+       public Path getMediaFile(AnyLongObjectId id) {
+               String idStr = id.name();
                return getLfsObjDir().resolve(idStr.substring(0, 2))
                                .resolve(idStr.substring(2));
        }

diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java
index e43cb2563b3b5b7dc882b73c0e5c93f2843e8879..c0cf2337beb400e71d1ea7fb84238dac35bacb79 100644 (file)
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java
@@ -50,6 +50,7 @@ import java.io.OutputStream;
 import java.io.PrintStream;
 
 import org.eclipse.jgit.annotations.Nullable;
+import org.eclipse.jgit.lfs.lib.AnyLongObjectId;
 import org.eclipse.jgit.lfs.lib.Constants;
 import org.eclipse.jgit.lfs.lib.LongObjectId;
 
@@ -71,7 +72,7 @@ public class LfsPointer {
        public static final String HASH_FUNCTION_NAME = Constants.LONG_HASH_FUNCTION
                        .toLowerCase().replace("-", ""); //$NON-NLS-1$ //$NON-NLS-2$
 
-       private LongObjectId oid;
+       private AnyLongObjectId oid;
 
        private long size;
 
@@ -81,7 +82,7 @@ public class LfsPointer {
         * @param size
         *            the size of the content
         */
-       public LfsPointer(LongObjectId oid, long size) {
+       public LfsPointer(AnyLongObjectId oid, long size) {
                this.oid = oid;
                this.size = size;
        }
@@ -89,7 +90,7 @@ public class LfsPointer {
        /**
         * @return the id of the content
         */
-       public LongObjectId getOid() {
+       public AnyLongObjectId getOid() {
                return oid;
        }
 
@@ -112,7 +113,7 @@ public class LfsPointer {
                        ps.print("version "); //$NON-NLS-1$
                        ps.println(VERSION);
                        ps.print("oid " + HASH_FUNCTION_NAME + ":"); //$NON-NLS-1$ //$NON-NLS-2$
-                       ps.println(LongObjectId.toString(oid));
+                       ps.println(oid.name());
                        ps.print("size "); //$NON-NLS-1$
                        ps.println(size);
                }
@@ -160,7 +161,7 @@ public class LfsPointer {
 
        @Override
        public String toString() {
-               return "LfsPointer: oid=" + LongObjectId.toString(oid) + ", size=" //$NON-NLS-1$ //$NON-NLS-2$
+               return "LfsPointer: oid=" + oid.name() + ", size=" //$NON-NLS-1$ //$NON-NLS-2$
                                + size;
        }
 }