deegree#892 - implemented configuration of gml application schema per…

… gml version
lat-lon · Oct 21, 2019 · 6f39c17 · 6f39c17
1 parent ea5d1da
commit 6f39c17
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 9 deletions.
diff --git a/...ces/deegree-services-wfs/src/main/java/org/deegree/services/wfs/format/gml/GmlFormat.java b/...ces/deegree-services-wfs/src/main/java/org/deegree/services/wfs/format/gml/GmlFormat.java
@@ -39,6 +39,7 @@
 import static org.deegree.protocol.wfs.getfeature.ResultType.RESULTS;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.List;
 
 import javax.xml.bind.JAXBElement;
@@ -52,12 +53,14 @@
 import org.deegree.geometry.io.DecimalCoordinateFormatter;
 import org.deegree.geometry.linearization.MaxErrorCriterion;
 import org.deegree.gml.GMLVersion;
+import org.deegree.gml.schema.GMLSchemaInfoSet;
 import org.deegree.protocol.wfs.describefeaturetype.DescribeFeatureType;
 import org.deegree.protocol.wfs.getfeature.GetFeature;
 import org.deegree.protocol.wfs.getfeature.ResultType;
 import org.deegree.protocol.wfs.getgmlobject.GetGmlObject;
 import org.deegree.protocol.wfs.getpropertyvalue.GetPropertyValue;
 import org.deegree.services.controller.utils.HttpResponseBuffer;
+import org.deegree.services.jaxb.wfs.GMLFormat;
 import org.deegree.services.jaxb.wfs.GMLFormat.GetFeatureResponse;
 import org.deegree.services.jaxb.wfs.GMLFormat.GetFeatureResponse.PrebindNamespace;
 import org.deegree.services.jaxb.wfs.GeometryLinearization;
@@ -117,7 +120,7 @@ public GmlFormat( WebFeatureService master, GMLVersion gmlVersion ) {
         this.master = master;
         this.options = new GmlFormatOptions( gmlVersion, null, null, null, false, false, master.getQueryMaxFeatures(),
                                              master.getCheckAreaOfUse(), null, null, gmlVersion.getMimeType(), false,
-                                             null, null, master.isEnableResponsePaging() );
+                                             null, null, master.isEnableResponsePaging(), null );
         this.dftHandler = new GmlDescribeFeatureTypeHandler( this );
         this.gfHandler = new GmlGetFeatureHandler( this );
         this.gpvHandler = new GmlGetPropertyValueHandler( this );
