show rendered image

added loading icon
image is scaled to available space

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

@@ -0,0 +1,9 @@
+package org.lucares.pdbui;
+
+public interface HardcodedValues {
+
+	/**
+	 * The path for generated images relative to the context root.
+	 */
+	String WEB_IMAGE_OUTPUT_PATH = "img-generated";
+}

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 = 1L;
+
+	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/MySpringConfiguration.java

@@ -2,11 +2,12 @@ package org.lucares.pdbui;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 
 @Configuration
 @ComponentScan("org.lucares.pdbui")
-// @PropertySource("classpath:/config.system.properties")
-// @PropertySource("classpath:/config.user.properties")
+@PropertySource("classpath:/config.system.properties")
+@PropertySource("classpath:/config.user.properties")
 public class MySpringConfiguration {
 
 }

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

@@ -1,13 +1,9 @@
 package org.lucares.pdbui;
 
-import java.nio.file.Paths;
-
 import org.springframework.boot.SpringApplication;
 
 public class MyWebapp {
 
-	public static final String IMAGE_DIR = Paths.get("/tmp/images").toFile().getAbsolutePath() + "/";
-
 	public static void main(final String[] args) throws Exception {
 		SpringApplication.run(MySpringConfiguration.class, args);
 	}

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

@@ -1,7 +1,12 @@
 package org.lucares.pdbui;
 
+import java.io.File;
+import java.nio.file.Path;
+
 import org.lucares.pdbui.domain.PlotRequest;
 import org.lucares.pdbui.domain.PlotResponse;
+import org.lucares.recommind.logs.InternalPlottingException;
+import org.lucares.recommind.logs.Plotter;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
@@ -12,12 +17,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 @EnableAutoConfiguration
-public class PdbController {
+public class PdbController implements HardcodedValues {
 
-	private final PdbRepository pdbRepository;
+	private final Plotter plotter;
 
-	public PdbController(final PdbRepository pdbRepository) {
-		this.pdbRepository = pdbRepository;
+	public PdbController(final Plotter plotter) {
+		this.plotter = plotter;
 	}
 
 	@RequestMapping(path = "/plots", //
@@ -27,8 +32,17 @@ public class PdbController {
 	)
 	@ResponseBody
 	PlotResponse createPlot(@RequestBody final PlotRequest request) {
-		System.out.println(request.getQuery());
-		return new PlotResponse("img/abc.png");
+
+		try {
+			System.out.println(request.getQuery());
+			final File image = plotter.plot(request.getQuery(), request.getHeight(), request.getWidth());
+
+			final Path relativeImagePath = plotter.getOutputDir().relativize(image.toPath());
+			return new PlotResponse(WEB_IMAGE_OUTPUT_PATH + "/" + relativeImagePath.toString());
+
+		} catch (final InternalPlottingException e) {
+			throw new InternalServerError(e);
+		}
 	}
 
 }

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

@@ -1,15 +1,24 @@
 package org.lucares.pdbui;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import org.lucares.performance.db.PerformanceDb;
 import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class PdbRepository implements DisposableBean {
 	private final PerformanceDb db;
 
-	public PdbRepository(final PerformanceDb db) {
-		this.db = db;
+	public PdbRepository(@Value("${db.base}") final String dbBaseDir) {
+		final Path dataDirectory = Paths.get(dbBaseDir);
+		this.db = new PerformanceDb(dataDirectory);
+	}
+
+	public PerformanceDb getDb() {
+		return db;
 	}
 
 	@Override

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

@@ -0,0 +1,42 @@
+package org.lucares.pdbui;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.lucares.performance.db.PerformanceDb;
+import org.lucares.recommind.logs.Plotter;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PlotterBeanFactory extends AbstractFactoryBean<Plotter> implements PropertyKeys {
+
+	private final PerformanceDb db;
+	private final Path tmpDir;
+	private final Path outputDir;
+
+	@Autowired
+	public PlotterBeanFactory(final PdbRepository dbRepository, @Value("${" + TMP_DIR + "}") final String tmpDir,
+			@Value("${" + PATH_GENERATED_IMAGES + "}") final String outputDir) {
+		this.db = dbRepository.getDb();
+		this.tmpDir = Paths.get(tmpDir);
+		this.outputDir = Paths.get(outputDir);
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return Plotter.class;
+	}
+
+	@Override
+	protected Plotter createInstance() throws Exception {
+		Files.createDirectories(tmpDir);
+		Files.createDirectories(outputDir);
+
+		return new Plotter(db, tmpDir, outputDir);
+	}
+
+}

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

@@ -0,0 +1,14 @@
+package org.lucares.pdbui;
+
+public interface PropertyKeys {
+
+	/**
+	 * The path for generated images
+	 */
+	String PATH_GENERATED_IMAGES = "path.output";
+
+	/**
+	 * Path for temporary files
+	 */
+	String TMP_DIR = "path.tmp";
+}

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

@@ -1,14 +1,27 @@
 package org.lucares.pdbui;
 
+import java.nio.file.Paths;
+
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 @Configuration
-public class WebConfiguration extends WebMvcConfigurerAdapter {
+public class WebConfiguration extends WebMvcConfigurerAdapter implements HardcodedValues, PropertyKeys {
+
+	private final String outputDir;
+
+	public WebConfiguration(@Value("${" + PATH_GENERATED_IMAGES + "}") final String outputDir) {
+		this.outputDir = outputDir;
+	}
 
 	@Override
 	public void addResourceHandlers(final ResourceHandlerRegistry registry) {
-		registry.addResourceHandler("/img/**").addResourceLocations("file:" + MyWebapp.IMAGE_DIR);
+
+		final String pathPattern = "/" + WEB_IMAGE_OUTPUT_PATH + "/**";
+		final String resourceLocation = "file:" + Paths.get(outputDir).toAbsolutePath() + "/";
+
+		registry.addResourceHandler(pathPattern).addResourceLocations(resourceLocation);
 	}
 }

pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotRequest.java

@@ -3,6 +3,10 @@ package org.lucares.pdbui.domain;
 public class PlotRequest {
 	private String query;
 
+	private int height;
+
+	private int width;
+
 	public String getQuery() {
 		return query;
 	}
@@ -11,8 +15,24 @@ public class PlotRequest {
 		this.query = query;
 	}
 
+	public int getWidth() {
+		return width;
+	}
+
+	public void setWidth(final int width) {
+		this.width = width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public void setHeight(final int height) {
+		this.height = height;
+	}
+
 	@Override
 	public String toString() {
-		return query;
+		return query + ":" + height + "x" + width;
 	}
 }