Merge pull request #116 from eiselems/113

bigal91 · bigal91 · commit a91ebbe5cc87 · 2014-12-16T18:43:12.000+01:00
impl CreateCsarService / Servlet, add to GUI fix #113 implemented both classes and added a button to listCsarServlet.ftl
diff --git a/src/main/java/org/opentosca/csarrepo/service/CreateCsarService.java b/src/main/java/org/opentosca/csarrepo/service/CreateCsarService.java
@@ -0,0 +1,40 @@
+package org.opentosca.csarrepo.service;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opentosca.csarrepo.model.Csar;
+import org.opentosca.csarrepo.model.repository.CsarRepository;
+
+/**
+ * @author eiselems (marcus.eisele@gmail.com)
+ *
+ */
+public class CreateCsarService extends AbstractService {
+
+	private static final Logger LOGGER = LogManager.getLogger(CreateCsarService.class);
+
+	/**
+	 * @param userId
+	 * @param file
+	 */
+	public CreateCsarService(long userId, String name) {
+		super(userId);
+
+		CsarRepository csarRepo = new CsarRepository();
+		try {
+			Csar csar = new Csar();
+			csar.setName(name);
+			csarRepo.save(csar);
+		} catch (Exception e) {
+			this.addError(e.getMessage());
+			LOGGER.error(e);
+		}
+	}
+
+	public boolean getResult() {
+		super.logInvalidResultAccess("getResult");
+
+		return !this.hasErrors();
+	}
+
+}
diff --git a/src/main/java/org/opentosca/csarrepo/servlet/CreateCsarServlet.java b/src/main/java/org/opentosca/csarrepo/servlet/CreateCsarServlet.java
@@ -0,0 +1,62 @@
+package org.opentosca.csarrepo.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.opentosca.csarrepo.service.CreateCsarService;
+
+/**
+ * Servlet implementation class UploadCSARServlet
+ */
+@WebServlet("/createcsar")
+public class CreateCsarServlet extends AbstractServlet {
+	private static final long serialVersionUID = 1L;
+
+	private static final Logger LOGGER = LogManager.getLogger(CreateCsarServlet.class);
+	private static final String PARAM_CSAR_NAME = "csarName";
+
+	/**
+	 * @see HttpServlet#HttpServlet()
+	 */
+	public CreateCsarServlet() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
+	 *      response)
+	 */
+	@Override
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		this.doPost(request, response);
+	}
+
+	/**
+	 * @throws IOException
+	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
+	 *      response)
+	 */
+	@Override
+	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
+	IOException {
+		String csarName = request.getParameter(PARAM_CSAR_NAME);
+		CreateCsarService createCsarService = new CreateCsarService(0L, csarName);
+
+		LOGGER.debug("Got request to create CSAR " + csarName + " delegating ...");
+
+		if (createCsarService.hasErrors()) {
+			throw new ServletException("CreateCsarService has Errors: " + createCsarService.getErrors().get(0));
+		} else {
+			// TODO write proper response
+			response.getWriter().print("<html><body>Success</body></html>");
+		}
+	}
+}
diff --git a/src/main/webapp/listCsarServlet.ftl b/src/main/webapp/listCsarServlet.ftl
@@ -1,6 +1,11 @@
 <#import "layout.ftl" as layout>
 <@layout.sb_admin>
 
+<form action="${basePath}/createcsar" method="post">
+	  <p>Name: <input name="csarName" type="text" size="30" maxlength="30"></p>
+	<input type="submit" value="Create new Csar" />
+</form>
+
 <table id="csarList" class="table table-striped table-bordered" border="1">
 	<thead>
 		<tr>
