Skip to content

Commit a9f60bf

Browse files
author
David Baum
committed
GeneratorServlet: Return Ok Status Code after PostRequest
1 parent 3ea782a commit a9f60bf

1 file changed

Lines changed: 4 additions & 17 deletions

File tree

generator2/org.getaviz.generator/src/main/java/org/getaviz/generator/GeneratorServlet.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
import java.io.IOException;
44
import java.io.PrintWriter;
5-
import javax.servlet.ServletException;
65
import javax.servlet.http.HttpServlet;
76
import javax.servlet.http.HttpServletRequest;
87
import javax.servlet.http.HttpServletResponse;
9-
import java.net.InetAddress;
108
import org.apache.commons.logging.Log;
119
import org.apache.commons.logging.LogFactory;
12-
import org.getaviz.generator.SettingsConfiguration.OutputFormat;
1310

1411
public class GeneratorServlet extends HttpServlet {
1512
private static final long serialVersionUID = -5343549433924172589L;
@@ -22,25 +19,15 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) thro
2219
writeGetResponse(response);
2320
}
2421

25-
public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
22+
public void doPost(HttpServletRequest request, HttpServletResponse response) {
2623
log.info("POST request generator");
27-
SettingsConfiguration config = SettingsConfiguration.getInstance(request);
2824
Generator.run();
29-
writePostResponse(response, config);
25+
writePostResponse(response);
3026
}
3127

32-
private void writePostResponse(HttpServletResponse response, SettingsConfiguration config) throws IOException {
33-
PrintWriter out = response.getWriter();
28+
private void writePostResponse(HttpServletResponse response) {
3429
response.setContentType("text/html");
35-
out.println("<h1>Getaviz</h1>");
36-
out.println("<h3>Visualization is generated, please wait. You will be redirected automatically.</h3>");
37-
response.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
38-
InetAddress addr = InetAddress.getByName("frontend");
39-
String url = "http://" + addr.getHostAddress() + "/ui/index.php";
40-
String name = config.getName();
41-
boolean aframe = config.getOutputFormat() == OutputFormat.AFrame;
42-
response.setHeader("Location", url + "?aframe=" + Boolean.toString(aframe) + "&model=" + name
43-
+ "&setup=web_a-frame/default" + "&srcDir=data-gen");
30+
response.setStatus(HttpServletResponse.SC_OK);
4431
}
4532

4633
private void writeGetResponse(HttpServletResponse response) throws IOException {

0 commit comments

Comments
 (0)