PDF creation does not need a baseURI

Resolving internal URIs is not needed within the PDF creation,
as rendered image can be included via absolute URI as well.

This makes configuration much easier, as no root URI as to
be provided which has been taken from the servlet context.
So, no BaseController has not to be ServletContextAware
anymore :)

io/src/main/java/org/n52/io/IoFactory.java

@@ -28,7 +28,6 @@
  */
 package org.n52.io;
 
-import java.net.URI;
 import java.util.List;
 import java.util.Set;
 
@@ -49,8 +48,6 @@ public abstract class IoFactory<P extends DatasetOutput<V>, V extends AbstractVa
 
     private ParameterService<P> datasetService;
 
-    private URI basePath;
-
     public IoFactory() {
         this.parameters = IoParameters.createDefaults();
     }
@@ -60,11 +57,6 @@ public IoFactory<P, V> setParameters(IoParameters parameters) {
         return this;
     }
 
-    public IoFactory<P, V> setBasePath(URI basePath) {
-        this.basePath = basePath;
-        return this;
-    }
-
     public IoFactory<P, V> setDataService(DataService<Data<V>> dataService) {
         this.dataService = dataService;
         return this;
@@ -124,8 +116,4 @@ protected DataService<Data<V>> getDataService() {
         return dataService;
     }
 
-    public URI getBasePath() {
-        return basePath;
-    }
-
 }

io/src/main/java/org/n52/io/quantity/QuantityIoFactory.java

