Refactorings and new entity functionality

Author: bhermann

src/main/java/de/tud/cs/stg/zenodo/API.java

@@ -17,6 +17,7 @@ private Deposit() {}
         public final static String Discard = "api/deposit/depositions/{id}/actions/discard";
         public final static String Edit = "api/deposit/depositions/{id}/actions/edit";
 
+        public final static String Entity = "api/deposit/depositions/{id}";
 
     }
 }

src/main/java/de/tud/cs/stg/zenodo/Deposition.java

@@ -20,4 +20,19 @@ public class Deposition {
     public Links links;
     public Metadata metadata;
 
+    /**
+     * Created by benhermann on 31.05.17.
+     */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class Links {
+        public String bucket;
+        public String discard;
+        public String edit;
+        public String files;
+        public String html;
+        public String latest_draft;
+        public String latest_draft_html;
+        public String publish;
+        public String self;
+    }
 }

src/main/java/de/tud/cs/stg/zenodo/Links.java

@@ -9,6 +9,23 @@
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Metadata {
+
+    Metadata() {
+
+    }
+
+    public Metadata(UploadType upload_type,
+                    Date publication_date,
+                    String title,
+                    String description,
+                    AccessRight accessRight) {
+        this.upload_type  = upload_type.toString();
+        this.publication_date = publication_date;
+        this.title = title;
+        this.description = description;
+        this.access_right = accessRight.toString();
+    }
+
     public PreserveDOI preserve_doi;
     public String upload_type;
     public String publication_type;
@@ -51,4 +68,58 @@ public class Metadata {
     // public ArrayList<Subject> subjects;
 
 
+    /**
+     * Created by benhermann on 04.06.17.
+     */
+    public static class AccessRight {
+        private String accessRight;
+
+        private AccessRight(String accessRight) {
+            this.accessRight = accessRight;
+        }
+
+        @Override
+        public String toString() {
+            return accessRight;
+        }
+
+        public static final AccessRight OPEN = new AccessRight("open");
+        public static final AccessRight EMBARGOED = new AccessRight("embargoed");
+        public static final AccessRight RESTRICTED = new AccessRight("restricted");
+        public static final AccessRight CLOSED = new AccessRight("closed");
+    }
+
+    /**
+     * Created by benhermann on 04.06.17.
+     */
+    public static class UploadType {
+        private String uploadType;
+
+        private UploadType(String uploadType) {
+            this.uploadType = uploadType;
+        }
+
+        @Override
+        public String toString() {
+            return uploadType;
+        }
+
+        public static final UploadType PUBLICATION = new UploadType("publication");
+        public static final UploadType POSTER = new UploadType("poster");
+        public static final UploadType PRESENTATION = new UploadType("presentation");
+        public static final UploadType DATASET = new UploadType("dataset");
+        public static final UploadType IMAGE = new UploadType("image");
+        public static final UploadType VIDEO = new UploadType("video");
+        public static final UploadType SOFTWARE = new UploadType("software");
+
+
+    }
+
+    /**
+     * Created by benhermann on 01.06.17.
+     */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class PreserveDOI {
+
+    }
 }

src/main/java/de/tud/cs/stg/zenodo/Metadata.java

@@ -17,7 +17,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.TimeZone;
 
 /**
  * Created by benhermann on 31.05.17.
@@ -48,7 +47,7 @@ public ZenodoClient(String baseURL, String token) {
             final ISO8601DateFormat dateFormat = new ISO8601DateFormat() {
                 @Override
                 public Date parse(String source) throws ParseException {
-                    if (!source.endsWith("+0000")) source = source + "+0000";
+                    if (!source.endsWith("+0000") && ! source.endsWith("+00:00")) source = source + "+0000";
                     return super.parse(source);
                 }
             };
@@ -98,6 +97,18 @@ public boolean test() {
         return false;
     }
 
+    public Deposition getDeposition(Integer id) {
+        GetRequest request = prepareGetRequest(baseURL + API.Deposit.Entity);
+        request.routeParam("id", id.toString());
+        try {
+            HttpResponse<Deposition> response = request.asObject(Deposition.class);
+            return response.getBody();
+        } catch (UnirestException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     public List<Deposition> getDepositions() {
         ArrayList<Deposition> result = new ArrayList<Deposition>();
         GetRequest request = prepareGetRequest(baseURL + API.Deposit.Depositions);
@@ -110,6 +121,28 @@ public List<Deposition> getDepositions() {
         return null;
     }
 
+    public Deposition updateDeposition(Deposition deposition) {
+        HttpRequestWithBody request = preparePutRequest(baseURL + API.Deposit.Entity);
+        request.routeParam("id", deposition.id.toString());
+        try {
+            HttpResponse<Deposition> response = request.asObject(Deposition.class);
+            return response.getBody();
+        } catch (UnirestException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public void deleteDeposition(Integer id) {
+        HttpRequestWithBody request = prepareDeleteRequest(baseURL + API.Deposit.Entity);
+        request.routeParam("id", id.toString());
+        try {
+            HttpResponse<String> response = request.asString();
+        } catch (UnirestException e) {
+            e.printStackTrace();
+        }
+    }
+
     private <T> T fromJSON(final TypeReference<T> type, final String jsonPacket) {
         T data = null;
         try {
@@ -181,20 +214,35 @@ private GetRequest prepareGetRequest(String url) {
                 .header("Authorization", "Bearer " + token);
     }
 
+    private HttpRequestWithBody preparePutRequest(String url) {
+        return Unirest.put(url)
+                      .header("Content-Type", "application/json")
+                        .header("Authorization", "Bearer" + token);
+    }
+
+    private HttpRequestWithBody prepareDeleteRequest(String url) {
+        return Unirest.delete(url)
+                        .header("Content-Type", "application/json")
+                        .header("Authorization", "Bearer " + token);
+    }
+
     public static void main(String[] args) {
         ZenodoClient client = new ZenodoClient(sandboxURL, sandboxToken);
         System.out.println(client.test());
 
-        Metadata firstTry = new Metadata();
-        firstTry.title = "API test";
-        Deposition deposition = client.createDeposition(firstTry);
-        System.out.println(deposition.id);
+       Metadata firstTry = new Metadata(Metadata.UploadType.DATASET,
+                                        new Date(),
+                                        "API test",
+                                        "API test",
+                                        Metadata.AccessRight.CLOSED);
+
+       // Deposition deposition = client.createDeposition(firstTry);
+        //System.out.println(deposition.id);
 
-        /*
-        // Produces status 500 currently.
         List<Deposition> depositions = client.getDepositions();
         for (Deposition d : depositions)
-            client.discard(d.id);
-        */
+            //System.out.println(d.title);
+            client.deleteDeposition(d.id);
+
     }
 }