@@ -136,6 +139,7 @@ public GmlFormat( WebFeatureService master, GMLVersion gmlVersion ) {
     public GmlFormat( WebFeatureService master, org.deegree.services.jaxb.wfs.GMLFormat formatDef )
                             throws ResourceInitException {
         this.master = master;
+        final GMLVersion gmlVersion = GMLVersion.valueOf( formatDef.getGmlVersion().value() );
 
         boolean generateBoundedByForFeatures = false, disableStreaming = false;
         if ( formatDef.isGenerateBoundedByForFeatures() != null ) {
@@ -144,6 +148,7 @@ public GmlFormat( WebFeatureService master, org.deegree.services.jaxb.wfs.GMLFor
 
         QName responseContainerEl = null, responseFeatureMemberEl = null;
         String schemaLocation = null, appSchemaBaseURL = null;
+        GMLSchemaInfoSet originalSchemaLocation = null;
 
         GetFeatureResponse responseConfig = formatDef.getGetFeatureResponse();
         boolean exportOriginalSchema = false;
@@ -171,6 +176,9 @@ public GmlFormat( WebFeatureService master, org.deegree.services.jaxb.wfs.GMLFor
                     appSchemaBaseURL = null;
                 }
             }
+            if ( responseConfig.getSchemaLocation() != null ) {
+                originalSchemaLocation = createGmlSchemaInfoSet(gmlVersion, responseConfig);
+            }
             prebindNamespaces = getNamespaceBindings( responseConfig.getPrebindNamespace() );
         }
 
@@ -198,14 +206,13 @@ public GmlFormat( WebFeatureService master, org.deegree.services.jaxb.wfs.GMLFor
             throw new ResourceInitException( "Error initializing coordinate formatter: " + e.getMessage(), e );
         }
 
-        final GMLVersion gmlVersion = GMLVersion.valueOf( formatDef.getGmlVersion().value() );
         final String mimeType = trim( formatDef.getMimeType().get( 0 ) );
         final SFSProfiler geometrySimplifier = getSfsProfiler( formatDef.getGeometryLinearization() );
         this.options = new GmlFormatOptions( gmlVersion, responseContainerEl, responseFeatureMemberEl, schemaLocation,
                                              disableStreaming, generateBoundedByForFeatures, queryMaxFeatures,
                                              checkAreaOfUse, formatter, appSchemaBaseURL, mimeType,
                                              exportOriginalSchema, geometrySimplifier, prebindNamespaces,
-                                             master.isEnableResponsePaging() );
+                                             master.isEnableResponsePaging(), originalSchemaLocation );
 
         this.dftHandler = new GmlDescribeFeatureTypeHandler( this );
         this.gfHandler = new GmlGetFeatureHandler( this );
@@ -293,4 +300,15 @@ public WebFeatureService getMaster() {
     public GmlFormatOptions getGmlFormatOptions() {
         return options;
     }
+
+    private GMLSchemaInfoSet createGmlSchemaInfoSet( GMLVersion gmlVersion,
+                                                     GetFeatureResponse responseConfig ) {
+        try {
+            URL url = this.master.getMetadata().getLocation().resolveToUrl( responseConfig.getSchemaLocation() );
+            return new GMLSchemaInfoSet( gmlVersion, url.toString() );
+        } catch ( Exception e ) {
+            throw new ResourceInitException( "Error resolving of initializing schema location: " + e.getMessage(), e );
+        }
+    }
+
 }
diff --git a/...gree-services-wfs/src/main/java/org/deegree/services/wfs/format/gml/GmlFormatOptions.java b/...gree-services-wfs/src/main/java/org/deegree/services/wfs/format/gml/GmlFormatOptions.java
@@ -41,6 +41,7 @@
 import org.deegree.geometry.SFSProfiler;
 import org.deegree.geometry.io.CoordinateFormatter;
 import org.deegree.gml.GMLVersion;
+import org.deegree.gml.schema.GMLSchemaInfoSet;
 
 /**
  * Configuration options for {@link GmlFormat}.
@@ -82,6 +83,9 @@ public class GmlFormatOptions {
 
     private final boolean enableResponsePaging;
 
+    private final GMLSchemaInfoSet originalSchemaLocation;
+
+
     /**
      * Creates a new {@link GmlFormatOptions} instance.
      * 
@@ -114,7 +118,8 @@ public GmlFormatOptions( final GMLVersion gmlVersion, final QName responseContai
                              final int queryMaxFeatures, final boolean checkAreaOfUse,
                              final CoordinateFormatter formatter, final String appSchemaBaseURL, final String mimeType,
                              final boolean exportOriginalSchema, final SFSProfiler geometrySimplifier,
-                             final NamespaceBindings prebindNamespaces, final boolean enableResponsePaging ) {
+                             final NamespaceBindings prebindNamespaces, final boolean enableResponsePaging,
+                             final GMLSchemaInfoSet originalSchemaLocation ) {
         this.gmlVersion = gmlVersion;
         this.responseContainerEl = responseContainerEl;
         this.responseFeatureMemberEl = responseFeatureMemberEl;
@@ -130,6 +135,7 @@ public GmlFormatOptions( final GMLVersion gmlVersion, final QName responseContai
         this.geometrySimplifier = geometrySimplifier;
         this.prebindNamespaces = prebindNamespaces;
         this.enableResponsePaging = enableResponsePaging;
+        this.originalSchemaLocation = originalSchemaLocation;
     }
 
     /**
@@ -239,4 +245,9 @@ public boolean isEnableResponsePaging() {
         return enableResponsePaging;
     }
 
+
+    public GMLSchemaInfoSet getOriginalSchemaLocation() {
+        return originalSchemaLocation;
+    }
+
 }
diff --git a/.../main/java/org/deegree/services/wfs/format/gml/request/GmlDescribeFeatureTypeHandler.java b/.../main/java/org/deegree/services/wfs/format/gml/request/GmlDescribeFeatureTypeHandler.java
@@ -250,12 +250,16 @@ private void doDescribeFeatureType( DescribeFeatureType request, GMLVersion vers
             Collection<String> namespaces = determineRequiredNamespaces( request );
             String targetNs = namespaces.iterator().next();
             if ( options.isExportOriginalSchema() ) {
-                GMLSchemaInfoSet gmlSchema = findGmlSchema( namespaces, version );
-                if ( gmlSchema != null ) {
-                    exportOriginalInfoSet( writer, gmlSchema, targetNs );
+                if (options.getOriginalSchemaLocation() != null) {
+                    exportOriginalInfoSet(writer, options.getOriginalSchemaLocation(), targetNs);
                 } else {
-                    LOG.warn( "Could not find original schema corresponding to the requested schema, try to reencode the schema!" );
-                    reencodeSchema( request, writer, targetNs, namespaces, version );
+                    GMLSchemaInfoSet gmlSchema = findGmlSchema(namespaces, version);
+                    if (gmlSchema != null) {
+                        exportOriginalInfoSet(writer, gmlSchema, targetNs);
+                    } else {
+                        LOG.warn("Could not find original schema corresponding to the requested schema, try to reencode the schema!");
+                        reencodeSchema(request, writer, targetNs, namespaces, version);
+                    }
                 }
             } else {
                 reencodeSchema( request, writer, targetNs, namespaces, version );

diff --git a/...services-wfs/src/main/resources/META-INF/schemas/services/wfs/3.4.0/wfs_configuration.xsd b/...services-wfs/src/main/resources/META-INF/schemas/services/wfs/3.4.0/wfs_configuration.xsd
@@ -135,6 +135,7 @@
                       </simpleContent>
                     </complexType>
                   </element>
+                  <element name="SchemaLocation" type="string" minOccurs="0" />
                   <element name="DisableStreaming" type="boolean" minOccurs="0" default="false" />
                   <element name="PrebindNamespace" minOccurs="0" maxOccurs="unbounded">
                     <complexType>