@@ -114,17 +114,12 @@ public IoHandler<Data<QuantityValue>> createHandler(String outputMimeType) {
             return createMultiChartRenderer(mimeType);
         } else if (mimeType == Constants.MimeType.APPLICATION_PDF) {
             ChartIoHandler imgRenderer = createMultiChartRenderer(mimeType);
-            PDFReportGenerator reportGenerator = new PDFReportGenerator(
-                    parameters,
-                    createProcessChain(),
-                    imgRenderer);
-            reportGenerator.setBaseURI(getBasePath());
-            return reportGenerator;
-        } else if (mimeType == Constants.MimeType.TEXT_CSV || mimeType == Constants.MimeType.APPLICATION_ZIP) {
-            QuantityCsvIoHandler handler = new QuantityCsvIoHandler(
-                    parameters,
-                    createProcessChain(),
-                    getMetadatas());
+            return new PDFReportGenerator(parameters, createProcessChain(), imgRenderer);
+        }
+        else if (mimeType == Constants.MimeType.TEXT_CSV || mimeType == Constants.MimeType.APPLICATION_ZIP) {
+            QuantityCsvIoHandler handler = new QuantityCsvIoHandler(parameters,
+                                                                    createProcessChain(),
+                                                                    getMetadatas());
             handler.setTokenSeparator(parameters.getOther(Parameters.TOKEN_SEPARATOR));
 
             boolean zipOutput = parameters.getAsBoolean(Parameters.ZIP, false);

io/src/main/java/org/n52/io/report/quantity/PDFReportGenerator.java

@@ -26,6 +26,7 @@
  * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
  * for more details.
  */
+
 package org.n52.io.report.quantity;
 
 import java.io.File;
@@ -92,8 +93,6 @@ public class PDFReportGenerator extends ReportGenerator<Data<QuantityValue>> {
 
     private final ChartIoHandler renderer;
 
-    private URI baseURI;
-
     public PDFReportGenerator(IoParameters parameters,
                               IoProcessChain<Data<QuantityValue>> processChain,
                               ChartIoHandler renderer) {
@@ -104,15 +103,12 @@ public PDFReportGenerator(IoParameters parameters,
         this.renderer = renderer;
     }
 
-    public void setBaseURI(URI baseURI) {
-        this.baseURI = baseURI;
-    }
-
     public void generateOutput(DataCollection<Data<QuantityValue>> data) throws IoHandlerException {
         try {
             generateTimeseriesChart(data);
             generateTimeseriesMetadata();
-        } catch (IOException e) {
+        }
+        catch (IOException e) {
             throw new IoHandlerException("Error handling (temp) file!", e);
         }
     }
@@ -123,18 +119,13 @@ private void generateTimeseriesChart(DataCollection<Data<QuantityValue>> data) t
         try (FileOutputStream stream = new FileOutputStream(tmpFile)) {
             renderer.encodeAndWriteTo(data, stream);
             document.getDocumentStructure()
-                    .setDiagramURL(tmpFile.getAbsolutePath());
+                    .setDiagramURL(tmpFile.toURI().toString());
             // String absoluteFilePath = getFoAbsoluteFilepath(tmpFile);
             // document.getDocumentStructure().setDiagramURL(absoluteFilePath);
             stream.flush();
         }
     }
 
-    private String getFoAbsoluteFilepath(File tmpFile) {
-        return tmpFile.toURI()
-                      .toString();
-    }
-
     private void generateTimeseriesMetadata() {
         for (DatasetOutput metadata : getAllDatasetMetadatas()) {
             TimeSeries timeseries = addTimeseries(metadata);
@@ -150,8 +141,9 @@ public void encodeAndWriteTo(DataCollection<Data<QuantityValue>> data, OutputStr
             generateOutput(data);
             DefaultConfigurationBuilder cfgBuilder = new DefaultConfigurationBuilder();
             Configuration cfg = cfgBuilder.build(document.newInputStream());
-            FopFactory fopFactory = new FopFactoryBuilder(baseURI)
-                                                                  .setConfiguration(cfg)
+
+            URI baseURI = new File(".").toURI();
+            FopFactory fopFactory = new FopFactoryBuilder(baseURI).setConfiguration(cfg)
                                                                   .build();
             final String mimeType = Constants.APPLICATION_PDF;
             Fop fop = fopFactory.newFop(mimeType, stream);
@@ -176,20 +168,25 @@ public void encodeAndWriteTo(DataCollection<Data<QuantityValue>> data, OutputStr
                     String xslResult = XmlObject.Factory.parse(tempFile)
                                                         .xmlText();
                     LOGGER.debug("xsl-fo input (locale '{}'): {}", i18n.getTwoDigitsLanguageCode(), xslResult);
-                } catch (IOException | TransformerException | XmlException e) {
+                }
+                catch (IOException | TransformerException | XmlException e) {
                     LOGGER.error("Could not debug XSL result output!", e);
                 }
             }
 
             // XXX debug, diagram is not embedded
             transformer.transform(source, result);
-        } catch (FOPException e) {
+        }
+        catch (FOPException e) {
             throw new IoParseException("Failed to create Formatting Object Processor (FOP)", e);
-        } catch (SAXException | ConfigurationException | IOException e) {
+        }
+        catch (SAXException | ConfigurationException | IOException e) {
             throw new IoParseException("Failed to read config for Formatting Object Processor (FOP)", e);
-        } catch (TransformerConfigurationException e) {
+        }
+        catch (TransformerConfigurationException e) {
             throw new IoParseException("Invalid transform configuration. Inspect xslt!", e);
-        } catch (TransformerException e) {
+        }
+        catch (TransformerException e) {
             throw new IoParseException("Could not generate PDF report!", e);
         }
     }

rest/src/main/java/org/n52/web/ctrl/BaseController.java

@@ -75,7 +75,7 @@
  * </p>
  */
 @RestController
-public abstract class BaseController implements ServletConfigAware {
+public abstract class BaseController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ResourcesController.class);
 
@@ -131,15 +131,6 @@ private IoParameters createParameters(IoParameters parameters, String locale) {
                            .setParseExceptionHandle(getExceptionHandle());
     }
 
-    @Override
-    public void setServletConfig(ServletConfig servletConfig) {
-        this.servletConfig = servletConfig;
-    }
-
-    public ServletConfig getServletConfig() {
-        return servletConfig;
-    }
-
     protected boolean isRequestingJsonData(HttpServletRequest request) {
         return Constants.MimeType.APPLICATION_JSON.getMimeType()
                                                   .equals(getAcceptHeader(request));

rest/src/main/java/org/n52/web/ctrl/DataController.java

@@ -30,9 +30,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
@@ -446,12 +443,6 @@ private void checkForUnknownDatasetIds(IoParameters parameters, Set<String> seri
                                .setDatasetService(datasetService);
     }
 
-    private URI getRootResource() throws URISyntaxException, MalformedURLException {
-        return getServletConfig().getServletContext()
-                                 .getResource("/")
-                                 .toURI();
-    }
-
     // TODO set preredering config instead of task
 
     public PreRenderingJob getPreRenderingTask() {

rest/src/main/java/org/n52/web/ctrl/TimeseriesDataController.java

@@ -413,7 +413,6 @@ QuantityValue> createIoFactory(IoParameters parameters)
                               throws DatasetFactoryException, URISyntaxException, MalformedURLException {
         return createDefaultIoFactory().create(QuantityValue.TYPE)
                                        .setParameters(parameters)
-                                       .setBasePath(getRootResource())
                                        .setDataService(timeseriesDataService)
                                        .setDatasetService(timeseriesMetadataService);
     }