Update git-lfs-java to 0.5.0 (fix #4: multithread uploading)

bozaro · Oct 23, 2015 · d2fd13d · d2fd13d
1 parent fce590d
commit d2fd13d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,8 +23,8 @@ dependencies {
   compile "org.jgrapht:jgrapht-core:0.9.1"
   compile "com.beust:jcommander:1.35"
 
-  compile "ru.bozaro.gitlfs:gitlfs-pointer:0.4.0"
-  compile "ru.bozaro.gitlfs:gitlfs-client:0.4.0"
+  compile "ru.bozaro.gitlfs:gitlfs-pointer:0.5.0"
+  compile "ru.bozaro.gitlfs:gitlfs-client:0.5.0"
 
   testCompile "org.testng:testng:6.8.8"
 }

diff --git a/src/main/java/git/lfs/migrate/GitConverter.java b/src/main/java/git/lfs/migrate/GitConverter.java
@@ -18,6 +18,7 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Converter for git objects.
@@ -208,11 +209,7 @@ private boolean isFile(@NotNull FileMode fileMode) {
       @NotNull
       @Override
       public Iterable<TaskKey> depends() throws IOException {
-        final List<TaskKey> result = new ArrayList<>();
-        for (GitTreeEntry entry : getEntries()) {
-          result.add(entry.getTaskKey());
-        }
-        return result;
+        return getEntries().stream().map(GitTreeEntry::getTaskKey).collect(Collectors.toList());
       }
 
       @NotNull
@@ -338,9 +335,8 @@ private static MessageDigest createSha256() {
   }
 
   private boolean isLfsPointer(@NotNull ObjectLoader loader) {
-    if (loader.getSize() > ru.bozaro.gitlfs.pointer.Constants.POINTER_MAX_SIZE) return false;
-    if (Pointer.parsePointer(loader.getBytes()) == null) return false;
-    return true;
+    return loader.getSize() <= ru.bozaro.gitlfs.pointer.Constants.POINTER_MAX_SIZE
+        && Pointer.parsePointer(loader.getBytes()) != null;
   }
 
   @NotNull

diff --git a/src/main/java/git/lfs/migrate/GitTreeEntry.java b/src/main/java/git/lfs/migrate/GitTreeEntry.java
@@ -73,11 +73,9 @@ public boolean equals(Object o) {
 
     GitTreeEntry that = (GitTreeEntry) o;
 
-    if (!fileMode.equals(that.fileMode)) return false;
-    if (!taskKey.equals(that.taskKey)) return false;
-    if (!fileName.equals(that.fileName)) return false;
-
-    return true;
+    return fileMode.equals(that.fileMode)
+        && taskKey.equals(that.taskKey)
+        && fileName.equals(that.fileName);
   }
 
   @Override

diff --git a/src/main/java/git/lfs/migrate/TaskKey.java b/src/main/java/git/lfs/migrate/TaskKey.java
@@ -37,8 +37,8 @@ public boolean equals(Object o) {
 
     TaskKey taskKey = (TaskKey) o;
 
-    if (type != taskKey.type) return false;
-    return objectId.equals(taskKey.objectId);
+    return (type == taskKey.type)
+        && objectId.equals(taskKey.objectId);
 
   }