Adding x-amz-tagging tag in direct upload

and catching/reporting non-200 status codes, updating version number
GlobalDataverseCommunityConsortium · Mar 4, 2020 · 14146b3 · 14146b3
1 parent 4a51acf
commit 14146b3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>DVUploader</groupId>
     <artifactId>DVUploader</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.9</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>

diff --git a/src/main/java/org/sead/uploader/dataverse/DVUploader.java b/src/main/java/org/sead/uploader/dataverse/DVUploader.java
@@ -31,13 +31,16 @@
 
 import org.apache.commons.codec.binary.Hex;
 import org.apache.http.HttpEntity;
+import org.apache.http.HttpHeaders;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.config.CookieSpecs;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.HttpUriRequest;
+import org.apache.http.client.methods.RequestBuilder;
 import org.apache.http.client.protocol.HttpClientContext;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
@@ -410,10 +413,18 @@ protected String uploadDatafile(Resource file, String path) {
                             String storageIdentifier = data.getString("storageIdentifier");
 
                             HttpPut httpput = new HttpPut(uploadUrl);
+
+
+                            httpput.addHeader("x-amz-tagging", "dv-state=temp");
                             MessageDigest messageDigest = MessageDigest.getInstance("MD5");
 
                             try (InputStream inStream = file.getInputStream(); DigestInputStream digestInputStream = new DigestInputStream(inStream, messageDigest)) {
-
+                                // This is hte new form for requests - keeping the example but won't update until we can change all
+                                //HttpUriRequest httpput = RequestBuilder.put()
+                                //    .setUri(uploadUrl)
+                                //    .setHeader("x-amz-tagging", "dv-state=temp")
+                                //    .setEntity(new InputStreamEntity(digestInputStream, file.length()))
+                                //    .build();
                                 httpput.setEntity(new InputStreamEntity(digestInputStream, file.length()));
                                 CloseableHttpResponse putResponse = httpclient.execute(httpput);
                                 try {
@@ -508,6 +519,9 @@ protected String uploadDatafile(Resource file, String path) {
                                         } finally {
                                             EntityUtils.consumeQuietly(response.getEntity());
                                         }
+                                    } else {
+                                        println("Upload failed with status: " + putStatus + " (skipping)");
+                                        retry=0;
                                     }
 
                                 } catch (IOException e) {