Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/services/AbstractMainValuesService.java @ 9404:bc9a45d2b1fa
common time range for gauges incl. error messages
author | gernotbelger |
---|---|
date | Wed, 15 Aug 2018 13:59:09 +0200 |
parents | 82c67b859aa7 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/AbstractMainValuesService.java Wed Aug 15 13:22:00 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/AbstractMainValuesService.java Wed Aug 15 13:59:09 2018 +0200 @@ -47,7 +47,6 @@ private static Logger log = Logger.getLogger(AbstractMainValuesService.class); /** XPath that points to the river definition of the incoming request. */ - private static final String XPATH_RIVER = "/art:mainvalues/art:river/text()"; /** XPath that points to the start definition of the incoming request. */ private static final String XPATH_START = "/art:mainvalues/art:start/text()"; @@ -70,7 +69,7 @@ * * @return the River object. */ - protected final River getRequestedRiver(final Document data) throws MainValuesServiceException { + protected static final River getRequestedRiver(final Document data, final String XPATH_RIVER) throws MainValuesServiceException { log.debug("MainValuesService.getRequestedRiver"); String riverStr = XMLUtils.xpathString(data, XPATH_RIVER, ArtifactNamespaceContext.INSTANCE); @@ -81,7 +80,7 @@ throw new MainValuesServiceException("no river found."); } - protected final Gauge getRequestedGauge(final Document data, final River river) throws MainValuesServiceException { + protected static final Gauge getRequestedGauge(final Document data, final River river) throws MainValuesServiceException { final double[] minmax = getRequestedStartEnd(data, river); final Gauge gauge = river.determineRefGauge(minmax, CMP.compare(minmax[0], minmax[1]) != 0); @@ -105,7 +104,7 @@ * * @return the start and end point. */ - private double[] getRequestedStartEnd(final Document data, final River river) { + public static double[] getRequestedStartEnd(final Document data, final River river) { log.debug("MainValuesService.getStartEnd"); final String startStr = XMLUtils.xpathString(data, XPATH_START, ArtifactNamespaceContext.INSTANCE); @@ -165,7 +164,7 @@ * @param context * The context object. */ - private void appendMetaInformation(final Document doc, final Element root, final River river, final Gauge gauge, final Object context) { + static void appendMetaInformation(final Document doc, final Element root, final River river, final Gauge gauge, final Object context) { log.debug("MainValuesService.appendMetaInformation"); final ElementCreator cr = new ElementCreator(doc, ArtifactNamespaceContext.NAMESPACE_URI, ArtifactNamespaceContext.NAMESPACE_PREFIX);