Fix downloading for not uploaded object (404 error)

Author: bozaro

.gitignore

@@ -16,4 +16,4 @@
 build
 
 # Virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+hs_err_pid*

README.md

@@ -38,6 +38,7 @@ You can download latest stable version from [Maven Central](http://mvnrepository
 Version 0.4.0
 
  * Fix url concatenation
+ * Fix downloading for not uploaded object (404 error)
 
 Version 0.3.0
 

gitlfs-client/src/main/java/ru/bozaro/gitlfs/client/Client.java

@@ -129,7 +129,7 @@ public BatchRes postBatch(@NotNull final BatchReq batchReq) throws IOException {
     return doWork(new Work<BatchRes>() {
       @Override
       public BatchRes exec(@NotNull Link auth) throws IOException {
-        return doRequest(auth, new JsonPost<>(batchReq, BatchRes.class), URI.create(auth.getHref() + PATH_BATCH));
+        return doRequest(auth, new JsonPost<>(batchReq, BatchRes.class), AuthHelper.join(auth.getHref(), PATH_BATCH));
       }
     }, batchReq.getOperation());
   }
@@ -147,7 +147,11 @@ public InputStream getObject(@NotNull final String hash) throws IOException {
     return doWork(new Work<InputStream>() {
       @Override
       public InputStream exec(@NotNull Link auth) throws IOException {
-        return getObject(doRequest(auth, new MetaGet(), AuthHelper.join(auth.getHref(), PATH_OBJECTS + "/" + hash)));
+        final ObjectRes links = doRequest(auth, new MetaGet(), AuthHelper.join(auth.getHref(), PATH_OBJECTS + "/" + hash));
+        if (links == null) {
+          throw new FileNotFoundException();
+        }
+        return getObject(links);
       }
     }, Operation.Download);
   }
@@ -177,6 +181,17 @@ public InputStream getObject(@NotNull final Links links) throws IOException {
    * @throws IOException On some errors.
    */
   public boolean putObject(@NotNull final StreamProvider streamProvider) throws IOException {
+    return putObject(streamProvider, generateMeta(streamProvider));
+  }
+
+  /**
+   * Generate object metadata.
+   *
+   * @param streamProvider Object stream provider.
+   * @return Return object metadata.
+   * @throws IOException On some errors.
+   */
+  public Meta generateMeta(@NotNull final StreamProvider streamProvider) throws IOException {
     final MessageDigest digest = sha256();
     final byte[] buffer = new byte[0x10000];
     long size = 0;
@@ -188,8 +203,7 @@ public boolean putObject(@NotNull final StreamProvider streamProvider) throws IO
         size += read;
       }
     }
-    final String hash = new String(Hex.encodeHex(digest.digest()));
-    return putObject(streamProvider, hash, size);
+    return new Meta(new String(Hex.encodeHex(digest.digest())), size);
   }
 
   /**

gitlfs-client/src/test/java/ru/bozaro/gitlfs/client/ClientLegacyTest.java

@@ -6,6 +6,7 @@
 import ru.bozaro.gitlfs.client.exceptions.ForbiddenException;
 import ru.bozaro.gitlfs.client.io.StringStreamProvider;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
@@ -16,7 +17,7 @@
  */
 public class ClientLegacyTest {
   /**
-   * Simple download.
+   * Simple upload.
    */
   @Test
   public void legacyUpload01() throws IOException {
@@ -59,6 +60,9 @@ public void legacyUpload04() throws IOException {
     replay.close();
   }
 
+  /**
+   * Simple download
+   */
   @Test
   public void legacyDownload01() throws IOException {
     final HttpReplay replay = YamlHelper.createReplay("/ru/bozaro/gitlfs/client/legacy-download-01.yml");
@@ -67,4 +71,19 @@ public void legacyDownload01() throws IOException {
     Assert.assertEquals(new String(data, StandardCharsets.UTF_8), "Fri Oct 02 21:07:33 MSK 2015");
     replay.close();
   }
+
+  /**
+   * Download not uploaded object
+   */
+  @Test
+  public void legacyDownload02() throws IOException {
+    final HttpReplay replay = YamlHelper.createReplay("/ru/bozaro/gitlfs/client/legacy-download-02.yml");
+    final Client client = new Client(new FakeAuthProvider(), replay);
+    try {
+      client.getObject("01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b");
+      Assert.fail();
+    } catch (FileNotFoundException ignored) {
+    }
+    replay.close();
+  }
 }

gitlfs-client/src/test/java/ru/bozaro/gitlfs/client/HttpRecord.java

@@ -77,7 +77,7 @@ public Response(@NotNull HttpMethod method) throws IOException {
       this.statusCode = method.getStatusCode();
       this.statusText = method.getStatusText();
       this.headers = new TreeMap<>();
-      for (Header header : method.getRequestHeaders()) {
+      for (Header header : method.getResponseHeaders()) {
         headers.put(header.getName(), header.getValue());
       }
       this.body = method.getResponseBody();

gitlfs-client/src/test/java/ru/bozaro/gitlfs/client/Recorder.java

@@ -5,12 +5,8 @@
 import org.yaml.snakeyaml.Yaml;
 import ru.bozaro.gitlfs.client.auth.AuthProvider;
 import ru.bozaro.gitlfs.client.internal.HttpClientExecutor;
-import ru.bozaro.gitlfs.client.io.ByteArrayStreamProvider;
 
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
+import java.io.*;
 import java.nio.charset.StandardCharsets;
 
 /**
@@ -25,15 +21,19 @@ public static void main(@NotNull String[] args) throws IOException {
 
     doWork(new Client(auth, recorder));
 
-    recorder.getRecords();
-
-    Yaml yaml = YamlHelper.get();
-    try (OutputStream replay = new FileOutputStream("replay.yml")) {
+    final Yaml yaml = YamlHelper.get();
+    final File file = new File("build/replay.yml");
+    //noinspection ResultOfMethodCallIgnored
+    file.getParentFile().mkdirs();
+    try (OutputStream replay = new FileOutputStream(file)) {
       yaml.dumpAll(recorder.getRecords().iterator(), new OutputStreamWriter(replay, StandardCharsets.UTF_8));
     }
   }
 
   private static void doWork(@NotNull Client client) throws IOException {
-    client.putObject(new ByteArrayStreamProvider("Hello, world!!!".getBytes()));
+    try {
+      client.getObject("01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b");
+    } catch (IOException e) {
+    }
   }
 }

gitlfs-client/src/test/resources/ru/bozaro/gitlfs/client/legacy-download-02.yml

@@ -0,0 +1,32 @@
+!!ru.bozaro.gitlfs.client.HttpRecord
+request:
+  body: null
+  headers:
+    Accept: application/vnd.git-lfs+json
+    Authorization: RemoteAuth Token-1
+  href: http://gitlfs.local/test.git/info/lfs/objects/01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
+  method: GET
+response:
+  body: !text |-
+    {"message":"Not Found","documentation_url":"https://github.com/contact"}
+  headers:
+    Access-Control-Allow-Credentials: 'true'
+    Access-Control-Allow-Origin: '*'
+    Access-Control-Expose-Headers: ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+    Content-Length: '72'
+    Content-Security-Policy: default-src 'none'
+    Content-Type: application/json; charset=utf-8
+    Date: Wed, 07 Oct 2015 04:06:04 GMT
+    Server: GitHub.com
+    Status: 404 Not Found
+    Strict-Transport-Security: max-age=31536000; includeSubdomains; preload
+    X-Content-Type-Options: nosniff
+    X-Frame-Options: deny
+    X-GitHub-Media-Type: unknown
+    X-GitHub-Request-Id: 4FA5AFEC:17F56:60D2406:56149A2C
+    X-RateLimit-Limit: '3000'
+    X-RateLimit-Remaining: '2999'
+    X-RateLimit-Reset: '1444190824'
+    X-XSS-Protection: 1; mode=block
+  statusCode: 404
+  statusText: Not Found