Merge branch 'master' of https://github.com/52North/shetland

* 'master' of https://github.com/52North/shetland: allow empty strings for OwsValue (fixes #3) Fixes #4 Wrong OperationName in ExecuteRequest.java Get default procedure encoding formatting Set defualt encodiung namespace add check method
52North · Jun 1, 2017 · ff4ed5a · ff4ed5a
2 parents e4a8e2b + 5400028
commit ff4ed5a
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 5 deletions.
diff --git a/src/main/java/org/n52/shetland/ogc/ows/OwsValue.java b/src/main/java/org/n52/shetland/ogc/ows/OwsValue.java
@@ -20,7 +20,6 @@
 import java.util.Objects;
 
 import com.google.common.base.MoreObjects;
-import com.google.common.base.Strings;
 
 /**
  * A single value, encoded as a string. This type can be used for one value, for
@@ -33,7 +32,7 @@ public class OwsValue implements OwsValueRestriction {
     private final String value;
 
     public OwsValue(String value) {
-        this.value = Objects.requireNonNull(Strings.emptyToNull(value));
+        this.value = Objects.requireNonNull(value);
     }
 
     public String getValue() {

diff --git a/src/main/java/org/n52/shetland/ogc/sensorML/AbstractComponent.java b/src/main/java/org/n52/shetland/ogc/sensorML/AbstractComponent.java
@@ -52,4 +52,9 @@ public AbstractComponent setLocation(final SmlLocation location) {
     public boolean isSetLocation() {
         return location != null;
     }
+
+    @Override
+    public String getDefaultElementEncoding() {
+        return SensorMLConstants.NS_SML;
+    }
 }
diff --git a/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java b/src/main/java/org/n52/shetland/ogc/sensorML/ProcessChain.java
@@ -56,4 +56,8 @@ public boolean isAggragation() {
         return true;
     }
 
+    @Override
+    public String getDefaultElementEncoding() {
+        return SensorMLConstants.NS_SML;
+    }
 }
diff --git a/src/main/java/org/n52/shetland/ogc/sensorML/ProcessModel.java b/src/main/java/org/n52/shetland/ogc/sensorML/ProcessModel.java
@@ -36,4 +36,9 @@ public void setMethod(final ProcessMethod method) {
     public boolean isSetMethod() {
         return method != null;
     }
+
+    @Override
+    public String getDefaultElementEncoding() {
+        return SensorMLConstants.NS_SML;
+    }
 }
diff --git a/src/main/java/org/n52/shetland/ogc/sensorML/System.java b/src/main/java/org/n52/shetland/ogc/sensorML/System.java
@@ -62,4 +62,9 @@ public boolean isAggragation() {
         return true;
     }
 
+    @Override
+    public String getDefaultElementEncoding() {
+        return SensorMLConstants.NS_SML;
+    }
+
 }
diff --git a/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java b/src/main/java/org/n52/shetland/ogc/sensorML/v20/AbstractProcessV20.java
@@ -18,6 +18,7 @@
 
 import org.n52.shetland.ogc.gml.ReferenceType;
 import org.n52.shetland.ogc.sensorML.AbstractProcess;
+import org.n52.shetland.ogc.sensorML.SensorML20Constants;
 import org.n52.shetland.ogc.sensorML.SensorMLConstants;
 
 /**
@@ -110,4 +111,9 @@ public void setTypeOf(ReferenceType typeOf) {
     public boolean isSetTypeOf() {
         return getTypeOf() != null;
     }
+
+    @Override
+    public String getDefaultElementEncoding() {
+        return SensorML20Constants.NS_SML_20;
+    }
 }
diff --git a/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java b/src/main/java/org/n52/shetland/ogc/sos/SosProcedureDescription.java
@@ -28,6 +28,7 @@
 import org.n52.shetland.ogc.om.AbstractPhenomenon;
 import org.n52.shetland.ogc.sensorML.AbstractSensorML;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.Sets;
 
 /**
@@ -284,4 +285,17 @@ public SosProcedureDescription<T> setIsAggregation(boolean aggregation) {
         this.aggregation = aggregation;
         return this;
     }
+
+    @Override
+    public String getDefaultElementEncoding() {
+        if (getProcedureDescription() != null && !Strings.isNullOrEmpty(getProcedureDescription().getDefaultElementEncoding())) {
+            return getProcedureDescription().getDefaultElementEncoding();
+        }
+        return super.getDefaultElementEncoding();
+    }
+
+    @Override
+    public boolean isSetDefaultElementEncoding() {
+        return super.isSetDefaultElementEncoding() || (getProcedureDescription() != null && !Strings.isNullOrEmpty(getProcedureDescription().getDefaultElementEncoding()));
+    }
 }
diff --git a/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java b/src/main/java/org/n52/shetland/ogc/sos/request/GetObservationByIdRequest.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 
-import org.n52.shetland.ogc.sos.SosConstants;
 import org.n52.shetland.ogc.sos.SosConstants;
 
 /**
@@ -54,6 +53,10 @@ public List<String> getObservationIdentifier() {
         return observationIdentifier;
     }
 
+    public boolean isSetObservationIdentifier() {
+        return observationIdentifier != null && !observationIdentifier.isEmpty();
+    }
+
     /**
      * Set observation identifier
      *

diff --git a/src/main/java/org/n52/shetland/ogc/wml/ObservationProcess.java b/src/main/java/org/n52/shetland/ogc/wml/ObservationProcess.java
@@ -226,4 +226,9 @@ public boolean isSetComments() {
     public boolean isSetParameters() {
         return parameters != null && !parameters.isEmpty();
     }
+
+    @Override
+    public String getDefaultElementEncoding() {
+        return WaterMLConstants.NS_WML_20_PROCEDURE_ENCODING;
+    }
 }
diff --git a/src/main/java/org/n52/shetland/ogc/wps/request/ExecuteRequest.java b/src/main/java/org/n52/shetland/ogc/wps/request/ExecuteRequest.java
@@ -41,11 +41,11 @@ public class ExecuteRequest extends OwsServiceRequest {
     private final List<OutputDefinition> outputs = new LinkedList<>();
 
     public ExecuteRequest() {
-        super(null, null, WPSConstants.Operations.Dismiss.name());
+        super(null, null, WPSConstants.Operations.Execute.name());
     }
 
     public ExecuteRequest(String service, String version) {
-        super(service, version, WPSConstants.Operations.Dismiss.name());
+        super(service, version, WPSConstants.Operations.Execute.name());
     }
 
     public ExecuteRequest(String service, String version, String operationName) {