You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/12/30 15:19:28 UTC
(sis) branch main updated (47053a8ff3 -> 2330bb247d)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
from 47053a8ff3 Merge branch 'geoapi-3.1'. Contains: shapefile writer, JShell, bug fixes.
add f1d35685a5 Resolve external xlinks when parsing a GML document. This is a first step, not yet resolving fragment and not yet caching.
add 150edb7cae Avoid attempt to download the document at the "http://test.net" URL.
add 50c0a3ec29 Partial support of xlink:href referencing a fragment of an external document.
add 1733c7777a Tune the resolution of `xlink:href` attributes having a fragment in their URI values.
add 162dc3a5c7 Allow to use an `javax.xml.transform.URIResolver` for resolving URI to external documents.
add 6b6622b8bd Follow redirections when unmarshalling a document from an URL. We need to update the URL in order to resolve relative xlink:href.
add f89ffa9afb Spelling fix: "to thrown" → "to throw".
add 51dcbb1305 Add `public` and `protected` modifiers to `DatumShiftGridLoader` methods. It does not make practical difference because the class is package-private. However, they are hints about which methods are invoked by classes other than sub-classes.
add 1c5de085a4 Declare the provider as the source of warning in `DatumShiftGridLoader.canNotLoad(…)`.
add 4c772ccb11 Move `DatumShiftGridLoader.toAbsolutePath(URI)` to `DataDirectory`.
add 95cdd7553d Add a `MarshalContext.getDocumentURI()` method.
add 9beb499ee7 When parsing a GML or WKT from a URI, store the URI on a new `DefaultParameterValue.sourceFile` property. This information allows to resolve `ParameterValue.valueFile` relatively to the source document.
add 7e3f59dffe Partial migration of some tests to JUnit 5 and addition of a test for the `WKTFormat.setSourceFile(URI)` method added in previous commit.
add f35825c1dd Move 4 PMC members to emeritus. Three of them were already ASF emeritus, one of them has his status changed directly on LDAP.
add 1a95478b37 Move `DatumShiftGrid` implementations to a dedicated internal package. This is in preparation for more gridded data such as TestBed-19 or GGXF.
add 2514bc80b8 Replace the use of `java.net.URI` by an internal `GridFile` class which take in charge the URI resolutions. This is for making easier the cases where the URI needs to be resolved relatively to the GML or WKT file instead of resolved in the "$SIS_DATA/DatumChanges" directory.
add ea7344752e Fix information lost: - In source file when parameters are copied. - In root object name when WKT formatting has warnings.
add b325a0c5f8 Allow `CRS.fromCode(String)` to return the CRS definitions found in the GML document being parsed. This feature make possible for embedded or linked data to reference CRS defined in the document.
new 11dcc51787 Merge branch 'geoapi-4.0' into geoapi-3.1. The work includes `xlink:href` to external GML documents, resolve `PARAMETERFILE["foo"]` values relatively to the WKT of GML file declaring the parameter, and `CRS.forCode(String)` capable to return CRS defined in the GML document being parsed.
new 763417be3b Merge branch 'geoapi-3.1'.
new 721b3a76ef Automatic import reorganization for tests and branch-specific dependencies.
new 84d2ffda54 Automatic import reorganization for tests and branch-specific dependencies.
new 2330bb247d Automatic import reorganization for tests and branch-specific dependencies.
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/sis/console/MimeTypeCommand.java | 2 +-
.../org/apache/sis/console/CommandRunnerTest.java | 15 +-
.../sis/coverage/grid/DimensionAppender.java | 2 +-
.../sis/coverage/grid/GridCoverageBuilder.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 23 +-
.../iso/extent/NotSpatioTemporalException.java | 2 +-
.../main/org/apache/sis/xml/MarshalContext.java | 34 +-
.../main/org/apache/sis/xml/MarshallerPool.java | 47 ++-
.../main/org/apache/sis/xml/Pooled.java | 71 +++-
.../main/org/apache/sis/xml/PooledMarshaller.java | 53 +--
.../main/org/apache/sis/xml/PooledTemplate.java | 6 +-
.../org/apache/sis/xml/PooledUnmarshaller.java | 175 ++++++---
.../main/org/apache/sis/xml/ReferenceResolver.java | 228 ++++++++++--
.../main/org/apache/sis/xml/XLink.java | 13 +-
.../main/org/apache/sis/xml/XML.java | 7 +-
.../main/org/apache/sis/xml/bind/Context.java | 341 +++++++++++++----
.../org/apache/sis/xml/bind/ScopedIdentifier.java | 145 ++++++++
.../apache/sis/xml/util/ExternalLinkHandler.java | 290 +++++++++++++++
.../main/org/apache/sis/xml/util/URISource.java | 120 ++++++
.../main/org/apache/sis/xml/util/XmlUtilities.java | 41 ++
.../metadata/iso/citation/DefaultCitationTest.java | 15 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../sis/metadata/xml/2016/UsingExternalXLink.xml | 51 +++
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverTest.java | 66 ++++
.../org/apache/sis/xml/XLinkMarshallingTest.java | 10 +-
.../test/org/apache/sis/xml/XLinkTest.java | 25 +-
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +-
.../test/org/apache/sis/xml/test/TestCase.java | 46 ++-
.../apache/sis/xml/test/TestReferenceResolver.java | 56 +++
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 7 +-
.../main/org/apache/sis/io/wkt/AbstractParser.java | 23 +-
.../org/apache/sis/io/wkt/FormattableObject.java | 17 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 11 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 20 +-
.../main/org/apache/sis/io/wkt/Parser.java | 4 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 129 ++++---
.../main/org/apache/sis/io/wkt/Warnings.java | 2 +
.../sis/parameter/AbstractParameterDescriptor.java | 13 +-
.../sis/parameter/DefaultParameterDescriptor.java | 15 +-
.../parameter/DefaultParameterDescriptorGroup.java | 15 +-
.../sis/parameter/DefaultParameterValue.java | 172 +++++++--
.../main/org/apache/sis/parameter/Parameters.java | 28 ++
.../sis/parameter/UnmodifiableParameterValue.java | 10 +
.../org/apache/sis/parameter/package-info.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 9 +-
.../main/org/apache/sis/referencing/CRS.java | 53 ++-
.../referencing/factory/GeodeticObjectFactory.java | 8 +-
.../referencing/factory/sql/EPSGDataAccess.java | 4 +-
.../referencing/internal/ServicesForMetadata.java | 1 -
.../CompressedGrid.java} | 20 +-
.../referencing/operation/gridded/GridFile.java | 299 +++++++++++++++
.../GridGroup.java} | 43 ++-
.../referencing/operation/gridded/GridLoader.java | 143 +++++++
.../LoadedGrid.java} | 184 ++++-----
.../operation/gridded}/package-info.java | 7 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../operation/provider/DatumShiftGridLoader.java | 248 ------------
.../provider/FranceGeocentricInterpolation.java | 59 ++-
.../sis/referencing/operation/provider/NADCON.java | 48 +--
.../sis/referencing/operation/provider/NTv2.java | 69 ++--
.../operation/provider/package-info.java | 5 +-
.../operation/transform/ContextualParameters.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 8 +-
.../transform/SpecializableTransform.java | 2 +-
.../util/j2d/ImmutableAffineTransform.java | 2 +-
.../org/apache/sis/referencing/util/j2d/Tile.java | 4 +-
.../referencing/CC_GeneralOperationParameter.java | 1 +
.../xml/bind/referencing/CC_OperationMethod.java | 7 +-
.../org/apache/sis/xml/bind/referencing/Code.java | 28 +-
.../test/org/apache/sis/io/wkt/ColorsTest.java | 14 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 6 +-
.../test/org/apache/sis/io/wkt/ConventionTest.java | 2 +-
.../test/org/apache/sis/io/wkt/ElementTest.java | 144 +++----
.../sis/io/wkt/GeodeticObjectParserTest.java | 336 ++++++++---------
.../apache/sis/io/wkt/MathTransformParserTest.java | 20 +-
.../test/org/apache/sis/io/wkt/SymbolsTest.java | 39 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 20 +-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 109 +++---
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 60 ++-
.../sis/parameter/DefaultParameterValueTest.java | 414 +++++++++------------
.../sis/parameter/ParameterMarshallingTest.java | 81 ++--
.../referencing/AbstractIdentifiedObjectTest.java | 2 +-
.../operation/SingleOperationMarshallingTest.java | 148 +++++---
.../sis/referencing/operation/Transformation.xml | 4 +-
.../CompressedGridTest.java} | 12 +-
.../LoadedGridTest.java} | 22 +-
.../operation/provider/DatumShiftTestCase.java | 5 +-
.../FranceGeocentricInterpolationTest.java | 31 +-
.../referencing/operation/provider/NADCONTest.java | 23 +-
.../referencing/operation/provider/NTv2Test.java | 36 +-
.../transform/MathTransformFactoryMock.java | 31 ++
.../operation/transform/PoleRotationTest.java | 2 +-
.../sis/test/integration/DatumShiftTest.java | 5 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 2 +-
.../apache/sis/storage/netcdf/base/Variable.java | 4 +-
.../main/org/apache/sis/storage/DataOptionKey.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 4 +-
.../sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../org/apache/sis/storage/base/PRJDataStore.java | 21 +-
.../org/apache/sis/storage/base/URIDataStore.java | 2 +-
.../sis/io/stream/ChannelDataOutputTest.java | 20 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 5 +-
.../apache/sis/storage/StorageConnectorTest.java | 49 ++-
.../main/org/apache/sis/measure/UnitFormat.java | 2 +-
.../main/org/apache/sis/system/DataDirectory.java | 33 +-
.../main/org/apache/sis/util/Utilities.java | 2 +-
.../main/org/apache/sis/util/collection/Cache.java | 2 +-
.../apache/sis/util/internal/CheckedArrayList.java | 2 +-
.../apache/sis/util/internal/DefinitionURI.java | 22 +-
.../sis/util/resources/IndexedResourceBundle.java | 2 +-
.../org/apache/sis/util/resources/Messages.java | 4 +-
.../apache/sis/util/resources/Messages.properties | 2 +-
.../sis/util/resources/Messages_fr.properties | 2 +-
.../org/apache/sis/measure/UnitFormatTest.java | 36 +-
.../test/org/apache/sis/test/Assertions.java | 84 +++--
.../org/apache/sis/util/ArgumentChecksTest.java | 44 +--
.../sis/util/internal/DefinitionURITest.java | 10 +
.../sis/storage/shapefile/ShapefileStore.java | 9 +-
.../shapefile/shp/ShapeGeometryEncoder.java | 3 +-
.../sis/storage/shapefile/shp/ShapeRecord.java | 1 +
.../sis/storage/shapefile/shp/ShapeWriter.java | 2 +-
.../sis/storage/shapefile/ShapefileStoreTest.java | 5 +-
.../org/apache/sis/storage/shapefile/Snippets.java | 6 +-
.../apache/sis/storage/shapefile/dbf/Snippets.java | 1 +
.../apache/sis/storage/shapefile/shp/Snippets.java | 5 +-
parent/pom.xml | 9 +-
128 files changed, 3735 insertions(+), 1848 deletions(-)
create mode 100644 endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/ScopedIdentifier.java
create mode 100644 endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/ExternalLinkHandler.java
create mode 100644 endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/util/URISource.java
create mode 100644 endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/xml/2016/UsingExternalXLink.xml
create mode 100644 endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
create mode 100644 endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/TestReferenceResolver.java
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/{provider/DatumShiftGridCompressed.java => gridded/CompressedGrid.java} (92%)
create mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/GridFile.java
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/{provider/DatumShiftGridGroup.java => gridded/GridGroup.java} (88%)
create mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded/GridLoader.java
rename endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/{provider/DatumShiftGridFile.java => gridded/LoadedGrid.java} (81%)
copy {buildSrc/src/main/java/org/apache/sis/buildtools/doclet => endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/gridded}/package-info.java (80%)
delete mode 100644 endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/DatumShiftGridLoader.java
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/{provider/DatumShiftGridCompressedTest.java => gridded/CompressedGridTest.java} (75%)
rename endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/{provider/DatumShiftGridFileTest.java => gridded/LoadedGridTest.java} (91%)
(sis) 05/05: Automatic import reorganization for tests and branch-specific dependencies.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 2330bb247ded208d8722cbb88753310cd9b0bd68
Merge: 763417be3b 84d2ffda54
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Dec 30 15:02:11 2023 +0100
Automatic import reorganization for tests and branch-specific dependencies.
.../main/org/apache/sis/console/MimeTypeCommand.java | 2 +-
.../main/org/apache/sis/coverage/grid/DimensionAppender.java | 2 +-
.../sis/metadata/iso/extent/NotSpatioTemporalException.java | 2 +-
.../test/org/apache/sis/xml/ReferenceResolverTest.java | 2 +-
.../org/apache/sis/referencing/internal/ServicesForMetadata.java | 1 -
.../main/org/apache/sis/storage/geotiff/ImageFileDirectory.java | 2 +-
.../main/org/apache/sis/storage/DataOptionKey.java | 2 +-
.../main/org/apache/sis/storage/StorageConnector.java | 4 ++--
.../org/apache/sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../main/org/apache/sis/storage/base/URIDataStore.java | 2 +-
.../main/org/apache/sis/measure/UnitFormat.java | 2 +-
.../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 9 ++++-----
.../apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java | 3 +--
.../main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java | 1 +
.../main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java | 2 +-
.../org/apache/sis/storage/shapefile/ShapefileStoreTest.java | 5 ++---
.../test/org/apache/sis/storage/shapefile/Snippets.java | 6 +++---
.../test/org/apache/sis/storage/shapefile/dbf/Snippets.java | 1 +
.../test/org/apache/sis/storage/shapefile/shp/Snippets.java | 5 +++--
19 files changed, 27 insertions(+), 28 deletions(-)
diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
index 788de0ff10,ebbf8fe086..27244392e9
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
@@@ -24,9 -24,9 +24,9 @@@ import org.apache.sis.util.internal.Num
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.coverage.SubspaceNotSpecifiedException;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.coverage.CannotEvaluateException;
-import org.apache.sis.util.ArgumentChecks;
+// Specific to the main branch:
- import org.apache.sis.coverage.CannotEvaluateException;
+import org.opengis.geometry.MismatchedDimensionException;
++import org.apache.sis.coverage.CannotEvaluateException;
/**
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
index 6431f96a16,5e65868b06..36cd10d2ce
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/ServicesForMetadata.java
@@@ -60,7 -59,7 +60,6 @@@ import org.apache.sis.metadata.iso.exte
import org.apache.sis.metadata.iso.extent.DefaultTemporalExtent;
import org.apache.sis.metadata.iso.extent.DefaultSpatialTemporalExtent;
import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
--import org.apache.sis.metadata.internal.ReferencingServices;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Longitude;
import org.apache.sis.system.Modules;
diff --cc incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
index b656460dfd,b3db8bf79b..24c056852f
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
@@@ -63,8 -63,9 +61,11 @@@ import org.opengis.metadata.Metadata
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
+import org.opengis.util.GenericName;
+ import org.apache.sis.geometry.ImmutableEnvelope;
+ import org.apache.sis.geometry.Envelopes;
+ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.feature.builder.AttributeRole;
import org.apache.sis.feature.builder.AttributeTypeBuilder;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
diff --cc incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
index 2c8c04de8e,a5f743e706..7de025af78
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
@@@ -47,12 -47,12 +47,11 @@@ import static org.junit.jupiter.api.Ass
import org.junit.Ignore;
import org.junit.Test;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.BinaryComparisonOperator;
-import org.opengis.filter.FilterFactory;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.DefaultAttributeType;
- import org.apache.sis.filter.DefaultFilterFactory;
+import org.apache.sis.filter.Filter;
/**
diff --cc incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java
index 64f8f10b9a,ef5acb82c4..f76cb70704
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java
@@@ -26,14 -29,12 +29,11 @@@ import org.apache.sis.geometry.GeneralE
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.FeatureQuery;
- import org.locationtech.jts.geom.Coordinate;
- import org.locationtech.jts.geom.GeometryFactory;
- import org.locationtech.jts.geom.Point;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.filter.BinarySpatialOperator;
-import org.opengis.filter.FilterFactory;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.filter.Filter;
/**
(sis) 04/05: Automatic import reorganization for tests and branch-specific dependencies.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 84d2ffda540c4d4f64cfe28dc540762bdecd0195
Merge: 11dcc51787 721b3a76ef
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Dec 30 14:59:12 2023 +0100
Automatic import reorganization for tests and branch-specific dependencies.
.../main/org/apache/sis/console/MimeTypeCommand.java | 2 +-
.../main/org/apache/sis/coverage/grid/DimensionAppender.java | 2 +-
.../sis/metadata/iso/extent/NotSpatioTemporalException.java | 2 +-
.../test/org/apache/sis/xml/ReferenceResolverTest.java | 2 +-
.../main/org/apache/sis/storage/geotiff/ImageFileDirectory.java | 2 +-
.../main/org/apache/sis/storage/DataOptionKey.java | 2 +-
.../main/org/apache/sis/storage/StorageConnector.java | 4 ++--
.../org/apache/sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../main/org/apache/sis/storage/aggregate/DimensionAppender.java | 4 +++-
.../main/org/apache/sis/storage/base/URIDataStore.java | 2 +-
.../main/org/apache/sis/measure/UnitFormat.java | 2 +-
.../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 9 ++++-----
.../apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java | 3 +--
.../main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java | 1 +
.../main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java | 2 +-
.../org/apache/sis/storage/shapefile/ShapefileStoreTest.java | 4 ++--
.../test/org/apache/sis/storage/shapefile/Snippets.java | 9 ++++++---
.../test/org/apache/sis/storage/shapefile/dbf/Snippets.java | 1 +
.../test/org/apache/sis/storage/shapefile/shp/Snippets.java | 5 +++--
19 files changed, 33 insertions(+), 27 deletions(-)
(sis) 03/05: Automatic import reorganization for tests and branch-specific dependencies.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 721b3a76efafac87b390b370349f97c1565df88b
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Dec 30 14:54:36 2023 +0100
Automatic import reorganization for tests and branch-specific dependencies.
---
.../main/org/apache/sis/console/MimeTypeCommand.java | 2 +-
.../main/org/apache/sis/coverage/grid/DimensionAppender.java | 2 +-
.../sis/metadata/iso/extent/NotSpatioTemporalException.java | 2 +-
.../test/org/apache/sis/xml/ReferenceResolverTest.java | 2 +-
.../main/org/apache/sis/storage/geotiff/ImageFileDirectory.java | 2 +-
.../main/org/apache/sis/storage/DataOptionKey.java | 2 +-
.../main/org/apache/sis/storage/StorageConnector.java | 4 ++--
.../org/apache/sis/storage/aggregate/CoverageAggregator.java | 2 +-
.../main/org/apache/sis/storage/aggregate/DimensionAppender.java | 4 +++-
.../main/org/apache/sis/storage/base/URIDataStore.java | 2 +-
.../main/org/apache/sis/measure/UnitFormat.java | 2 +-
.../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 9 ++++-----
.../apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java | 3 +--
.../main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java | 1 +
.../main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java | 2 +-
.../org/apache/sis/storage/shapefile/ShapefileStoreTest.java | 4 ++--
.../test/org/apache/sis/storage/shapefile/Snippets.java | 9 ++++++---
.../test/org/apache/sis/storage/shapefile/dbf/Snippets.java | 1 +
.../test/org/apache/sis/storage/shapefile/shp/Snippets.java | 5 +++--
19 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/MimeTypeCommand.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/MimeTypeCommand.java
index 5ee89f7c6e..46bd3b4ca5 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/MimeTypeCommand.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/MimeTypeCommand.java
@@ -17,9 +17,9 @@
package org.apache.sis.console;
import java.util.Arrays;
+import java.util.EnumSet;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.EnumSet;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.NoSuchFileException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
index d3fac44fe9..ebbf8fe086 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionAppender.java
@@ -20,13 +20,13 @@ import java.awt.image.RenderedImage;
import org.opengis.util.FactoryException;
import org.apache.sis.image.DataType;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.internal.Numerics;
import org.apache.sis.feature.internal.Resources;
import org.apache.sis.coverage.SubspaceNotSpecifiedException;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.coverage.CannotEvaluateException;
+import org.apache.sis.util.ArgumentChecks;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java
index b0cd09874f..b19f777cfa 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/NotSpatioTemporalException.java
@@ -20,8 +20,8 @@ import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.metadata.internal.Resources;
-import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.Workaround;
+import org.apache.sis.util.resources.Errors;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
index 141eef9d9a..8bcf51b700 100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
@@ -20,11 +20,11 @@ import java.io.IOException;
import jakarta.xml.bind.JAXBException;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.identification.DataIdentification;
+import org.apache.sis.metadata.xml.TestUsingFile;
// Test dependencies
import org.junit.Test;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.sis.metadata.xml.TestUsingFile;
import org.apache.sis.metadata.iso.citation.DefaultCitationTest;
import static org.apache.sis.test.TestUtilities.getSingleton;
diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
index 0477b3cfc4..7502cde1f8 100644
--- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
+++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java
@@ -57,11 +57,11 @@ import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.Numbers;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.resources.Vocabulary;
+import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.internal.UnmodifiableArrayList;
import org.apache.sis.util.internal.Numerics;
import org.apache.sis.util.internal.Strings;
import org.apache.sis.metadata.iso.DefaultMetadata;
-import org.apache.sis.util.resources.Errors;
import org.apache.sis.math.Vector;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.image.DataType;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataOptionKey.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataOptionKey.java
index 116ff542cf..d9bff17d4d 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataOptionKey.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/DataOptionKey.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.storage;
-import java.nio.file.Path;
import java.io.ObjectStreamException;
+import java.nio.file.Path;
import static java.util.logging.Logger.getLogger;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.system.Modules;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
index cb71f7fcf5..5b48411fb2 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/StorageConnector.java
@@ -62,6 +62,8 @@ import org.apache.sis.util.collection.TableColumn;
import org.apache.sis.util.collection.DefaultTreeTable;
import org.apache.sis.util.collection.Containers;
import org.apache.sis.storage.internal.Resources;
+import org.apache.sis.storage.internal.InputStreamAdapter;
+import org.apache.sis.storage.internal.RewindableLineReader;
import org.apache.sis.storage.base.StoreUtilities;
import org.apache.sis.io.InvalidSeekException;
import org.apache.sis.io.stream.IOUtilities;
@@ -72,8 +74,6 @@ import org.apache.sis.io.stream.ChannelDataOutput;
import org.apache.sis.io.stream.ChannelImageInputStream;
import org.apache.sis.io.stream.ChannelImageOutputStream;
import org.apache.sis.io.stream.InternalOptionKey;
-import org.apache.sis.storage.internal.InputStreamAdapter;
-import org.apache.sis.storage.internal.RewindableLineReader;
import org.apache.sis.system.Configuration;
import org.apache.sis.setup.OptionKey;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java
index 5e6b9c868a..087e8d04ec 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/CoverageAggregator.java
@@ -35,9 +35,9 @@ import org.opengis.referencing.crs.SingleCRS;
import org.opengis.referencing.datum.PixelInCell;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.NoninvertibleTransformException;
+import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.crs.DefaultTemporalCRS;
-import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.image.Colorizer;
import org.apache.sis.storage.Resource;
import org.apache.sis.storage.Aggregate;
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java
index d25ac1af63..797856cbe2 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/aggregate/DimensionAppender.java
@@ -39,10 +39,12 @@ import org.apache.sis.storage.base.StoreUtilities;
import org.apache.sis.storage.event.StoreEvent;
import org.apache.sis.storage.event.StoreListener;
import org.apache.sis.storage.internal.Resources;
-import org.apache.sis.util.ArraysExt;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.logging.Logging;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.apache.sis.util.ArraysExt;
+
/**
* A wrapper over an existing grid coverage resource with dimensions appended.
diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java
index 856b34f6f8..19f1594095 100644
--- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java
+++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStore.java
@@ -24,12 +24,12 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.nio.file.Path;
import java.nio.file.Files;
import java.nio.file.OpenOption;
import java.nio.file.StandardOpenOption;
import java.nio.charset.Charset;
-import java.net.URISyntaxException;
import jakarta.xml.bind.JAXBException;
import org.opengis.util.GenericName;
import org.opengis.parameter.ParameterValueGroup;
diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java
index 640f7dac9e..5b3f7f4414 100644
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/measure/UnitFormat.java
@@ -42,10 +42,10 @@ import org.apache.sis.util.Localized;
import org.apache.sis.util.CorruptedObjectException;
import org.apache.sis.util.internal.Constants;
import org.apache.sis.util.internal.DefinitionURI;
+import org.apache.sis.util.internal.Strings;
import org.apache.sis.math.Fraction;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.internal.Strings;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.util.logging.Logging;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
index 9a77f574bc..b3db8bf79b 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
@@ -18,8 +18,8 @@ package org.apache.sis.storage.shapefile;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
-import java.math.BigInteger;
import java.nio.ByteBuffer;
+import java.math.BigInteger;
import java.nio.channels.SeekableByteChannel;
import java.nio.channels.WritableByteChannel;
import java.nio.charset.Charset;
@@ -49,8 +49,6 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-
-import org.apache.sis.geometry.ImmutableEnvelope;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.LineString;
import org.locationtech.jts.geom.MultiLineString;
@@ -65,6 +63,9 @@ import org.opengis.metadata.Metadata;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
+import org.apache.sis.geometry.ImmutableEnvelope;
+import org.apache.sis.geometry.Envelopes;
+import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.feature.builder.AttributeRole;
import org.apache.sis.feature.builder.AttributeTypeBuilder;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
@@ -72,8 +73,6 @@ import org.apache.sis.feature.internal.AttributeConvention;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.filter.Optimization;
import org.apache.sis.filter.internal.FunctionNames;
-import org.apache.sis.geometry.Envelopes;
-import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.io.stream.ChannelDataOutput;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java
index 98aef27229..dc1e7a04c9 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeGeometryEncoder.java
@@ -22,12 +22,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-
-import org.apache.sis.geometry.GeneralDirectPosition;
import org.locationtech.jts.geom.*;
import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
import org.locationtech.jts.algorithm.Orientation;
import org.locationtech.jts.algorithm.RayCrossingCounter;
+import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.io.stream.ChannelDataOutput;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java
index f288e045f4..a0cdad14aa 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeRecord.java
@@ -24,6 +24,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.io.stream.ChannelDataOutput;
+
/**
* A record in a shape file.
* Contains a unique record number and it's associated geometry.
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java
index ccce608141..d1cf62abc2 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/shp/ShapeWriter.java
@@ -17,10 +17,10 @@
package org.apache.sis.storage.shapefile.shp;
import java.io.IOException;
+import org.locationtech.jts.geom.Geometry;
import org.apache.sis.io.stream.ChannelDataOutput;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.ImmutableEnvelope;
-import org.locationtech.jts.geom.Geometry;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
index 4ea5bcbb25..a5f743e706 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
@@ -29,11 +29,11 @@ import java.util.Iterator;
import java.util.List;
import java.util.function.UnaryOperator;
import java.util.stream.Stream;
-import org.apache.sis.feature.builder.FeatureTypeBuilder;
-import org.apache.sis.util.Utilities;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.Point;
+import org.apache.sis.feature.builder.FeatureTypeBuilder;
+import org.apache.sis.util.Utilities;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CommonCRS;
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java
index 99f9057133..ef5acb82c4 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/Snippets.java
@@ -20,20 +20,23 @@ import java.io.IOException;
import java.nio.file.Paths;
import java.util.List;
import java.util.stream.Stream;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.FeatureQuery;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.GeometryFactory;
-import org.locationtech.jts.geom.Point;
+
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
import org.opengis.filter.BinarySpatialOperator;
import org.opengis.filter.FilterFactory;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/Snippets.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/Snippets.java
index 0813919903..b0f688c185 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/Snippets.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/dbf/Snippets.java
@@ -29,6 +29,7 @@ import org.apache.sis.setup.OptionKey;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.StorageConnector;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/Snippets.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/Snippets.java
index 9ba5ee2e12..cfaaa30550 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/Snippets.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/shp/Snippets.java
@@ -20,13 +20,14 @@ import java.io.IOException;
import java.nio.file.OpenOption;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.io.stream.ChannelDataOutput;
import org.apache.sis.setup.OptionKey;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.StorageConnector;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.GeometryFactory;
+
/**
*
(sis) 01/05: Merge branch 'geoapi-4.0' into geoapi-3.1. The work includes `xlink:href` to external GML documents, resolve `PARAMETERFILE["foo"]` values relatively to the WKT of GML file declaring the parameter, and `CRS.forCode(String)` capable to return CRS defined in the GML document being parsed.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 11dcc5178713ad287eb771df66940547355b3c47
Merge: eb20f53e20 b325a0c5f8
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Dec 30 14:22:55 2023 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1. The work includes `xlink:href` to external GML documents,
resolve `PARAMETERFILE["foo"]` values relatively to the WKT of GML file declaring the parameter, and
`CRS.forCode(String)` capable to return CRS defined in the GML document being parsed.
.../org/apache/sis/console/CommandRunnerTest.java | 15 +-
.../sis/coverage/grid/GridCoverageBuilder.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 23 +-
.../main/org/apache/sis/xml/MarshalContext.java | 34 +-
.../main/org/apache/sis/xml/MarshallerPool.java | 47 ++-
.../main/org/apache/sis/xml/Pooled.java | 71 +++-
.../main/org/apache/sis/xml/PooledMarshaller.java | 53 +--
.../main/org/apache/sis/xml/PooledTemplate.java | 6 +-
.../org/apache/sis/xml/PooledUnmarshaller.java | 175 ++++++---
.../main/org/apache/sis/xml/ReferenceResolver.java | 228 ++++++++++--
.../main/org/apache/sis/xml/XLink.java | 13 +-
.../main/org/apache/sis/xml/XML.java | 7 +-
.../main/org/apache/sis/xml/bind/Context.java | 341 +++++++++++++----
.../org/apache/sis/xml/bind/ScopedIdentifier.java | 145 ++++++++
.../apache/sis/xml/util/ExternalLinkHandler.java | 290 +++++++++++++++
.../main/org/apache/sis/xml/util/URISource.java | 120 ++++++
.../main/org/apache/sis/xml/util/XmlUtilities.java | 41 ++
.../metadata/iso/citation/DefaultCitationTest.java | 16 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../sis/metadata/xml/2016/UsingExternalXLink.xml | 51 +++
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverTest.java | 66 ++++
.../org/apache/sis/xml/XLinkMarshallingTest.java | 10 +-
.../test/org/apache/sis/xml/XLinkTest.java | 25 +-
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +-
.../test/org/apache/sis/xml/test/TestCase.java | 46 ++-
.../apache/sis/xml/test/TestReferenceResolver.java | 56 +++
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 7 +-
.../main/org/apache/sis/io/wkt/AbstractParser.java | 23 +-
.../org/apache/sis/io/wkt/FormattableObject.java | 17 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 11 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 20 +-
.../main/org/apache/sis/io/wkt/Parser.java | 4 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 129 ++++---
.../main/org/apache/sis/io/wkt/Warnings.java | 2 +
.../sis/parameter/AbstractParameterDescriptor.java | 13 +-
.../sis/parameter/DefaultParameterDescriptor.java | 15 +-
.../parameter/DefaultParameterDescriptorGroup.java | 15 +-
.../sis/parameter/DefaultParameterValue.java | 172 +++++++--
.../main/org/apache/sis/parameter/Parameters.java | 28 ++
.../sis/parameter/UnmodifiableParameterValue.java | 10 +
.../org/apache/sis/parameter/package-info.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 9 +-
.../main/org/apache/sis/referencing/CRS.java | 53 ++-
.../referencing/factory/GeodeticObjectFactory.java | 8 +-
.../referencing/factory/sql/EPSGDataAccess.java | 4 +-
.../CompressedGrid.java} | 20 +-
.../referencing/operation/gridded/GridFile.java | 299 +++++++++++++++
.../GridGroup.java} | 43 ++-
.../referencing/operation/gridded/GridLoader.java | 143 +++++++
.../LoadedGrid.java} | 184 ++++-----
.../{provider => gridded}/package-info.java | 10 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../operation/provider/DatumShiftGridLoader.java | 248 ------------
.../provider/FranceGeocentricInterpolation.java | 59 ++-
.../sis/referencing/operation/provider/NADCON.java | 48 +--
.../sis/referencing/operation/provider/NTv2.java | 69 ++--
.../operation/provider/package-info.java | 5 +-
.../operation/transform/ContextualParameters.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 8 +-
.../transform/SpecializableTransform.java | 2 +-
.../util/j2d/ImmutableAffineTransform.java | 2 +-
.../org/apache/sis/referencing/util/j2d/Tile.java | 4 +-
.../referencing/CC_GeneralOperationParameter.java | 1 +
.../xml/bind/referencing/CC_OperationMethod.java | 7 +-
.../org/apache/sis/xml/bind/referencing/Code.java | 28 +-
.../test/org/apache/sis/io/wkt/ColorsTest.java | 14 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 6 +-
.../test/org/apache/sis/io/wkt/ConventionTest.java | 2 +-
.../test/org/apache/sis/io/wkt/ElementTest.java | 144 +++----
.../sis/io/wkt/GeodeticObjectParserTest.java | 336 ++++++++---------
.../apache/sis/io/wkt/MathTransformParserTest.java | 20 +-
.../test/org/apache/sis/io/wkt/SymbolsTest.java | 39 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 20 +-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 109 +++---
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 60 ++-
.../test/org/apache/sis/io/wkt/WKTParserTest.java | 78 ++--
.../sis/parameter/DefaultParameterValueTest.java | 414 +++++++++------------
.../sis/parameter/ParameterMarshallingTest.java | 81 ++--
.../referencing/AbstractIdentifiedObjectTest.java | 2 +-
.../operation/SingleOperationMarshallingTest.java | 148 +++++---
.../sis/referencing/operation/Transformation.xml | 4 +-
.../CompressedGridTest.java} | 12 +-
.../LoadedGridTest.java} | 22 +-
.../operation/provider/DatumShiftTestCase.java | 5 +-
.../FranceGeocentricInterpolationTest.java | 31 +-
.../referencing/operation/provider/NADCONTest.java | 23 +-
.../referencing/operation/provider/NTv2Test.java | 36 +-
.../transform/MathTransformFactoryMock.java | 31 ++
.../operation/transform/PoleRotationTest.java | 2 +-
.../sis/test/integration/DatumShiftTest.java | 5 +-
.../apache/sis/storage/netcdf/base/Variable.java | 4 +-
.../org/apache/sis/storage/base/PRJDataStore.java | 21 +-
.../sis/io/stream/ChannelDataOutputTest.java | 20 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 5 +-
.../apache/sis/storage/StorageConnectorTest.java | 49 ++-
.../main/org/apache/sis/system/DataDirectory.java | 33 +-
.../main/org/apache/sis/util/Utilities.java | 2 +-
.../main/org/apache/sis/util/collection/Cache.java | 2 +-
.../apache/sis/util/internal/CheckedArrayList.java | 2 +-
.../apache/sis/util/internal/DefinitionURI.java | 22 +-
.../sis/util/resources/IndexedResourceBundle.java | 2 +-
.../org/apache/sis/util/resources/Messages.java | 4 +-
.../apache/sis/util/resources/Messages.properties | 2 +-
.../sis/util/resources/Messages_fr.properties | 2 +-
.../org/apache/sis/measure/UnitFormatTest.java | 36 +-
.../test/org/apache/sis/test/Assertions.java | 84 +++--
.../org/apache/sis/util/ArgumentChecksTest.java | 44 +--
.../sis/util/internal/DefinitionURITest.java | 10 +
parent/pom.xml | 9 +-
111 files changed, 3747 insertions(+), 1865 deletions(-)
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
index 1314a4c422,8d4b7d9cc4..7c71bb41fe
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/AbstractIdentifiedObject.java
@@@ -1065,9 -1064,14 +1067,14 @@@ public class AbstractIdentifiedObject e
if (identifiers != null) {
propertyAlreadySet("setIdentifier", "identifier");
} else if (identifier != null) {
- final Identifier id = identifier.getIdentifier();
+ final ReferenceIdentifier id = identifier.getIdentifier();
if (id != null) {
identifiers = Collections.singleton(id);
+ ScopedIdentifier<IdentifiedObject> key = new ScopedIdentifier<>(getInterface(), identifier.toString());
+ key.store(IdentifiedObject.class, this, AbstractIdentifiedObject.class, "setIdentifier");
+ if (key != (key = key.rename(identifier.code))) {
+ key.store(IdentifiedObject.class, this, null, null); // Shorter form without codespace.
+ }
}
}
}
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
index a0e086be8f,8dd7e0461d..f3eb6a8253
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/xml/bind/referencing/Code.java
@@@ -25,13 -25,9 +25,12 @@@ import org.apache.sis.util.internal.Con
import org.apache.sis.util.internal.DefinitionURI;
import org.apache.sis.metadata.internal.NameMeaning;
import org.apache.sis.metadata.internal.Identifiers;
- import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.metadata.iso.citation.Citations;
- import static org.apache.sis.metadata.iso.citation.Citations.toCodeSpace;
+ import org.apache.sis.referencing.NamedIdentifier;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* The {@code gml:CodeType}, which is made of a code space and a code value.
(sis) 02/05: Merge branch 'geoapi-3.1'.
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 763417be3bf18c4c9f5d08bbfb9dbc6c577e9501
Merge: 47053a8ff3 11dcc51787
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Dec 30 14:45:43 2023 +0100
Merge branch 'geoapi-3.1'.
.../org/apache/sis/console/CommandRunnerTest.java | 15 +-
.../sis/coverage/grid/GridCoverageBuilder.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 23 +-
.../main/org/apache/sis/xml/MarshalContext.java | 34 +-
.../main/org/apache/sis/xml/MarshallerPool.java | 47 ++-
.../main/org/apache/sis/xml/Pooled.java | 71 +++-
.../main/org/apache/sis/xml/PooledMarshaller.java | 53 +--
.../main/org/apache/sis/xml/PooledTemplate.java | 6 +-
.../org/apache/sis/xml/PooledUnmarshaller.java | 175 ++++++---
.../main/org/apache/sis/xml/ReferenceResolver.java | 228 ++++++++++--
.../main/org/apache/sis/xml/XLink.java | 13 +-
.../main/org/apache/sis/xml/XML.java | 7 +-
.../main/org/apache/sis/xml/bind/Context.java | 341 +++++++++++++----
.../org/apache/sis/xml/bind/ScopedIdentifier.java | 145 ++++++++
.../apache/sis/xml/util/ExternalLinkHandler.java | 290 +++++++++++++++
.../main/org/apache/sis/xml/util/URISource.java | 120 ++++++
.../main/org/apache/sis/xml/util/XmlUtilities.java | 41 ++
.../metadata/iso/citation/DefaultCitationTest.java | 15 +-
.../metadata/iso/citation/DefaultContactTest.java | 2 +-
.../sis/metadata/xml/2016/UsingExternalXLink.xml | 51 +++
.../org/apache/sis/xml/ReferenceResolverMock.java | 2 +-
.../org/apache/sis/xml/ReferenceResolverTest.java | 66 ++++
.../org/apache/sis/xml/XLinkMarshallingTest.java | 10 +-
.../test/org/apache/sis/xml/XLinkTest.java | 25 +-
.../apache/sis/xml/bind/gco/StringAdapterTest.java | 2 +-
.../apache/sis/xml/bind/gml/TimePeriodTest.java | 2 +-
.../test/org/apache/sis/xml/test/TestCase.java | 46 ++-
.../apache/sis/xml/test/TestReferenceResolver.java | 56 +++
.../org/apache/sis/xml/util/XmlUtilitiesTest.java | 7 +-
.../main/org/apache/sis/io/wkt/AbstractParser.java | 23 +-
.../org/apache/sis/io/wkt/FormattableObject.java | 17 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 11 +-
.../org/apache/sis/io/wkt/MathTransformParser.java | 20 +-
.../main/org/apache/sis/io/wkt/Parser.java | 4 +-
.../main/org/apache/sis/io/wkt/WKTFormat.java | 129 ++++---
.../main/org/apache/sis/io/wkt/Warnings.java | 2 +
.../sis/parameter/AbstractParameterDescriptor.java | 13 +-
.../sis/parameter/DefaultParameterDescriptor.java | 15 +-
.../parameter/DefaultParameterDescriptorGroup.java | 15 +-
.../sis/parameter/DefaultParameterValue.java | 172 +++++++--
.../main/org/apache/sis/parameter/Parameters.java | 28 ++
.../sis/parameter/UnmodifiableParameterValue.java | 10 +
.../org/apache/sis/parameter/package-info.java | 2 +-
.../sis/referencing/AbstractIdentifiedObject.java | 9 +-
.../main/org/apache/sis/referencing/CRS.java | 53 ++-
.../referencing/factory/GeodeticObjectFactory.java | 8 +-
.../referencing/factory/sql/EPSGDataAccess.java | 4 +-
.../CompressedGrid.java} | 20 +-
.../referencing/operation/gridded/GridFile.java | 299 +++++++++++++++
.../GridGroup.java} | 43 ++-
.../referencing/operation/gridded/GridLoader.java | 143 +++++++
.../LoadedGrid.java} | 184 ++++-----
.../{provider => gridded}/package-info.java | 10 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../operation/provider/DatumShiftGridLoader.java | 248 ------------
.../provider/FranceGeocentricInterpolation.java | 59 ++-
.../sis/referencing/operation/provider/NADCON.java | 48 +--
.../sis/referencing/operation/provider/NTv2.java | 69 ++--
.../operation/provider/package-info.java | 5 +-
.../operation/transform/ContextualParameters.java | 2 +-
.../transform/DefaultMathTransformFactory.java | 8 +-
.../transform/SpecializableTransform.java | 2 +-
.../util/j2d/ImmutableAffineTransform.java | 2 +-
.../org/apache/sis/referencing/util/j2d/Tile.java | 4 +-
.../referencing/CC_GeneralOperationParameter.java | 1 +
.../xml/bind/referencing/CC_OperationMethod.java | 7 +-
.../org/apache/sis/xml/bind/referencing/Code.java | 28 +-
.../test/org/apache/sis/io/wkt/ColorsTest.java | 14 +-
.../org/apache/sis/io/wkt/ComparisonWithEPSG.java | 6 +-
.../test/org/apache/sis/io/wkt/ConventionTest.java | 2 +-
.../test/org/apache/sis/io/wkt/ElementTest.java | 144 +++----
.../sis/io/wkt/GeodeticObjectParserTest.java | 336 ++++++++---------
.../apache/sis/io/wkt/MathTransformParserTest.java | 20 +-
.../test/org/apache/sis/io/wkt/SymbolsTest.java | 39 +-
.../org/apache/sis/io/wkt/TransliteratorTest.java | 20 +-
.../org/apache/sis/io/wkt/WKTDictionaryTest.java | 109 +++---
.../test/org/apache/sis/io/wkt/WKTFormatTest.java | 60 ++-
.../sis/parameter/DefaultParameterValueTest.java | 414 +++++++++------------
.../sis/parameter/ParameterMarshallingTest.java | 81 ++--
.../referencing/AbstractIdentifiedObjectTest.java | 2 +-
.../operation/SingleOperationMarshallingTest.java | 148 +++++---
.../sis/referencing/operation/Transformation.xml | 4 +-
.../CompressedGridTest.java} | 12 +-
.../LoadedGridTest.java} | 22 +-
.../operation/provider/DatumShiftTestCase.java | 5 +-
.../FranceGeocentricInterpolationTest.java | 31 +-
.../referencing/operation/provider/NADCONTest.java | 23 +-
.../referencing/operation/provider/NTv2Test.java | 36 +-
.../transform/MathTransformFactoryMock.java | 31 ++
.../operation/transform/PoleRotationTest.java | 2 +-
.../sis/test/integration/DatumShiftTest.java | 5 +-
.../apache/sis/storage/netcdf/base/Variable.java | 4 +-
.../org/apache/sis/storage/base/PRJDataStore.java | 21 +-
.../sis/io/stream/ChannelDataOutputTest.java | 20 +-
.../org/apache/sis/storage/FeatureQueryTest.java | 5 +-
.../apache/sis/storage/StorageConnectorTest.java | 49 ++-
.../main/org/apache/sis/system/DataDirectory.java | 33 +-
.../main/org/apache/sis/util/Utilities.java | 2 +-
.../main/org/apache/sis/util/collection/Cache.java | 2 +-
.../apache/sis/util/internal/CheckedArrayList.java | 2 +-
.../apache/sis/util/internal/DefinitionURI.java | 22 +-
.../sis/util/resources/IndexedResourceBundle.java | 2 +-
.../org/apache/sis/util/resources/Messages.java | 4 +-
.../apache/sis/util/resources/Messages.properties | 2 +-
.../sis/util/resources/Messages_fr.properties | 2 +-
.../org/apache/sis/measure/UnitFormatTest.java | 36 +-
.../test/org/apache/sis/test/Assertions.java | 84 +++--
.../org/apache/sis/util/ArgumentChecksTest.java | 44 +--
.../sis/util/internal/DefinitionURITest.java | 10 +
parent/pom.xml | 9 +-
110 files changed, 3709 insertions(+), 1824 deletions(-)
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 32b60ad8f0,e2a883b057..6c3806ea64
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@@ -52,8 -53,9 +53,8 @@@ import org.apache.sis.test.TestUtilitie
import static org.apache.sis.test.TestUtilities.getSingleton;
import static org.apache.sis.metadata.Assertions.assertTitleEquals;
- // Specific to the main and geoapi-3.1 branches:
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.citation.Party;
-import org.opengis.metadata.citation.Responsibility;
++// Specific to the main branch:
+import org.opengis.metadata.citation.ResponsibleParty;
/**
@@@ -305,10 -315,10 +314,10 @@@ public final class DefaultCitationTest
final CitationDate date = getSingleton(c.getDates());
assertEquals("date", date.getDate(), TestUtilities.date("2015-10-17 00:00:00"));
- assertEquals("dateType", DateType.ADOPTED, date.getDateType());
- assertEquals("presentationForm", PresentationForm.PHYSICAL_OBJECT, getSingleton(c.getPresentationForms()));
+ assertEquals("dateType", DateType.valueOf("adopted"), date.getDateType());
+ assertEquals("presentationForm", PresentationForm.valueOf("physicalObject"), getSingleton(c.getPresentationForms()));
- final Iterator<ResponsibleParty> it = c.getCitedResponsibleParties().iterator();
- final Iterator<? extends Responsibility> it = c.getCitedResponsibleParties().iterator();
++ final Iterator<? extends ResponsibleParty> it = c.getCitedResponsibleParties().iterator();
final Contact contact = assertResponsibilityEquals(Role.ORIGINATOR, "Maid Marian", it.next());
assertEquals("Contact instruction", "Send carrier pigeon.", String.valueOf(contact.getContactInstructions()));
diff --cc endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
index 0000000000,141eef9d9a..3110ad2fa9
mode 000000,100644..100644
--- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
+++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/ReferenceResolverTest.java
@@@ -1,0 -1,66 +1,66 @@@
+ /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package org.apache.sis.xml;
+
+ import java.io.IOException;
+ import jakarta.xml.bind.JAXBException;
+ import org.opengis.metadata.citation.Citation;
+ import org.opengis.metadata.identification.DataIdentification;
+
+ // Test dependencies
+ import org.junit.Test;
+ import static org.junit.jupiter.api.Assertions.*;
+ import org.apache.sis.metadata.xml.TestUsingFile;
+ import org.apache.sis.metadata.iso.citation.DefaultCitationTest;
+ import static org.apache.sis.test.TestUtilities.getSingleton;
+
+
+ /**
+ * Tests {@link ReferenceResolver}.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ */
+ public final class ReferenceResolverTest extends TestUsingFile {
+ /**
+ * Creates a new test case.
+ */
+ public ReferenceResolverTest() {
+ }
+
+ /**
+ * Tests loading a document with a {@code xlink:href} to an external document.
+ *
+ * @throws IOException if an error occurred while opening the test file.
+ * @throws JAXBException if an error occurred while parsing the test file.
+ */
+ @Test
+ public void testUsingExternalXLink() throws IOException, JAXBException {
+ final var data = (DataIdentification) XML.unmarshal(Format.XML2016.getURL("UsingExternalXLink.xml"));
+ assertEquals("Test the use of XLink to an external document.", data.getAbstract().toString());
+ final Citation citation = data.getCitation();
+ DefaultCitationTest.verifyUnmarshalledCitation(citation);
+ /*
+ * The fragment should reference the exact same object than the one in the citation.
+ */
- final var parent = getSingleton(citation.getCitedResponsibleParties().iterator().next().getParties());
- final var reusing = getSingleton(getSingleton(data.getPointOfContacts()).getParties());
- assertEquals("Little John", reusing.getName().toString());
- assertSame(getSingleton(parent .getContactInfo()),
- getSingleton(reusing.getContactInfo()));
++ final var parent = citation.getCitedResponsibleParties().iterator().next();
++ final var reusing = getSingleton(data.getPointOfContacts());
++ assertEquals("Little John", reusing.getIndividualName());
++ assertSame(parent .getContactInfo(),
++ reusing.getContactInfo());
+
+ }
+ }
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
index 2463d88486,9f89555788..c5b316461c
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/AbstractParameterDescriptor.java
@@@ -63,9 -66,8 +62,8 @@@ import static org.apache.sis.xml.bind.r
* <td class="sep">{@code Abstract}</td>
* <td class="sep">{@code description}</td>
* <td class="sep">Also known as “definition”.</td>
- * </tr>
- * <tr>
+ * </tr><tr>
- * <td>{@link #getDirection()}</td>
+ * <td>{@code getDirection()}</td>
* <td class="sep"></td>
* <td class="sep"></td>
* <td class="sep">{@code direction}</td>
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
index b46c8fd9c3,17ae032cbb..96e507147e
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptor.java
@@@ -137,28 -137,23 +137,23 @@@ public class DefaultParameterDescriptor
* <th>Property name</th>
* <th>Value type</th>
* <th>Returned by</th>
- * </tr>
- * <tr>
+ * </tr><tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td>
- * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td>
* <td>{@link #getName()}</td>
- * </tr>
- * <tr>
+ * </tr><tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#ALIAS_KEY}</td>
* <td>{@link org.opengis.util.GenericName} or {@link CharSequence} (optionally as array)</td>
* <td>{@link #getAlias()}</td>
- * </tr>
- * <tr>
+ * </tr><tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td>
- * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td>
* <td>{@link #getIdentifiers()}</td>
- * </tr>
- * <tr>
+ * </tr><tr>
- * <td>{@value org.opengis.metadata.Identifier#DESCRIPTION_KEY}</td>
+ * <td>"description"</td>
* <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getDescription()}</td>
- * </tr>
- * <tr>
+ * </tr><tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#REMARKS_KEY}</td>
* <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getRemarks()}</td>
diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
index 472c74d2ea,472656654e..824c2ebb29
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
@@@ -119,28 -122,23 +119,23 @@@ public class DefaultParameterDescriptor
* <th>Property name</th>
* <th>Value type</th>
* <th>Returned by</th>
- * </tr>
- * <tr>
+ * </tr><tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#NAME_KEY}</td>
- * <td>{@link org.opengis.metadata.Identifier} or {@link String}</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} or {@link String}</td>
* <td>{@link #getName()}</td>
- * </tr>
- * <tr>
+ * </tr><tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#ALIAS_KEY}</td>
* <td>{@link org.opengis.util.GenericName} or {@link CharSequence} (optionally as array)</td>
* <td>{@link #getAlias()}</td>
- * </tr>
- * <tr>
+ * </tr><tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#IDENTIFIERS_KEY}</td>
- * <td>{@link org.opengis.metadata.Identifier} (optionally as array)</td>
+ * <td>{@link org.opengis.referencing.ReferenceIdentifier} (optionally as array)</td>
* <td>{@link #getIdentifiers()}</td>
- * </tr>
- * <tr>
+ * </tr><tr>
- * <td>{@value org.opengis.metadata.Identifier#DESCRIPTION_KEY}</td>
+ * <td>"description"</td>
* <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getDescription()}</td>
- * </tr>
- * <tr>
+ * </tr><tr>
* <td>{@value org.opengis.referencing.IdentifiedObject#REMARKS_KEY}</td>
* <td>{@link org.opengis.util.InternationalString} or {@link String}</td>
* <td>{@link #getRemarks()}</td>
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTDictionaryTest.java
index 61b035720f,3825c1730e..0d9c3f79f0
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTDictionaryTest.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/WKTDictionaryTest.java
@@@ -44,10 -44,11 +44,11 @@@ import org.apache.sis.test.TestUtilitie
import org.apache.sis.test.DependsOn;
import org.apache.sis.test.TestCase;
import static org.apache.sis.test.Assertions.assertSetEquals;
+ import static org.apache.sis.test.Assertions.assertMessageContains;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import static org.opengis.test.Assert.assertAxisDirectionsEqual;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
+import static org.apache.sis.test.GeoapiAssert.assertAxisDirectionsEqual;
/**
diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
index 423338a0a0,d6ac4eb852..e0043f1a5e
--- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
+++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/provider/NTv2Test.java
@@@ -42,9 -46,10 +46,10 @@@ import static org.junit.Assume.assumeTr
import static org.junit.Assert.*;
import static org.opengis.test.Assert.assertInstanceOf;
import org.apache.sis.test.DependsOn;
+ import org.apache.sis.referencing.operation.gridded.LoadedGridTest;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assert.assertMatrixEquals;
+// Specific to the main branch:
+import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
@@@ -53,9 -58,10 +58,9 @@@
*
* @author Martin Desruisseaux (Geomatys)
*
- * @see GeocentricTranslationTest#testFranceGeocentricInterpolationPoint()
* @see org.apache.sis.referencing.operation.transform.MolodenskyTransformTest#testFranceGeocentricInterpolationPoint()
*/
- @DependsOn(DatumShiftGridFileTest.class)
+ @DependsOn(LoadedGridTest.class)
public final class NTv2Test extends DatumShiftTestCase {
/**
* Name of the file containing a small extract of the "{@code NTF_R93.gsb}" file.
diff --cc endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
index dc8957c9e8,5569206dc2..04faaae94d
--- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
+++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/storage/FeatureQueryTest.java
@@@ -33,14 -33,21 +33,15 @@@ import org.junit.Test
import static org.junit.Assert.*;
import org.apache.sis.test.TestUtilities;
import org.apache.sis.test.TestCase;
+ import static org.apache.sis.test.Assertions.assertMessageContains;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.feature.Feature;
-import org.opengis.feature.FeatureType;
-import org.opengis.feature.PropertyType;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.IdentifiedType;
-import org.opengis.feature.Operation;
-import org.opengis.filter.Expression;
-import org.opengis.filter.Filter;
-import org.opengis.filter.FilterFactory;
-import org.opengis.filter.MatchAction;
-import org.opengis.filter.SortOrder;
-import org.opengis.filter.SortProperty;
+// Specific to the main branch:
+import org.apache.sis.feature.AbstractFeature;
+import org.apache.sis.feature.DefaultFeatureType;
+import org.apache.sis.feature.DefaultAttributeType;
+import org.apache.sis.feature.AbstractIdentifiedType;
+import org.apache.sis.feature.AbstractOperation;
+import org.apache.sis.filter.Expression;
/**
diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/IndexedResourceBundle.java
index dd83f6f277,cbffab180b..de5544fbfc
--- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/IndexedResourceBundle.java
+++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/resources/IndexedResourceBundle.java
@@@ -405,11 -408,11 +405,11 @@@ public abstract class IndexedResourceBu
}
replacement = CharSequences.shortSentence(text, MAX_STRING_LENGTH);
} else if (element instanceof URI) {
- replacement = ((URI) element).getPath(); // For decoding encoded characters.
+ replacement = ((URI) element).getSchemeSpecificPart(); // For decoding encoded characters.
} else if (element instanceof Class<?>) {
replacement = Classes.getShortName(getPublicType((Class<?>) element));
- } else if (element instanceof ControlledVocabulary) {
- replacement = MetadataServices.getInstance().getCodeTitle((ControlledVocabulary) element, getLocale());
+ } else if (element instanceof CodeList<?>) {
+ replacement = MetadataServices.getInstance().getCodeTitle((CodeList<?>) element, getLocale());
} else if (element instanceof Range<?>) {
final Range<?> range = (Range<?>) element;
replacement = new RangeFormat(getLocale(), range.getElementType()).format(range);