Merge pull request #982 from ZakarFin/error-handling

Add error handling for WFS-services
oskariorg · Aug 15, 2023 · 2072878 · 2072878
2 parents ce4bb68 + e4c2179
commit 2072878
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/control-base/src/main/java/org/oskari/control/layer/DescribeLayerHandler.java b/control-base/src/main/java/org/oskari/control/layer/DescribeLayerHandler.java
@@ -169,7 +169,9 @@ private Map<String, Object> getControlData (LayerCapabilitiesWFS caps, WFSLayerA
         if (styleType == null) {
             String geomName = caps.getGeometryField();
             FeaturePropertyType fpt = caps.getFeatureProperty(geomName);
-            styleType = WFSConversionHelper.getStyleType(fpt.type);
+            if (fpt != null) {
+                styleType = WFSConversionHelper.getStyleType(fpt.type);
+            }
         }
         data.put(WFSLayerAttributes.KEY_STYLE_TYPE, styleType);
 

diff --git a/service-capabilities/src/main/java/org/oskari/capabilities/ogc/LayerCapabilitiesWFS.java b/service-capabilities/src/main/java/org/oskari/capabilities/ogc/LayerCapabilitiesWFS.java
@@ -55,6 +55,9 @@ public void setSupportedCrsURIs(Set<String> uris) {
 
     @JsonIgnore
     public FeaturePropertyType getFeatureProperty(String name) {
+        if (name == null) {
+            return null;
+        }
         return getFeatureProperties().stream().filter(p -> name.equals(p.name)).findFirst().orElse(null);
     }
 

diff --git a/service-wfs-client/src/main/java/org/oskari/service/wfs/client/OskariWFSClient.java b/service-wfs-client/src/main/java/org/oskari/service/wfs/client/OskariWFSClient.java
@@ -84,6 +84,9 @@ protected static SimpleFeatureCollection getFeatures(String endPoint,
             url = IOHelper.constructUrl(endPoint, query);
             responseHeaders = OskariWFSClient.readResponseTo(endPoint, user, pass, query, baos);
             response = baos.toByteArray();
+            if (response.length == 0) {
+                throw new ServiceRuntimeException("Empty response from " + url);
+            }
             // TODO: Select parsing algorithm based on response headers (Content-Type)
             fc = parseGeoJSON(response, crs, url);
             if (fc != null) {
@@ -105,6 +108,9 @@ protected static SimpleFeatureCollection getFeatures(String endPoint,
         baos.reset();
         responseHeaders = OskariWFSClient.readResponseTo(endPoint, user, pass, query, baos);
         response = baos.toByteArray();
+        if (response.length == 0) {
+            throw new ServiceRuntimeException("Empty response from " + url);
+        }
         fc = parseGML(response, crs, url, user, pass, gmlDecoder);
         if (fc != null) {
             return fc;