Merge branch 'master' into abm_zenodo_integration

Author: Ankur Gupta

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

@@ -16,7 +16,7 @@ private Deposit() {}
         public final static String Publish = "api/deposit/depositions/{id}/actions/publish";
         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 NewVersion = "/api/deposit/depositions/{id}/actions/newversion";
         public final static String Entity = "api/deposit/depositions/{id}";
 
     }

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

@@ -18,11 +18,13 @@ public Metadata(UploadType upload_type,
                     Date publication_date,
                     String title,
                     String description,
+                    String version,
                     AccessRight accessRight) {
         this.upload_type  = upload_type.toString();
         this.publication_date = publication_date;
         this.title = title;
         this.description = description;
+        this.version = version;
         this.access_right = accessRight.toString();
     }
 
@@ -63,6 +65,7 @@ public Metadata(UploadType upload_type,
     public String imprint_place;
     public String partof_title;
     public String partof_pages;
+    public String version;
     public String thesis_supervisors;
     public String thesis_university;
     // public ArrayList<Subject> subjects;

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

@@ -184,6 +184,25 @@ public Deposition createDeposition(final Metadata m) throws UnsupportedOperation
 		}
 		return null;
 	}
+	
+	public Deposition createDepositionwithVersion(final Metadata m,  Integer depositionId) {
+		HttpRequestWithBody post = preparePostRequest(baseURL + API.Deposit.NewVersion);
+		post.routeParam("id", depositionId.toString());
+		String data = "{}";
+		if (m != null)
+			data = objectMapper.writeValue(new Object() {
+				public Metadata metadata = m;
+			});
+		   RequestBodyEntity completePost = post.body(data);
+		   try {
+				HttpResponse<Deposition> response = completePost.asObject(Deposition.class);
+				return response.getBody();
+
+			} catch (UnirestException e) {
+				e.printStackTrace();
+			}
+			return null;
+	}
 
 	/**
 	 * Created by agupta on 19.11.18. to get the list of files for a particular
@@ -282,20 +301,21 @@ public static void main(String[] args) throws UnsupportedOperationException, IOE
 //		 new Date(),
 //		 "API test",
 //		 "API test",
+//		 "1.0",
 //		 Metadata.AccessRight.CLOSED);
 //		
 //		 Deposition deposition = client.createDeposition(firstTry);
-//		 System.out.println(deposition.id);
-		HttpResponse<JsonNode> jsonResponse = Unirest.post("https://sandbox.zenodo.org/"+API.Deposit.Files).routeParam("id", Integer.toString(252134))
+   
+		HttpResponse<JsonNode> jsonResponse = Unirest.post("https://sandbox.zenodo.org/"+API.Deposit.Files).routeParam("id", Integer.toString(252680))
          		   .header("Authorization", "Bearer "+ sandboxToken)
 				  .header("accept", "application/json")
 				  .field("filename", "archive.zip")
 				  .field("file", new File("/home/ankur/SHK/zenodo/archive.zip"))
 				  .asJson();
 		System.out.println(jsonResponse.getStatus());
-		FileMetadata firstFile = new FileMetadata(new File("/home/ankur/SHK/zenodo/archive.zip"));
-		DepositionFile newFile = client.uploadFile(firstFile,252119);
-		System.out.println("File Uploaded " + newFile.id + " " + newFile.filename);
+//		FileMetadata firstFile = new FileMetadata(new File("/home/ankur/SHK/zenodo/archive.zip"));
+//		DepositionFile newFile = client.uploadFile(firstFile,252119);
+//		System.out.println("File Uploaded " + newFile.id + " " + newFile.filename);
 		List<Deposition> depositions = client.getDepositions();
 		for (Deposition d : depositions)
 			System.out.println(d.title + " " + d.created + " " + d.id);
@@ -304,7 +324,9 @@ public static void main(String[] args) throws UnsupportedOperationException, IOE
 		for (DepositionFile f : files) {
 			System.out.println(f.filename + " " + f.id + " " + f.filesize + " " + f.links.download);
 		}
-		// client.deleteDeposition(d.id);
+		
+		
+	
 
 	}
 }