add links to current settings and to current image

pdb-ui/src/main/java/org/lucares/pdbui/InternalServerError.java

@@ -0,0 +1,18 @@
+package org.lucares.pdbui;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(value = HttpStatus.INTERNAL_SERVER_ERROR, reason = "Internal Server Error")
+public class InternalServerError extends RuntimeException {
+
+	private static final long serialVersionUID = 548651821080252932L;
+
+	public InternalServerError(final String message, final Throwable cause) {
+		super(message, cause);
+	}
+
+	public InternalServerError(final Throwable cause) {
+		super(cause);
+	}
+}

pdb-ui/src/main/java/org/lucares/pdbui/PdbController.java

@@ -1,5 +1,7 @@
 package org.lucares.pdbui;
 
+import java.io.FileInputStream;
+import java.io.OutputStream;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -12,7 +14,11 @@ import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.commons.lang3.StringUtils;
 import org.lucares.pdb.datastore.Proposal;
+import org.lucares.pdb.plot.api.AxisScale;
+import org.lucares.pdb.plot.api.Limit;
 import org.lucares.pdb.plot.api.PlotSettings;
+import org.lucares.pdb.plot.api.PlotType;
+import org.lucares.pdbui.domain.Aggregate;
 import org.lucares.pdbui.domain.AutocompleteProposal;
 import org.lucares.pdbui.domain.AutocompleteProposalByValue;
 import org.lucares.pdbui.domain.AutocompleteResponse;
@@ -31,6 +37,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -39,6 +46,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody;
 
 @Controller
 @EnableAutoConfiguration
@@ -105,6 +113,63 @@ public class PdbController implements HardcodedValues {
 		}
 	}
 
+	@RequestMapping(path = "/plots", //
+			method = RequestMethod.GET, //
+			produces = MediaType.APPLICATION_OCTET_STREAM_VALUE //
+	)
+	StreamingResponseBody createPlotImage(@RequestParam(name = "query", defaultValue = "") final String query,
+			@RequestParam(name = "groupBy[]", defaultValue = "") final List<String> aGroupBy,
+			@RequestParam(name = "limitBy.number", defaultValue = "10") final int limit,
+			@RequestParam(name = "limitBy.selected", defaultValue = "NO_LIMIT") final Limit limitBy,
+			@RequestParam(name = "dateFrom", defaultValue = "") final String dateFrom,
+			@RequestParam(name = "dateRange", defaultValue = "1 week") final String dateRange,
+			@RequestParam(name = "axisScale", defaultValue = "LINEAR") final AxisScale axisScale,
+			@RequestParam(name = "plotType", defaultValue = "SCATTER") final PlotType plotType,
+			@RequestParam(name = "aggregate", defaultValue = "NONE") final Aggregate aggregate,
+			@RequestParam(name = "keyOutside", defaultValue = "false") final boolean keyOutside,
+			@RequestParam(name = "height", defaultValue = "1080") final int height,
+			@RequestParam(name = "width", defaultValue = "1920") final int hidth) {
+		return (final OutputStream outputStream) -> {
+
+			if (StringUtils.isBlank(query)) {
+				throw new BadRequest("The query must not be empty!");
+			}
+
+			final PlotSettings plotSettings = new PlotSettings();
+			plotSettings.setQuery(query);
+			plotSettings.setGroupBy(aGroupBy);
+			plotSettings.setHeight(height);
+			plotSettings.setWidth(hidth);
+			plotSettings.setLimit(limit);
+			plotSettings.setLimitBy(limitBy);
+			plotSettings.setDateFrom(dateFrom);
+			plotSettings.setDateRange(dateRange);
+			plotSettings.setYAxisScale(axisScale);
+			plotSettings.setPlotType(plotType);
+			plotSettings.setAggregate(PlotSettingsTransformer.toAggregateInternal(aggregate));
+			plotSettings.setKeyOutside(keyOutside);
+
+			if (plotterLock.tryLock()) {
+				try {
+					final PlotResult result = plotter.plot(plotSettings);
+
+					try (FileInputStream in = new FileInputStream(result.getImagePath().toFile())) {
+						StreamUtils.copy(in, outputStream);
+					}
+				} catch (final NoDataPointsException e) {
+					throw new NotFoundException(e);
+				} catch (final InternalPlottingException e) {
+					throw new InternalServerError(e);
+				} finally {
+					plotterLock.unlock();
+				}
+
+			} else {
+				throw new ServiceUnavailableException("Too many parallel requests!");
+			}
+		};
+	}
+
 	@RequestMapping(path = "/autocomplete", //
 			method = RequestMethod.GET, //
 			produces = MediaType.APPLICATION_JSON_UTF8_VALUE //

pdb-ui/src/main/java/org/lucares/pdbui/PlotSettingsTransformer.java

@@ -23,15 +23,17 @@ class PlotSettingsTransformer {
 		result.setYAxisScale(request.getAxisScale());
 		result.setPlotType(request.getPlotType());
 		result.setAggregate(toAggregateInternal(request.getAggregate()));
-		result.setKeyOutside(request.isKeyOutside()); 
+		result.setKeyOutside(request.isKeyOutside());
 
 		return result;
 	}
 
-	private static AggregateHandler toAggregateInternal(Aggregate aggregate) {
+	static AggregateHandler toAggregateInternal(final Aggregate aggregate) {
 		switch (aggregate) {
-		case NONE:return new NullAggregate();
-		case PERCENTILES:return new PercentileAggregate();
+		case NONE:
+			return new NullAggregate();
+		case PERCENTILES:
+			return new PercentileAggregate();
 		}
 		throw new IllegalStateException("unhandled enum: " + aggregate);
 	}