Fix/unquote etag header (#110)

* fix log message * remove quotes from etag headers * remove extra )
DiceTechnology · Jul 12, 2024 · 6703b9d · 6703b9d
1 parent 7e098d6
commit 6703b9d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/dice-where-downloader-lib/src/main/java/technology/dice/dicewhere/downloader/Download.java b/dice-where-downloader-lib/src/main/java/technology/dice/dicewhere/downloader/Download.java
@@ -39,7 +39,7 @@ protected DownloadExecutionResult process(FileAcceptor<?> acceptor, FileSource f
       result = processFileDoesNotExist(acceptor, fileSource, pathWritable);
     }
     LOG.info("A new file was" + (result.isNewFileDownloaded() ? "" : " not") + " downloaded");
-    LOG.info("Download is " + (!result.isSuccessful() ? "un" : "" + "successful"));
+    LOG.info("Download is " + (!result.isSuccessful() ? "un" : "") + "successful");
     return result;
   }
 

diff --git a/...lib/src/main/java/technology/dice/dicewhere/downloader/destination/s3/S3FileAcceptor.java b/...lib/src/main/java/technology/dice/dicewhere/downloader/destination/s3/S3FileAcceptor.java
@@ -112,7 +112,8 @@ public Optional<MD5Checksum> existingFileMd5() {
 
     try {
       final HeadObjectResponse headObjectResponse = client.headObject(headObjectRequest);
-      return Optional.ofNullable(headObjectResponse.eTag()).map(m -> MD5Checksum.of(m));
+      return Optional.ofNullable(headObjectResponse.eTag())
+          .map(m -> MD5Checksum.of(m.replaceAll("\"", "")));
     } catch (NoSuchKeyException e) {
       return Optional.empty();
     }

diff --git a/...downloader-lib/src/main/java/technology/dice/dicewhere/downloader/source/s3/S3Source.java b/...downloader-lib/src/main/java/technology/dice/dicewhere/downloader/source/s3/S3Source.java
@@ -59,7 +59,7 @@ public FileInfo fileInfo() {
               Optional.ofNullable(metadata.get(TIMESTAMP_METADATA_KEY))
                   .map(m -> Instant.ofEpochMilli(Long.valueOf(m)))
                   .orElse(Instant.now()),
-              MD5Checksum.of(headObjectResponse.eTag()),
+              MD5Checksum.of(headObjectResponse.eTag().replaceAll("\"", "")),
               size);
     }