Wfs split #395

markfodor-gsg · 2025-12-19T15:58:04Z

Checklist

I have read the contribution guidelines.
I have sent a Contribution Licence Agreement (not required for small changes, e.g., fixing typos in documentation).
First PR targets the main branch (backports managed later; ignore for branch specific issues).

For core and extension modules:

New unit tests have been added covering the changes.
Documentation has been updated (if change is visible to end users).
The REST API docs have been updated (when changing configuration objects or the REST controllers).
There is an issue in the GeoServer Jira (except for changes that do not affect administrators or end users in any way).
Commit message(s) must be in the form [GEOS-XYZWV] Title of the Jira ticket.
Bug fixes and small new features are presented as a single commit.
Each commit has a single objective (if there are multiple commits, each has a separate JIRA ticket describing its goal).

The PR will be merged when all the build checks are green (see automated QA checks), there is a code committer review, and the checklist has been fulfilled.

markfodor-gsg · 2025-12-19T16:02:04Z

Current state:

Core and versioned modules are created and part of the build
Most of the tests are separated or split (from mixed test classes) to the versioned modules
Most of the main classes are moved to the versioned modules
Related project dependencies are updates to use the core/versioned module
QA fails on the Core module tests (see below)

Last steps: (to know where to pick it up)

WFSXmlConfiguration introduced to fill the gap between the different implementations
Following tests are refactored and/or moved:
- GML3FeatureProducerTest -> moved to 1_x
- ExternalEntitiesTest -> split into core, 1_x and 2_x
- WFSServiceExceptionTest -> common base class with helper functions and split into 1_x and 2_x
- TransactionListenerTest -> moved to 1_x
- CSVOutputFormatTest -> split into core, 1_x and 2_x (2_x needs fixing)
- GeoJSONTest -> partly migrated to 1_x (the leftover is in core for shared and 2_x)

Next steps:

Fix tests in Core and versioned modules
Move resources from core (schemas, js file and ChangeNumberOfFeature.xslt can stay, ChangeNumberOfFeature32.xslt -> 2_x)
Following services classes need to be moved with their direct dependencies
- WebFeatureService
- WebFeatureService20
- DefaultWebFeatureService
- DefaultWebFeatureService20
Review the bean definitions in the pom files
Manual testing

… the new modules

Copilot

Pull request overview

This PR refactors the WFS module by splitting it into three separate modules: wfs-core, wfs1_x, and wfs2_x. The changes separate version-specific WFS implementations from shared core functionality, improving modularity and maintainability.

Changes:

Created new wfs-core module containing shared WFS functionality across all versions
Created new wfs1_x module for WFS 1.0 and 1.1 version-specific implementations
Updated all module dependencies throughout the codebase to reference the new artifact IDs

Reviewed changes

Copilot reviewed 86 out of 539 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/wfs1_x/src/main/java/org/geoserver/wfs/xml/v1_0_0/GetFeatureTypeBinding.java	Updated import to use new WFS1XSqlViewParamsHelper class
src/wfs1_x/src/main/java/org/geoserver/wfs/xml/WFS1XSqlViewParamsHelper.java	New helper class for WFS 1.x SQL view parameters handling
src/wfs1_x/src/main/java/org/geoserver/wfs/xml/GML3OutputFormat.java	New WFS 1.x specific GML3 output format implementation
src/wfs1_x/src/main/java/applicationContext.xml	New Spring configuration for WFS 1.x module
src/wfs1_x/pom.xml	New Maven POM for WFS 1.x module
src/wfs/src/test/java/org/geoserver/wfs/ExternalEntitiesTest.java	Test file removed from old location
src/wfs/src/main/java/applicationContext.xml	Configuration file removed from old location
src/wfs-core/src/test/java/org/geoserver/wfs/response/CSVOutputFormatTest.java	New test file for CSV output format
src/wfs-core/src/test/java/org/geoserver/wfs/WFSTestSupport.java	Updated test support class with simplified interface
src/wfs-core/src/test/java/org/geoserver/wfs/WFSServiceExceptionTestSupport.java	Refactored to abstract base class for exception testing
src/wfs-core/src/test/java/org/geoserver/wfs/ExternalEntitiesTest.java	Test file moved to new location
src/wfs-core/src/main/java/org/geoserver/wfs/xml/XmlSchemaEncoder.java	Moved to wfs-core with updated package and namespace handling
src/wfs-core/src/main/java/org/geoserver/wfs/xml/WFSXmlConfiguration.java	New interface for WFS XML configurations
src/wfs-core/src/main/java/org/geoserver/wfs/xml/SqlViewParamsExtractor.java	Removed version-specific method, kept shared functionality
src/wfs-core/src/main/java/org/geoserver/wfs/xml/BaseGML3OutputFormat.java	New abstract base class for GML3 output formats
src/wfs-core/src/main/java/org/geoserver/wfs/WFSConstants.java	New constants class for shared WFS values
src/wfs-core/src/main/java/org/geoserver/wfs/FeatureTypeUtils.java	New utility class for feature type operations
src/wfs-core/src/main/java/applicationContext.xml	New Spring configuration for wfs-core module
src/wfs-core/pom.xml	Updated Maven artifact ID and added test-jar goal
src/pom.xml	Updated to include new module references
Various pom.xml files	Updated dependencies from gs-wfs to gs-wfs-core, gs-wfs1_x, or gs-wfs2_x

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

