From d689fd55d767af2adfee456cbeba9fa9ba046ea5 Mon Sep 17 00:00:00 2001 From: Christian Autermann Date: Mon, 28 Nov 2016 17:57:51 +0100 Subject: [PATCH] moved request/response objects to shetland --- .../org/n52/javaps/request/AbstractJobIdRequest.java | 4 ++-- .../org/n52/javaps/request/DescribeProcessRequest.java | 4 ++-- .../java/org/n52/javaps/request/ExecuteRequest.java | 4 ++-- .../n52/javaps/response/DescribeProcessResponse.java | 4 ++-- .../java/org/n52/javaps/response/DismissResponse.java | 4 ++-- .../java/org/n52/javaps/response/ExecuteResponse.java | 4 ++-- .../org/n52/javaps/response/GetResultResponse.java | 4 ++-- .../org/n52/javaps/response/GetStatusResponse.java | 4 ++-- .../encode/stream/OwsExceptionReportEncoder.java | 4 ++-- .../encode/stream/OwsExceptionReportResponse.java | 4 ++-- .../encode/stream/StreamingServiceResponseWriter.java | 10 +++++----- .../javaps/service/kvp/GetCapabilitiesKvpDecoder.java | 2 +- .../operator/validation/EngineParameterValidator.java | 4 ++-- .../validation/GetCapabiltiesParameterValidator.java | 2 +- .../org/n52/javaps/service/xml/WPSRequestReader.java | 8 ++++---- .../org/n52/javaps/service/xml/WPSResponseWriter.java | 2 +- .../n52/javaps/service/xml/WPSRequestReaderTest.java | 2 +- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/core/src/main/java/org/n52/javaps/request/AbstractJobIdRequest.java b/core/src/main/java/org/n52/javaps/request/AbstractJobIdRequest.java index 4eac1cf7..9541cdf6 100644 --- a/core/src/main/java/org/n52/javaps/request/AbstractJobIdRequest.java +++ b/core/src/main/java/org/n52/javaps/request/AbstractJobIdRequest.java @@ -17,14 +17,14 @@ package org.n52.javaps.request; import org.n52.shetland.ogc.wps.JobId; -import org.n52.iceland.request.AbstractServiceRequest; +import org.n52.shetland.ogc.ows.service.OwsServiceRequest; /** * TODO JavaDoc * * @author Christian Autermann */ -public abstract class AbstractJobIdRequest extends AbstractServiceRequest { +public abstract class AbstractJobIdRequest extends OwsServiceRequest { private JobId jobId; diff --git a/core/src/main/java/org/n52/javaps/request/DescribeProcessRequest.java b/core/src/main/java/org/n52/javaps/request/DescribeProcessRequest.java index f49dd805..201f5a3d 100644 --- a/core/src/main/java/org/n52/javaps/request/DescribeProcessRequest.java +++ b/core/src/main/java/org/n52/javaps/request/DescribeProcessRequest.java @@ -22,10 +22,10 @@ import java.util.Objects; import org.n52.shetland.ogc.wps.WPSConstants; -import org.n52.iceland.request.AbstractServiceRequest; +import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.ows.OwsCode; -public class DescribeProcessRequest extends AbstractServiceRequest { +public class DescribeProcessRequest extends OwsServiceRequest { public static final String ALL_KEYWORD = "ALL"; private final List identifiers = new LinkedList<>(); diff --git a/core/src/main/java/org/n52/javaps/request/ExecuteRequest.java b/core/src/main/java/org/n52/javaps/request/ExecuteRequest.java index ba8db690..686ba2e6 100644 --- a/core/src/main/java/org/n52/javaps/request/ExecuteRequest.java +++ b/core/src/main/java/org/n52/javaps/request/ExecuteRequest.java @@ -26,13 +26,13 @@ import org.n52.shetland.ogc.wps.ResponseMode; import org.n52.shetland.ogc.wps.WPSConstants; import org.n52.shetland.ogc.wps.data.ProcessData; -import org.n52.iceland.request.AbstractServiceRequest; +import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.shetland.ogc.ows.OwsCode; /** * @author Christian Autermann */ -public class ExecuteRequest extends AbstractServiceRequest { +public class ExecuteRequest extends OwsServiceRequest { private OwsCode id; private ExecutionMode executionMode = ExecutionMode.AUTO; diff --git a/core/src/main/java/org/n52/javaps/response/DescribeProcessResponse.java b/core/src/main/java/org/n52/javaps/response/DescribeProcessResponse.java index b92cdec3..2a4e927f 100644 --- a/core/src/main/java/org/n52/javaps/response/DescribeProcessResponse.java +++ b/core/src/main/java/org/n52/javaps/response/DescribeProcessResponse.java @@ -18,7 +18,7 @@ import java.util.Objects; -import org.n52.iceland.response.AbstractServiceResponse; +import org.n52.shetland.ogc.ows.service.OwsServiceResponse; import org.n52.shetland.ogc.wps.ProcessOfferings; import org.n52.shetland.ogc.wps.WPSConstants; @@ -26,7 +26,7 @@ * @author Benjamin Pross * */ -public class DescribeProcessResponse extends AbstractServiceResponse { +public class DescribeProcessResponse extends OwsServiceResponse { private ProcessOfferings offerings; diff --git a/core/src/main/java/org/n52/javaps/response/DismissResponse.java b/core/src/main/java/org/n52/javaps/response/DismissResponse.java index dc3ab78c..1ac2f29b 100644 --- a/core/src/main/java/org/n52/javaps/response/DismissResponse.java +++ b/core/src/main/java/org/n52/javaps/response/DismissResponse.java @@ -18,14 +18,14 @@ import java.util.Objects; -import org.n52.iceland.response.AbstractServiceResponse; +import org.n52.shetland.ogc.ows.service.OwsServiceResponse; import org.n52.shetland.ogc.wps.StatusInfo; import org.n52.shetland.ogc.wps.WPSConstants; /** * @author Christian Autermann */ -public class DismissResponse extends AbstractServiceResponse { +public class DismissResponse extends OwsServiceResponse { private StatusInfo status; public DismissResponse(String service, String version, StatusInfo status) { diff --git a/core/src/main/java/org/n52/javaps/response/ExecuteResponse.java b/core/src/main/java/org/n52/javaps/response/ExecuteResponse.java index c11c38c9..2defa1c5 100644 --- a/core/src/main/java/org/n52/javaps/response/ExecuteResponse.java +++ b/core/src/main/java/org/n52/javaps/response/ExecuteResponse.java @@ -21,12 +21,12 @@ import org.n52.shetland.ogc.wps.Result; import org.n52.shetland.ogc.wps.StatusInfo; import org.n52.shetland.ogc.wps.WPSConstants; -import org.n52.iceland.response.AbstractServiceResponse; +import org.n52.shetland.ogc.ows.service.OwsServiceResponse; /** * @author Christian Autermann */ -public class ExecuteResponse extends AbstractServiceResponse { +public class ExecuteResponse extends OwsServiceResponse { private Optional result; private Optional status; diff --git a/core/src/main/java/org/n52/javaps/response/GetResultResponse.java b/core/src/main/java/org/n52/javaps/response/GetResultResponse.java index 3be124a3..dfa531ce 100644 --- a/core/src/main/java/org/n52/javaps/response/GetResultResponse.java +++ b/core/src/main/java/org/n52/javaps/response/GetResultResponse.java @@ -18,14 +18,14 @@ import java.util.Objects; -import org.n52.iceland.response.AbstractServiceResponse; +import org.n52.shetland.ogc.ows.service.OwsServiceResponse; import org.n52.shetland.ogc.wps.Result; import org.n52.shetland.ogc.wps.WPSConstants; /** * @author Christian Autermann */ -public class GetResultResponse extends AbstractServiceResponse { +public class GetResultResponse extends OwsServiceResponse { private Result result; diff --git a/core/src/main/java/org/n52/javaps/response/GetStatusResponse.java b/core/src/main/java/org/n52/javaps/response/GetStatusResponse.java index 99bcb7f5..101b2f78 100644 --- a/core/src/main/java/org/n52/javaps/response/GetStatusResponse.java +++ b/core/src/main/java/org/n52/javaps/response/GetStatusResponse.java @@ -18,14 +18,14 @@ import java.util.Objects; -import org.n52.iceland.response.AbstractServiceResponse; +import org.n52.shetland.ogc.ows.service.OwsServiceResponse; import org.n52.shetland.ogc.wps.StatusInfo; import org.n52.shetland.ogc.wps.WPSConstants; /** * @author Christian Autermann */ -public class GetStatusResponse extends AbstractServiceResponse { +public class GetStatusResponse extends OwsServiceResponse { private StatusInfo status; public GetStatusResponse() { diff --git a/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/OwsExceptionReportEncoder.java b/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/OwsExceptionReportEncoder.java index 19069c19..af1c0ad6 100644 --- a/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/OwsExceptionReportEncoder.java +++ b/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/OwsExceptionReportEncoder.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.Set; -import org.n52.iceland.response.AbstractServiceResponse; +import org.n52.shetland.ogc.ows.service.OwsServiceResponse; import org.n52.janmayen.http.MediaType; import org.n52.janmayen.http.MediaTypes; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; @@ -32,7 +32,7 @@ /** * Helper class to wrap a thrown {@link OwsExceptionReport} into a - * {@link AbstractServiceResponse}. + * {@link OwsServiceResponse}. * * @author Christian Autermann */ diff --git a/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/OwsExceptionReportResponse.java b/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/OwsExceptionReportResponse.java index 1e3374d5..492443fb 100644 --- a/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/OwsExceptionReportResponse.java +++ b/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/OwsExceptionReportResponse.java @@ -17,14 +17,14 @@ package org.n52.svalbard.encode.stream; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -import org.n52.iceland.response.AbstractServiceResponse; +import org.n52.shetland.ogc.ows.service.OwsServiceResponse; /** * TODO JavaDoc * * @author Christian Autermann */ -public class OwsExceptionReportResponse extends AbstractServiceResponse { +public class OwsExceptionReportResponse extends OwsServiceResponse { private final OwsExceptionReport owsExceptionReport; diff --git a/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/StreamingServiceResponseWriter.java b/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/StreamingServiceResponseWriter.java index e9a5cabd..7d980def 100644 --- a/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/StreamingServiceResponseWriter.java +++ b/iceland-stream/src/main/java/org/n52/svalbard/encode/stream/StreamingServiceResponseWriter.java @@ -24,7 +24,7 @@ import org.n52.iceland.coding.encode.ResponseProxy; import org.n52.iceland.coding.encode.ResponseWriter; import org.n52.iceland.coding.encode.ResponseWriterKey; -import org.n52.iceland.response.AbstractServiceResponse; +import org.n52.shetland.ogc.ows.service.OwsServiceResponse; import org.n52.janmayen.http.MediaType; import org.n52.svalbard.encode.exception.EncodingException; import org.n52.svalbard.encode.exception.NoEncoderForKeyException; @@ -34,8 +34,8 @@ * * @author Christian Autermann */ -public class StreamingServiceResponseWriter implements ResponseWriter { - public static final ResponseWriterKey KEY = new ResponseWriterKey(AbstractServiceResponse.class); +public class StreamingServiceResponseWriter implements ResponseWriter { + public static final ResponseWriterKey KEY = new ResponseWriterKey(OwsServiceResponse.class); private MediaType contentType; private final StreamWriterRepository repository; @@ -55,7 +55,7 @@ public void setContentType(MediaType contentType) { } @Override - public void write(AbstractServiceResponse t, OutputStream out, ResponseProxy responseProxy) + public void write(OwsServiceResponse t, OutputStream out, ResponseProxy responseProxy) throws IOException, EncodingException { StreamWriterKey key = new StreamWriterKey(t.getClass(), t.getContentType()); StreamWriter writer = repository.getWriter(key).orElseThrow(() -> new NoEncoderForKeyException(key)); @@ -63,7 +63,7 @@ public void write(AbstractServiceResponse t, OutputStream out, ResponseProxy res } @Override - public boolean supportsGZip(AbstractServiceResponse t) { + public boolean supportsGZip(OwsServiceResponse t) { return true; } diff --git a/kvp/src/main/java/org/n52/javaps/service/kvp/GetCapabilitiesKvpDecoder.java b/kvp/src/main/java/org/n52/javaps/service/kvp/GetCapabilitiesKvpDecoder.java index 42218e95..bd97e278 100644 --- a/kvp/src/main/java/org/n52/javaps/service/kvp/GetCapabilitiesKvpDecoder.java +++ b/kvp/src/main/java/org/n52/javaps/service/kvp/GetCapabilitiesKvpDecoder.java @@ -20,7 +20,7 @@ import org.n52.iceland.binding.kvp.AbstractKvpDecoder; import org.n52.shetland.ogc.wps.WPS200Constants; import org.n52.shetland.ogc.wps.WPSConstants; -import org.n52.iceland.request.GetCapabilitiesRequest; +import org.n52.shetland.ogc.ows.service.GetCapabilitiesRequest; import org.n52.janmayen.http.MediaTypes; import org.n52.shetland.ogc.ows.OWSConstants; import org.n52.shetland.ogc.ows.OWSConstants.GetCapabilitiesParams; diff --git a/service/src/main/java/org/n52/javaps/service/operator/validation/EngineParameterValidator.java b/service/src/main/java/org/n52/javaps/service/operator/validation/EngineParameterValidator.java index 18ace86d..e509d778 100644 --- a/service/src/main/java/org/n52/javaps/service/operator/validation/EngineParameterValidator.java +++ b/service/src/main/java/org/n52/javaps/service/operator/validation/EngineParameterValidator.java @@ -18,7 +18,7 @@ import javax.inject.Inject; -import org.n52.iceland.request.AbstractServiceRequest; +import org.n52.shetland.ogc.ows.service.OwsServiceRequest; import org.n52.iceland.request.operator.ParameterValidator; import org.n52.javaps.engine.Engine; @@ -27,7 +27,7 @@ * * @author Christian Autermann */ -public abstract class EngineParameterValidator implements ParameterValidator { +public abstract class EngineParameterValidator implements ParameterValidator { private Engine engine; diff --git a/service/src/main/java/org/n52/javaps/service/operator/validation/GetCapabiltiesParameterValidator.java b/service/src/main/java/org/n52/javaps/service/operator/validation/GetCapabiltiesParameterValidator.java index b1741132..891529aa 100644 --- a/service/src/main/java/org/n52/javaps/service/operator/validation/GetCapabiltiesParameterValidator.java +++ b/service/src/main/java/org/n52/javaps/service/operator/validation/GetCapabiltiesParameterValidator.java @@ -17,7 +17,7 @@ package org.n52.javaps.service.operator.validation; import org.n52.shetland.ogc.ows.exception.OwsExceptionReport; -import org.n52.iceland.request.GetCapabilitiesRequest; +import org.n52.shetland.ogc.ows.service.GetCapabilitiesRequest; import org.n52.iceland.request.operator.ParameterValidator; /** diff --git a/xml/src/main/java/org/n52/javaps/service/xml/WPSRequestReader.java b/xml/src/main/java/org/n52/javaps/service/xml/WPSRequestReader.java index bf485dd7..e60d068b 100644 --- a/xml/src/main/java/org/n52/javaps/service/xml/WPSRequestReader.java +++ b/xml/src/main/java/org/n52/javaps/service/xml/WPSRequestReader.java @@ -46,8 +46,8 @@ import org.n52.shetland.ogc.wps.data.ReferenceProcessData; import org.n52.shetland.ogc.wps.data.ValueProcessData; import org.n52.shetland.ogc.wps.data.impl.StringValueProcessData; -import org.n52.iceland.request.AbstractServiceRequest; -import org.n52.iceland.request.GetCapabilitiesRequest; +import org.n52.shetland.ogc.ows.service.OwsServiceRequest; +import org.n52.shetland.ogc.ows.service.GetCapabilitiesRequest; import org.n52.javaps.request.DescribeProcessRequest; import org.n52.javaps.request.DismissRequest; import org.n52.javaps.request.ExecuteRequest; @@ -76,7 +76,7 @@ public Set getKeys() { } @Override - public AbstractServiceRequest readElement(XMLEventReader reader) + public OwsServiceRequest readElement(XMLEventReader reader) throws XMLStreamException { while (reader.hasNext()) { XMLEvent event = reader.nextEvent(); @@ -131,7 +131,7 @@ private JobId readJobId(StartElement elem, XMLEventReader reader) } private void readServiceAndVersion(StartElement elem, - AbstractServiceRequest request) { + OwsServiceRequest request) { getAttribute(elem, WPSConstants.Attr.AN_SERVICE).ifPresent(request::setService); getAttribute(elem, WPSConstants.Attr.AN_VERSION).ifPresent(request::setVersion); } diff --git a/xml/src/main/java/org/n52/javaps/service/xml/WPSResponseWriter.java b/xml/src/main/java/org/n52/javaps/service/xml/WPSResponseWriter.java index 5307fb29..cbf13fe6 100644 --- a/xml/src/main/java/org/n52/javaps/service/xml/WPSResponseWriter.java +++ b/xml/src/main/java/org/n52/javaps/service/xml/WPSResponseWriter.java @@ -19,7 +19,7 @@ import javax.xml.stream.XMLStreamException; import org.n52.svalbard.encode.stream.xml.AbstractMultiElementXmlStreamWriter; -import org.n52.iceland.response.GetCapabilitiesResponse; +import org.n52.shetland.ogc.ows.service.GetCapabilitiesResponse; import org.n52.javaps.response.DescribeProcessResponse; import org.n52.javaps.response.DismissResponse; import org.n52.javaps.response.ExecuteResponse; diff --git a/xml/src/test/java/org/n52/javaps/service/xml/WPSRequestReaderTest.java b/xml/src/test/java/org/n52/javaps/service/xml/WPSRequestReaderTest.java index f864a6ee..4d0f1ef7 100644 --- a/xml/src/test/java/org/n52/javaps/service/xml/WPSRequestReaderTest.java +++ b/xml/src/test/java/org/n52/javaps/service/xml/WPSRequestReaderTest.java @@ -54,7 +54,7 @@ import org.n52.shetland.ogc.wps.data.GroupProcessData; import org.n52.shetland.ogc.wps.data.ReferenceProcessData; import org.n52.shetland.ogc.wps.data.impl.StringValueProcessData; -import org.n52.iceland.request.GetCapabilitiesRequest; +import org.n52.shetland.ogc.ows.service.GetCapabilitiesRequest; import org.n52.javaps.request.DescribeProcessRequest; import org.n52.javaps.request.DismissRequest; import org.n52.javaps.request.ExecuteRequest;