Merge pull request #47 from 52North/develop

Merge develop
52North · Nov 11, 2019 · 4b55e10 · 4b55e10
2 parents d8219ae + 9a15629
commit 4b55e10
Show file tree

Hide file tree

Showing 39 changed files with 1,002 additions and 730 deletions.
diff --git a/.gitignore b/.gitignore
@@ -141,3 +141,5 @@ Temporary Items
 webapp/logs/
 
 logs/
+.idea/
+*.iml
diff --git a/Dockerfile b/Dockerfile
@@ -12,7 +12,7 @@ RUN mvn --batch-mode --errors --fail-fast \
 
 FROM jetty:jre8
 
-ARG JAVAPS_VERSION=1.3.0-SNAPSHOT
+ARG JAVAPS_VERSION=1.4.0-SNAPSHOT
 ENV JAVAPS_VERSION ${JAVAPS_VERSION}
 ENV JAVAPS_ROOT ${JETTY_BASE}/webapps/ROOT
 ENV JAVAPS_TMP ${JAVAPS_ROOT}/WEB-INF/tmp

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
@@ -12,7 +12,7 @@ RUN mvn --batch-mode --errors --fail-fast \
 
 FROM jetty:jre8-alpine
 
-ARG JAVAPS_VERSION=1.3.0-SNAPSHOT
+ARG JAVAPS_VERSION=1.4.0-SNAPSHOT
 ENV JAVAPS_VERSION ${JAVAPS_VERSION}
 ENV JAVAPS_ROOT ${JETTY_BASE}/webapps/ROOT
 ENV JAVAPS_TMP ${JAVAPS_ROOT}/WEB-INF/tmp

diff --git a/engine/src/main/java/org/n52/javaps/algorithm/ProcessOutputs.java b/engine/src/main/java/org/n52/javaps/algorithm/ProcessOutputs.java
@@ -16,12 +16,12 @@
  */
 package org.n52.javaps.algorithm;
 
+import org.n52.javaps.io.Data;
+import org.n52.shetland.ogc.ows.OwsCode;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import org.n52.shetland.ogc.ows.OwsCode;
-import org.n52.javaps.io.Data;
-
 /**
  * TODO JavaDoc
  *
@@ -37,4 +37,8 @@ public ProcessOutputs(Map<? extends OwsCode, ? extends Data<?>> m) {
         super(m);
     }
 
+    public ProcessOutputs(int initialCapacity) {
+        super(initialCapacity);
+    }
+
 }
diff --git a/engine/src/main/java/org/n52/javaps/algorithm/annotation/AnnotatedAlgorithmMetadata.java b/engine/src/main/java/org/n52/javaps/algorithm/annotation/AnnotatedAlgorithmMetadata.java
diff --git a/engine/src/main/java/org/n52/javaps/description/TypedBoundingBoxDescription.java b/engine/src/main/java/org/n52/javaps/description/TypedBoundingBoxDescription.java
@@ -25,8 +25,8 @@
  *
  * @author Christian Autermann
  */