aaime

Looks pretty good. See comments below for minor issues found.
For the missing copyright headers please add this:

/* (c) 2026 Open Source Geospatial Foundation - all rights reserved
 * This code is licensed under the GPL 2.0 license, available at the root
 * application directory.
 */

Perform an update and then go straight to the public repository PR.
Please remember to create a Jira ticket for this, if it was not done already, and contribute as a single commit.

aaime · 2026-01-16T09:56:56Z

src/community/features-templating/features-templating-ows/pom.xml

+    </dependency>
+    <dependency>
+      <groupId>org.geoserver</groupId>
+      <artifactId>gs-wfs1_x</artifactId>


Are you sure it's enough? I see mentions of wfs 2.0 requests too, e.g.:
https://github.com/geoserver/geoserver/blob/99ae245402fca51e306eaf9817faaa891bf89e73/src/community/features-templating/features-templating-ows/src/test/java/org/geoserver/featurestemplating/response/FlatGeoJSONComplexFeaturesResponseWFSTest.java#L52

There are also requests using 1.1 and 1.0, so what seems to be missing is 2.0.
At the same time, that would be a test dependency.

aaime · 2026-01-16T10:02:05Z

src/community/ogcapi/dggs/ogcapi-dggs/pom.xml

+      <artifactId>gs-wfs-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>


Not sure why, to be verified

aaime · 2026-01-16T10:16:11Z

src/extension/ogr/ogr-wfs/pom.xml

    <dependency>
      <groupId>org.geoserver</groupId>
-      <artifactId>gs-wfs</artifactId>
+      <artifactId>gs-wfs-core</artifactId>


There are tests that use WFS 1.X, which run only if the ogr2ogr utility is available in the path.
For the tests to run successfully, please add the following test dependency as well:

<dependency> <groupId>org.geoserver</groupId> <artifactId>gs-wfs1_x</artifactId> <scope>test</scope> </dependency>

aaime · 2026-01-16T10:27:29Z

src/community/schemaless-features/schemaless-core/pom.xml

@@ -21,7 +21,8 @@
    </dependency>
    <dependency>


It also needs a wfs 1.x dependency scoped as test

aaime · 2026-01-16T10:28:53Z

src/community/wfs-freemarker/pom.xml

    <dependency>
      <groupId>org.geoserver</groupId>
-      <artifactId>gs-wfs</artifactId>
+      <artifactId>gs-wfs-core</artifactId>


It also needs wfs 1.x (scoped as test dependency) to run tests

aaime · 2026-01-16T11:13:09Z

src/wfs2_x/src/test/java/org/geoserver/wfs/response/CSVOutputFormatTest.java

@@ -0,0 +1,43 @@
+package org.geoserver.wfs.response;


Needs copyright header

aaime · 2026-01-16T11:21:27Z

src/wfs2_x/src/test/java/org/geoserver/wfs/WFSServiceExceptionTest.java

@@ -0,0 +1,23 @@
+package org.geoserver.wfs;


Lacks copyright header

aaime · 2026-01-16T11:23:30Z

src/wfs1_x/src/test/java/org/geoserver/wfs/ExternalEntitiesTest.java

@@ -0,0 +1,136 @@
+package org.geoserver.wfs;


Needs copyright header

aaime · 2026-01-16T11:23:59Z

src/wfs2_x/src/test/java/org/geoserver/wfs/SQLViewTest.java

@@ -0,0 +1,124 @@
+package org.geoserver.wfs;


Needs copyright header

aaime · 2026-01-16T11:25:57Z

src/wfs2_x/src/test/java/org/geoserver/wfs/v2_0/GetFeatureTest.java

@@ -1046,11 +1015,6 @@ public void testUserSuppliedDefaultNamespace() throws Exception {
                + ")");
    }

-    @Test


Wait, why has it been removed?

Good catch, probably removed by accident

markfodor-gsg force-pushed the wfs_split branch 2 times, most recently from 7c05611 to a429044 Compare January 14, 2026 14:09

markfodor-gsg added 5 commits January 14, 2026 17:30

GEOS-12020 split WFS module

d340d05

Move main classes to the versioned modules and distribute tests among…

575fcb4

… the new modules

GEOS-12020 test fixes and dependency updates

6f950fb

GEOS-12020 remove old wfs dependencies and update tests

d0ae81c

GS-12020 fix wfs1_x pom file

6bf8023

markfodor-gsg force-pushed the wfs_split branch from a429044 to 6bf8023 Compare January 14, 2026 16:30

aaime requested a review from Copilot January 15, 2026 17:54

Copilot AI reviewed Jan 15, 2026

View reviewed changes

aaime requested changes Jan 16, 2026

View reviewed changes

GS-12020 fix community modules and add missing headers

61ee6cb

markfodor-gsg closed this Jan 19, 2026

                               + ")");
                   }
-                  @Test

Wfs split #395

Wfs split #395

Uh oh!

Conversation

markfodor-gsg commented Dec 19, 2025

Checklist

Uh oh!

markfodor-gsg commented Dec 19, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

aaime left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants