HTM-1852 | HTM-1964: Upgrade to GeoTools 35.0 and re-instate GeoJSON extract#1806
HTM-1852 | HTM-1964: Upgrade to GeoTools 35.0 and re-instate GeoJSON extract#1806mprins wants to merge 2 commits into
Conversation
Dependency ReviewThe following issues were found:
Snapshot WarningsEnsure that dependencies are being submitted on PR branches and consider enabling retry-on-snapshot-warnings. See the documentation for more information and troubleshooting advice. License Issuespom.xml
OpenSSF Scorecard
Scanned Files
|
Test Results639 tests +639 636 ✅ +636 2h 57m 28s ⏱️ + 2h 57m 28s For more details on these failures, see this check. Results for commit 76c9d0f. ± Comparison against base commit 9f86afc. ♻️ This comment has been updated with latest results. |
remove automagic wms/wfs relation creation from testdata setup and cleanup unused code; this will make our test setup more explicit and reliable related to #1806
143c166 to
5633a2d
Compare
5633a2d to
1a0afed
Compare
There was a problem hiding this comment.
Pull request overview
This PR upgrades the project to GeoTools 35.0 and restores GeoJSON as a supported extract output format, while also hardening/adjusting GeoTools XML entity resolution to keep local-entity blocking in place but allow GeoServer-style dynamic DescribeFeatureType schema requests.
Changes:
- Bump GeoTools dependency version to
35.0and (re-)enable GeoJSON extract output via default configuration. - Add
TMPreventLocalEntityResolverand initialize GeoTools on startup with this preferred resolver. - Re-enable the GeoJSON extract integration test that previously depended on newer GeoTools behavior.
Reviewed changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
pom.xml |
Updates GeoTools version property to 35.0. |
src/main/resources/application.properties |
Adds geojson to allowed extract output formats. |
src/test/resources/application.properties |
Mirrors allowed extract output formats update for tests. |
src/main/java/org/tailormap/api/geotools/TMPreventLocalEntityResolver.java |
Introduces a custom entity resolver to permit specific DescribeFeatureType requests. |
src/test/java/org/tailormap/api/geotools/TMPreventLocalEntityResolverTest.java |
Adds unit tests covering allowed/blocked resolver behaviors. |
src/main/java/org/tailormap/api/geotools/featuresources/WFSFeatureSourceHelper.java |
Configures WFS datastore to use the custom resolver. |
src/main/java/org/tailormap/api/configuration/GeoToolsConfiguration.java |
Initializes GeoTools with preferred hints/resolver at application startup. |
src/test/java/org/tailormap/api/controller/LayerExtractControllerIntegrationTest.java |
Re-enables the GeoJSON export integration test by removing @DisabledUntil. |
* Initialise GeoTools on application startup and set our preferred entity resolver Use a Configuration to initialise GeoTools * Add an entity resolver that explicity allows DescribeFeatureType (dynamic schema) requests to work around https://osgeo-org.atlassian.net/browse/GEOT-7916 Use a precompiled regex for DescribeFeatureType request checking Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2a76d47 to
76c9d0f
Compare
❌ 2 Tests Failed:
View the full list of 2 ❄️ flaky test(s)
To view more test analytics, go to the Test Analytics Dashboard |
Uh oh!
There was an error while loading. Please reload this page.