Merge branch 'master' of https://github.com/cytomine/Cytomine-java-cl…

…ient

src/main/java/be/cytomine/client/Cytomine.java

@@ -1488,7 +1488,7 @@ public UploadedFile addUploadedFile(String originalFilename, String realFilename
 
     public UploadedFileCollection getUploadedFiles(boolean deleted) throws CytomineException {
         UploadedFileCollection files = new UploadedFileCollection(offset, max);
-        files.addParams("deleted", "true");
+        files.addParams("deleted", ""+deleted);
         return fetchCollection(files);
     }
 
@@ -1530,6 +1530,11 @@ public UploadedFile getUploadedFile(Long id) throws CytomineException {
 		uploadedFile.set("id", id);
 		return fetchModel(uploadedFile);
 	}
+	public UploadedFile getUploadedFileByAbstractImage(Long idAbstractImage) throws CytomineException {
+		UploadedFile uploadedFile = new UploadedFile();
+		uploadedFile.set("baseImage", idAbstractImage);
+		return fetchModel(uploadedFile);
+	}
 
 	public String clearAbstractImageProperties(Long idImage) throws CytomineException {
 		return doPost("/api/abstractimage/" + idImage + "/properties/clear.json", "");
@@ -1697,4 +1702,11 @@ public AmqpQueueCollection getAmqpQueue() throws CytomineException {
 		return fetchCollection(queues);
 	}
 
+	public DeleteCommandCollection getDeleteCommandByDomainAndAfterDate(String domain, Long timestamp) throws CytomineException {
+		DeleteCommandCollection commands = new DeleteCommandCollection(offset, max);
+		commands.addParams("domain","uploadedFile");
+		commands.addParams("after",timestamp.toString());
+		return fetchCollection(commands);
+	}
+
 }

src/main/java/be/cytomine/client/HttpClient.java

@@ -171,7 +171,9 @@ public int get(String url, String dest) throws IOException {
         }
         HttpEntity entity = response.getEntity();
         if (entity != null) {
-            entity.writeTo(new FileOutputStream(dest));
+            FileOutputStream fos = new FileOutputStream(dest);
+            entity.writeTo(fos);
+            fos.close();
         }
         return code;
     }

src/main/java/be/cytomine/client/collections/DeleteCommandCollection.java

@@ -0,0 +1,18 @@
+package be.cytomine.client.collections;
+
+public class DeleteCommandCollection extends Collection  {
+
+    public DeleteCommandCollection(int max, int offset) {
+        super(max, offset);
+    }
+
+    @Override
+    public String toURL() {
+        return getJSONResourceURL();
+    }
+
+    @Override
+    public String getDomainName() {
+        return "deletecommand";
+    }
+}

src/main/java/be/cytomine/client/models/DeleteCommand.java

@@ -0,0 +1,8 @@
+package be.cytomine.client.models;
+
+public class DeleteCommand extends Model {
+    @Override
+    public String getDomainName() {
+        return "deletecommand";
+    }
+}

src/main/java/be/cytomine/client/models/UploadedFile.java

@@ -34,4 +34,16 @@ public String getAbsolutePath() {
         return this.get("path") + File.separator + this.get("filename");
     }
 
+
+    public String toURL() {
+
+        Long id = (Long) get("id");
+        Long baseImage = (Long) get("baseImage");
+        if (id ==null && baseImage != null) {
+            return "/api/uploadedfile/image/"+baseImage+".json";
+        }
+
+        return super.toURL();
+    }
+
 }