-public interface TypedBoundingBoxDescription extends BoundingBoxDescription, TypedDataDescription<Class<
-        ? extends BoundingBoxData>> {
+public interface TypedBoundingBoxDescription extends BoundingBoxDescription,
+                                                     TypedDataDescription<Class<? extends BoundingBoxData>> {
 
     @Override
     default Class<?> getPayloadType() {

diff --git a/engine/src/main/java/org/n52/javaps/description/TypedDataDescription.java b/engine/src/main/java/org/n52/javaps/description/TypedDataDescription.java
@@ -16,11 +16,10 @@
  */
 package org.n52.javaps.description;
 
-import org.n52.shetland.ogc.wps.description.DataDescription;
 import org.n52.javaps.io.Data;
+import org.n52.shetland.ogc.wps.description.DataDescription;
 
 /**
- *
  * @author Christian Autermann
  */
 public interface TypedDataDescription<X> extends DataDescription {
@@ -31,8 +30,8 @@ public interface TypedDataDescription<X> extends DataDescription {
 
     Class<? extends Data<?>> getBindingType();
 
-    interface Builder<X, T extends TypedDataDescription<X>, B extends Builder<X, T, B>> extends DataDescription.Builder<
-            T, B> {
+    interface Builder<X, T extends TypedDataDescription<X>, B extends Builder<X, T, B>>
+            extends DataDescription.Builder<T, B> {
         B withType(X type);
     }
 

diff --git a/engine/src/main/java/org/n52/javaps/description/TypedGroupInputDescription.java b/engine/src/main/java/org/n52/javaps/description/TypedGroupInputDescription.java
@@ -16,16 +16,39 @@
  */
 package org.n52.javaps.description;
 
+import org.n52.javaps.algorithm.ProcessInputs;
+import org.n52.javaps.io.Data;
+import org.n52.javaps.io.GroupInputData;
 import org.n52.shetland.ogc.wps.description.GroupInputDescription;
 
 /**
- *
  * @author Christian Autermann
  */
-public interface TypedGroupInputDescription extends GroupInputDescription, TypedProcessInputDescriptionContainer {
+public interface TypedGroupInputDescription extends GroupInputDescription, TypedProcessInputDescriptionContainer,
+                                                    TypedProcessInputDescription<Class<? extends Data<ProcessInputs>>> {
+
+    @Override
+    default Class<? extends Data<ProcessInputs>> getType() {
+        return GroupInputData.class;
+    }
+
+    @Override
+    default Class<?> getPayloadType() {
+        return ProcessInputs.class;
+    }
+
+    @Override
+    default Class<? extends Data<?>> getBindingType() {
+        return GroupInputData.class;
+    }
+
     @Override
     default TypedGroupInputDescription asGroup() {
         return this;
     }
 
+    interface Builder<T extends TypedGroupInputDescription, B extends Builder<T, B>>
+            extends GroupInputDescription.Builder<T, B>,
+                    TypedProcessInputDescriptionContainer.Builder<T, B> {
+    }
 }
diff --git a/engine/src/main/java/org/n52/javaps/description/TypedGroupOutputDescription.java b/engine/src/main/java/org/n52/javaps/description/TypedGroupOutputDescription.java
@@ -16,16 +16,41 @@
  */
 package org.n52.javaps.description;
 
+import org.n52.javaps.algorithm.ProcessOutputs;
+import org.n52.javaps.io.Data;
+import org.n52.javaps.io.GroupOutputData;
 import org.n52.shetland.ogc.wps.description.GroupOutputDescription;
 
 /**
- *
  * @author Christian Autermann
  */
-public interface TypedGroupOutputDescription extends GroupOutputDescription, TypedProcessOutputDescriptionContainer {
+public interface TypedGroupOutputDescription
+        extends GroupOutputDescription, TypedProcessOutputDescriptionContainer,
+                TypedProcessOutputDescription<Class<? extends Data<ProcessOutputs>>> {
+
+    @Override
+    default Class<? extends Data<ProcessOutputs>> getType() {
+        return GroupOutputData.class;
+    }
+
+    @Override
+    default Class<?> getPayloadType() {
+        return ProcessOutputs.class;
+    }
+
+    @Override
+    default Class<? extends Data<?>> getBindingType() {
+        return GroupOutputData.class;
+    }
+
     @Override
     default TypedGroupOutputDescription asGroup() {
         return this;
     }
 
+    interface Builder<T extends TypedGroupOutputDescription, B extends Builder<T, B>>
+            extends GroupOutputDescription.Builder<T, B>,
+                    TypedProcessOutputDescriptionContainer.Builder<T, B> {
+    }
+
 }
diff --git a/engine/src/main/java/org/n52/javaps/description/TypedProcessDescription.java b/engine/src/main/java/org/n52/javaps/description/TypedProcessDescription.java
@@ -23,7 +23,15 @@
  *
  * @author Christian Autermann
  */
-public interface TypedProcessDescription extends ProcessDescription, TypedProcessInputDescriptionContainer,
-        TypedProcessOutputDescriptionContainer {
+public interface TypedProcessDescription extends ProcessDescription,
+                                                 TypedProcessInputDescriptionContainer,
+                                                 TypedProcessOutputDescriptionContainer {
+
+    interface Builder<T extends TypedProcessDescription, B extends Builder<T, B>>
+            extends ProcessDescription.Builder<T, B>,
+                    TypedProcessInputDescriptionContainer.Builder<T, B>,
+                    TypedProcessOutputDescriptionContainer.Builder<T, B> {
+
+    }
 
 }
diff --git a/engine/src/main/java/org/n52/javaps/description/TypedProcessInputDescriptionContainer.java b/engine/src/main/java/org/n52/javaps/description/TypedProcessInputDescriptionContainer.java
@@ -16,13 +16,12 @@
  */
 package org.n52.javaps.description;
 
-import java.util.Collection;
-
 import org.n52.shetland.ogc.ows.OwsCode;
 import org.n52.shetland.ogc.wps.description.ProcessInputDescriptionContainer;
 
+import java.util.Collection;
+
 /**
- *
  * @author Christian Autermann
  */
 public interface TypedProcessInputDescriptionContainer extends ProcessInputDescriptionContainer {
@@ -37,4 +36,6 @@ default TypedProcessInputDescription<?> getInput(String id) {
     @Override
     Collection<? extends TypedProcessInputDescription<?>> getInputDescriptions();
 
+    interface Builder<T extends TypedProcessInputDescriptionContainer, B extends Builder<T, B>>
+            extends ProcessInputDescriptionContainer.Builder<T, B> {}
 }
diff --git a/engine/src/main/java/org/n52/javaps/description/TypedProcessOutputDescriptionContainer.java b/engine/src/main/java/org/n52/javaps/description/TypedProcessOutputDescriptionContainer.java
@@ -16,13 +16,12 @@
  */
 package org.n52.javaps.description;
 
-import java.util.Collection;
-
 import org.n52.shetland.ogc.ows.OwsCode;
 import org.n52.shetland.ogc.wps.description.ProcessOutputDescriptionContainer;
 
+import java.util.Collection;
+
 /**
- *
  * @author Christian Autermann
  */
 public interface TypedProcessOutputDescriptionContainer extends ProcessOutputDescriptionContainer {
@@ -36,4 +35,7 @@ default TypedProcessOutputDescription<?> getOutput(String id) {
 
     @Override
     Collection<? extends TypedProcessOutputDescription<?>> getOutputDescriptions();
+
+    interface Builder<T extends TypedProcessOutputDescriptionContainer, B extends Builder<T, B>>
+            extends ProcessOutputDescriptionContainer.Builder<T, B> {}
 }
diff --git a/...e/src/main/java/org/n52/javaps/description/impl/TypedBoundingBoxInputDescriptionImpl.java b/...e/src/main/java/org/n52/javaps/description/impl/TypedBoundingBoxInputDescriptionImpl.java
@@ -16,33 +16,43 @@
  */
 package org.n52.javaps.description.impl;
 
-import java.util.Set;
-
-import org.n52.shetland.ogc.ows.OwsCRS;
-import org.n52.shetland.ogc.ows.OwsCode;
-import org.n52.shetland.ogc.ows.OwsKeyword;
-import org.n52.shetland.ogc.ows.OwsLanguageString;
-import org.n52.shetland.ogc.ows.OwsMetadata;
-import org.n52.shetland.ogc.wps.InputOccurence;
-import org.n52.shetland.ogc.wps.description.impl.BoundingBoxInputDescriptionImpl;
 import org.n52.javaps.description.TypedBoundingBoxInputDescription;
+import org.n52.shetland.ogc.wps.description.BoundingBoxInputDescription;
+import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory;
+import org.n52.shetland.ogc.wps.description.impl.BoundingBoxInputDescriptionImpl;
 
-public class TypedBoundingBoxInputDescriptionImpl extends BoundingBoxInputDescriptionImpl implements
-        TypedBoundingBoxInputDescription {
+public class TypedBoundingBoxInputDescriptionImpl extends BoundingBoxInputDescriptionImpl
+        implements TypedBoundingBoxInputDescription {
 
-    public TypedBoundingBoxInputDescriptionImpl(OwsCode id, OwsLanguageString title, OwsLanguageString abstrakt, Set<
-            OwsKeyword> keywords, Set<OwsMetadata> metadata, InputOccurence occurence, OwsCRS defaultCRS, Set<
-                    OwsCRS> supportedCRS) {
-        super(id, title, abstrakt, keywords, metadata, occurence, defaultCRS, supportedCRS);
+    protected TypedBoundingBoxInputDescriptionImpl(AbstractBuilder<?, ?> builder) {
+        super(builder);
     }
 
-    protected TypedBoundingBoxInputDescriptionImpl(AbstractBuilder<?, ?> builder) {
-        this(builder.getId(), builder.getTitle(), builder.getAbstract(), builder.getKeywords(), builder.getMetadata(),
-                new InputOccurence(builder.getMinimalOccurence(), builder.getMaximalOccurence()), builder
-                        .getDefaultCRS(), builder.getSupportedCRS());
+    protected abstract static class AbstractBuilder<T extends TypedBoundingBoxInputDescription,
+                                                        B extends AbstractBuilder<T, B>>
+            extends BoundingBoxInputDescriptionImpl.AbstractBuilder<T, B>
+            implements TypedBoundingBoxInputDescription.Builder<T, B> {
+        protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory,
+                                  BoundingBoxInputDescription entity) {
+            super(factory, entity);
+        }
+
+        protected AbstractBuilder(
+                ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory) {
+            super(factory);
+        }
     }
 
     public static class Builder extends AbstractBuilder<TypedBoundingBoxInputDescription, Builder> {
+        protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory,
+                          BoundingBoxInputDescription entity) {
+            super(factory, entity);
+        }
+
+        protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory) {
+            super(factory);
+        }
+
         @Override
         public TypedBoundingBoxInputDescription build() {
             return new TypedBoundingBoxInputDescriptionImpl(this);

diff --git a/.../src/main/java/org/n52/javaps/description/impl/TypedBoundingBoxOutputDescriptionImpl.java b/.../src/main/java/org/n52/javaps/description/impl/TypedBoundingBoxOutputDescriptionImpl.java
@@ -16,40 +16,47 @@
  */
 package org.n52.javaps.description.impl;
 
-import java.util.Set;
-
-import org.n52.shetland.ogc.ows.OwsCRS;
-import org.n52.shetland.ogc.ows.OwsCode;
-import org.n52.shetland.ogc.ows.OwsKeyword;
-import org.n52.shetland.ogc.ows.OwsLanguageString;
-import org.n52.shetland.ogc.ows.OwsMetadata;
-import org.n52.shetland.ogc.wps.description.impl.BoundingBoxOutputDescriptionImpl;
 import org.n52.javaps.description.TypedBoundingBoxOutputDescription;
+import org.n52.shetland.ogc.wps.description.BoundingBoxOutputDescription;
+import org.n52.shetland.ogc.wps.description.ProcessDescriptionBuilderFactory;
+import org.n52.shetland.ogc.wps.description.impl.BoundingBoxOutputDescriptionImpl;
 
-public class TypedBoundingBoxOutputDescriptionImpl extends BoundingBoxOutputDescriptionImpl implements
-        TypedBoundingBoxOutputDescription {
-
-    public TypedBoundingBoxOutputDescriptionImpl(OwsCode id, OwsLanguageString title, OwsLanguageString abstrakt, Set<
-            OwsKeyword> keywords, Set<OwsMetadata> metadata, OwsCRS defaultCRS, Set<OwsCRS> supportedCRS) {
-        super(id, title, abstrakt, keywords, metadata, defaultCRS, supportedCRS);
-    }
+public class TypedBoundingBoxOutputDescriptionImpl extends BoundingBoxOutputDescriptionImpl
+        implements TypedBoundingBoxOutputDescription {
 
     protected TypedBoundingBoxOutputDescriptionImpl(AbstractBuilder<?, ?> builder) {
-        this(builder.getId(), builder.getTitle(), builder.getAbstract(), builder.getKeywords(), builder.getMetadata(),
-                builder.getDefaultCRS(), builder.getSupportedCRS());
+        super(builder);
     }
 
-    public abstract static class AbstractBuilder<T extends TypedBoundingBoxOutputDescription, B extends AbstractBuilder<
-            T, B>> extends BoundingBoxOutputDescriptionImpl.AbstractBuilder<T, B> implements
-            TypedBoundingBoxOutputDescription.Builder<T, B> {
+    protected abstract static class AbstractBuilder<T extends TypedBoundingBoxOutputDescription,
+                                                        B extends AbstractBuilder<T, B>>
+            extends BoundingBoxOutputDescriptionImpl.AbstractBuilder<T, B>
+            implements TypedBoundingBoxOutputDescription.Builder<T, B> {
+        protected AbstractBuilder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory,
+                                  BoundingBoxOutputDescription entity) {
+            super(factory, entity);
+        }
+
+        protected AbstractBuilder(
+                ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory) {
+            super(factory);
+        }
     }
 
     public static class Builder extends AbstractBuilder<TypedBoundingBoxOutputDescription, Builder> {
+        protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory,
+                          BoundingBoxOutputDescription entity) {
+            super(factory, entity);
+        }
+
+        protected Builder(ProcessDescriptionBuilderFactory<?, ?, ?, ?, ?, ?, ?, ?, ?, ?> factory) {
+            super(factory);
+        }
+
         @Override
         public TypedBoundingBoxOutputDescription build() {
             return new TypedBoundingBoxOutputDescriptionImpl(this);
         }
-
     }
 
 }