Merge pull request #171 from eiselems/121

add upload file for REST fix #121

Author: Nik101010

src/main/java/org/opentosca/csarrepo/rest/resource/CsarResource.java

@@ -1,10 +1,14 @@
 package org.opentosca.csarrepo.rest.resource;
 
+import java.io.InputStream;
+import java.net.URI;
 import java.util.LinkedList;
 import java.util.List;
 
+import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
@@ -16,13 +20,16 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.opentosca.csarrepo.model.Csar;
 import org.opentosca.csarrepo.model.CsarFile;
 import org.opentosca.csarrepo.rest.model.CsarEntry;
 import org.opentosca.csarrepo.rest.model.SimpleXLink;
 import org.opentosca.csarrepo.rest.util.LinkBuilder;
 import org.opentosca.csarrepo.service.DeleteCsarService;
 import org.opentosca.csarrepo.service.ShowCsarService;
+import org.opentosca.csarrepo.service.UploadCsarFileService;
 
 public class CsarResource {
 
@@ -40,7 +47,6 @@ public CsarResource(UriInfo uriInfo, long id) {
 	public Response getCsar() {
 		// TODO: check if csar exists
 
-		// TODO: validate if id is really a long
 		List<SimpleXLink> links = new LinkedList<SimpleXLink>();
 		links.add(LinkBuilder.selfLink(uriInfo));
 
@@ -65,22 +71,58 @@ public Response getCsar() {
 		LOGGER.debug("Accessing csar<id:{},name:{}>", csar.getId(), csar.getName());
 		return Response.ok(csarEntry).build();
 	}
-	
+
 	@DELETE
 	public Response deleteCsar() {
 		DeleteCsarService service = new DeleteCsarService(0, this.id);
-		
-		if(service.hasErrors()) {
-			return Response.status(Status.INTERNAL_SERVER_ERROR).entity(service.getErrors().get(0)).build();
+
+		if (service.hasErrors()) {
+			String message = service.getErrors().get(0);
+			LOGGER.error(message);
+			return Response.status(Status.INTERNAL_SERVER_ERROR).entity(message).build();
 		}
-		
+
 		return Response.ok().build();
 	}
 
 	// TODO: move id to constant class
 	@Path("/{" + "id" + "}")
 	public Object getCsarFile(@PathParam("id") long csarfileID, @Context UriInfo uriInfo) {
-		// TODO: add warning if longID = -1;
 		return new CsarFileResource(uriInfo, this.id, csarfileID);
 	}
+
+	@POST
+	@Consumes(MediaType.MULTIPART_FORM_DATA)
+	// TODO: check how the occurring nullpointer-exc. can be handled
+	public Response uploadFile(@FormDataParam("file") InputStream uploadedInputStream,
+			@FormDataParam("file") FormDataContentDisposition fileDetail) {
+
+		if (null == uploadedInputStream) {
+			String message = "Couldn't read uploaded file - was it set?";
+			LOGGER.error(message);
+			return Response.serverError().entity(message).build();
+		}
+
+		if (null == fileDetail) {
+			String message = "The details of the file could not be read.";
+			LOGGER.error(message);
+			return Response.serverError().entity(message).build();
+		}
+
+		String csarName = fileDetail.getFileName();
+		UploadCsarFileService upService = new UploadCsarFileService(0L, this.id, uploadedInputStream, csarName);
+		// TODO, think about better Exceptionhandling (currently we
+		// just take first Exception)
+		if (upService.hasErrors()) {
+			return Response.serverError().entity("UploadCsarService has Errors: " + upService.getErrors().get(0))
+					.build();
+		}
+
+		CsarFile csarFile = upService.getResult();
+
+		LOGGER.info("Post for uploading a new CSAR as file with name \"" + fileDetail.getFileName());
+
+		URI linkToCsarFile = LinkBuilder.linkToCsarFile(uriInfo, this.id, csarFile.getId());
+		return Response.created(linkToCsarFile).build();
+	}
 }