This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 230b6bceb613af544c6f1e162c28bca2ab7ed708
Merge: 4afa8fd56a 7c87ae6e32
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Jul 15 14:35:06 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1.
This merge contains more preparation for JPMS (Jigsaw) modularisation,
mostly in ensuring that resources are loaded inside the boundaries of
the module that contains them.
.gitattributes | 43 ++++--
.../apache/sis/console/MimeTypeCommandTest.java | 14 +-
.../gui/referencing/PositionableProjection.java | 10 ++
application/sis-webapp/pom.xml | 10 +-
.../org/apache/sis/services/ServletListener.java | 6 +-
.../test/java/org/apache/sis/cql/CQLTestCase.java | 3 +-
.../org/apache/sis/coverage/SampleDimension.java | 16 +-
.../apache/sis/feature/DefaultAttributeType.java | 5 +-
.../sis/feature/GroupAsPolylineOperation.java | 4 +-
.../sis/feature/builder/FeatureTypeBuilder.java | 2 +-
.../apache/sis/filter/BinaryGeometryFilter.java | 30 ++--
.../org/apache/sis/filter/BinarySpatialFilter.java | 15 +-
.../apache/sis/filter/DefaultFilterFactory.java | 4 +-
.../java/org/apache/sis/filter/DistanceFilter.java | 23 ++-
.../apache/sis/internal/feature/Geometries.java | 99 ++++++++----
.../sis/internal/feature/GeometryFactories.java | 26 +++-
.../sis/internal/feature/GeometryWithCRS.java | 13 +-
.../sis/internal/feature/GeometryWrapper.java | 72 +++++----
.../org/apache/sis/internal/feature/Resources.java | 5 +
.../sis/internal/feature/Resources.properties | 1 +
.../sis/internal/feature/Resources_fr.properties | 1 +
.../internal/feature/SpatialOperationContext.java | 12 +-
.../sis/internal/feature/StandardGeometries.java | 170 +++++++++++++++++++++
.../apache/sis/internal/feature/esri/Factory.java | 44 ++++--
.../apache/sis/internal/feature/esri/Wrapper.java | 13 +-
.../sis/internal/feature/esri/package-info.java | 2 +-
.../apache/sis/internal/feature/j2d/Factory.java | 22 +--
.../sis/internal/feature/j2d/PointWrapper.java | 14 +-
.../apache/sis/internal/feature/j2d/Wrapper.java | 12 +-
.../sis/internal/feature/j2d/package-info.java | 2 +-
.../apache/sis/internal/feature/jts/Factory.java | 57 ++++---
.../apache/sis/internal/feature/jts/Wrapper.java | 53 +++++--
.../sis/internal/filter/GeometryConverter.java | 8 +-
.../java/org/apache/sis/internal/filter/Node.java | 12 +-
.../internal/filter/sqlmm/GeometryConstructor.java | 9 +-
.../sis/internal/filter/sqlmm/GeometryParser.java | 11 +-
.../sis/internal/filter/sqlmm/OneGeometry.java | 15 +-
.../apache/sis/internal/filter/sqlmm/SQLMM.java | 2 +-
.../sis/internal/filter/sqlmm/ST_FromBinary.java | 2 +-
.../sis/internal/filter/sqlmm/ST_FromText.java | 2 +-
.../apache/sis/internal/filter/sqlmm/ST_Point.java | 21 ++-
.../sis/internal/filter/sqlmm/ST_Transform.java | 10 +-
.../sis/internal/filter/sqlmm/SpatialFunction.java | 2 +-
.../sis/internal/filter/sqlmm/TwoGeometries.java | 23 ++-
.../apache/sis/feature/EnvelopeOperationTest.java | 6 +-
.../sis/filter/BinarySpatialFilterTestCase.java | 4 +-
.../sis/internal/feature/GeometriesTestCase.java | 14 +-
.../internal/feature/StandardGeometriesTest.java | 59 +++++++
.../sis/internal/feature/esri/FactoryTest.java | 22 ++-
.../apache/sis/internal/feature/jts/JTSTest.java | 14 +-
.../internal/filter/sqlmm/RegistryTestCase.java | 8 +-
.../sis/internal/jaxb/code/MD_ObligationCode.java | 2 +-
.../internal/jaxb/code/SV_ParameterDirection.java | 2 +-
.../sis/internal/jaxb/gco/GO_CharacterString.java | 20 ++-
.../apache/sis/internal/jaxb/gco/GO_DateTime.java | 4 +-
.../apache/sis/internal/jaxb/gco/GO_Distance.java | 2 +-
.../apache/sis/internal/jaxb/gco/GO_Integer.java | 2 +-
.../apache/sis/internal/jaxb/gco/GO_Measure.java | 2 +-
.../internal/jaxb/gco/GO_MultiplicityRange.java | 8 +-
.../org/apache/sis/internal/jaxb/gco/GO_Real.java | 2 +-
.../apache/sis/internal/jaxb/gco/GO_Record.java | 2 +-
.../sis/internal/jaxb/gco/GO_RecordType.java | 2 +-
.../apache/sis/internal/jaxb/gco/GO_Temporal.java | 4 +-
.../org/apache/sis/internal/jaxb/gco/GO_URL.java | 6 +-
.../sis/internal/jaxb/gco/GO_UnlimitedInteger.java | 4 +-
.../jaxb/gco/InternationalStringAdapter.java | 2 +-
.../apache/sis/internal/jaxb/gco/Multiplicity.java | 2 +-
.../sis/internal/jaxb/gco/MultiplicityRange.java | 8 +-
.../sis/internal/jaxb/gco/StringAdapter.java | 2 +-
.../sis/internal/jaxb/gco/UnlimitedInteger.java | 16 +-
.../org/apache/sis/internal/jaxb/gcx/Anchor.java | 2 +-
.../org/apache/sis/internal/jaxb/gcx/FileName.java | 4 +-
.../apache/sis/internal/jaxb/gcx/MimeFileType.java | 4 +-
.../sis/internal/jaxb/geometry/GM_Object.java | 2 +-
.../sis/internal/jaxb/gml/CodeListAdapter.java | 12 +-
.../apache/sis/internal/jaxb/gml/GMLAdapter.java | 2 +-
.../apache/sis/internal/jaxb/gml/TimePeriod.java | 4 +-
.../apache/sis/internal/jaxb/gts/TM_Duration.java | 2 +-
.../sis/internal/jaxb/gts/TM_PeriodDuration.java | 2 +-
.../org/apache/sis/internal/jaxb/lan/Country.java | 20 ++-
.../apache/sis/internal/jaxb/lan/LanguageCode.java | 6 +-
.../sis/internal/jaxb/lan/LocaleAdapter.java | 4 +-
.../jaxb/lan/LocalisedCharacterString.java | 6 +-
.../apache/sis/internal/jaxb/lan/PT_FreeText.java | 4 +-
.../apache/sis/internal/jaxb/lan/PT_Locale.java | 30 ++--
.../apache/sis/internal/jaxb/lan/TextGroup.java | 4 +-
.../internal/jaxb/metadata/replace/Parameter.java | 5 +
.../jaxb/metadata/replace/QualityParameter.java | 23 +--
.../metadata/replace/ReferenceSystemMetadata.java | 6 +-
.../internal/jaxb/metadata/replace/SensorType.java | 12 +-
.../jaxb/metadata/replace/ServiceParameter.java | 45 ++++--
.../sis/internal/metadata/ReferencingServices.java | 17 +--
.../sis/internal/metadata/sql/ScriptRunner.java | 35 ++++-
.../org/apache/sis/metadata/sql/Installer.java | 15 +-
.../main/java/org/apache/sis/util/iso/Types.java | 52 ++-----
.../org.apache.sis.internal.util.MetadataServices | 1 +
.../sis/internal/jaxb/gco/MultiplicityTest.java | 22 ++-
.../sis/internal/jaxb/lan/PT_LocaleTest.java | 27 ++--
.../java/org/apache/sis/metadata/Assertions.java | 3 +-
.../metadata/iso/citation/DefaultCitationTest.java | 32 ++--
.../sis/metadata/iso/extent/DefaultExtentTest.java | 32 +++-
.../DefaultServiceIdentificationTest.java | 18 ++-
.../iso/lineage/DefaultProcessStepTest.java | 21 ++-
.../quality/AbstractPositionalAccuracyTest.java | 22 ++-
.../org/apache/sis/metadata/xml/TestUsingFile.java | 52 ++++++-
.../java/org/apache/sis/test/sql/TestDatabase.java | 29 ++--
.../apache/sis/test/xml/DocumentComparator.java | 8 +-
.../java/org/apache/sis/test/xml/TestCase.java | 104 +++++++------
.../java/org/apache/sis/test/xml/package-info.java | 2 +-
.../sis/util/iso/DefaultNameFactoryTest.java | 5 +-
.../java/org/apache/sis/util/iso/TypesTest.java | 9 --
.../jaxb/referencing/CC_OperationParameter.java | 14 +-
.../apache/sis/internal/jaxb/referencing/Code.java | 6 +-
.../jaxb/referencing/SC_DerivedCRSType.java | 6 +-
.../referencing/provider/Description.java} | 35 +++--
.../referencing/provider/SatelliteTracking.java | 4 +-
.../sis/parameter/DefaultParameterDescriptor.java | 6 +-
.../sis/parameter/DefaultParameterValue.java | 2 +-
...pache.sis.internal.metadata.ReferencingServices | 1 +
.../java/org/apache/sis/io/wkt/WKTParserTest.java | 3 -
.../sis/parameter/ParameterMarshallingTest.java | 43 +++++-
.../referencing/crs/DefaultCompoundCRSTest.java | 14 +-
.../sis/referencing/crs/DefaultDerivedCRSTest.java | 14 +-
.../referencing/crs/DefaultGeodeticCRSTest.java | 14 +-
.../referencing/crs/DefaultProjectedCRSTest.java | 20 ++-
.../sis/referencing/cs/DefaultCartesianCSTest.java | 14 +-
.../referencing/cs/DefaultEllipsoidalCSTest.java | 14 +-
.../referencing/datum/DefaultEllipsoidTest.java | 24 +--
.../datum/DefaultGeodeticDatumTest.java | 12 +-
.../datum/DefaultPrimeMeridianTest.java | 15 +-
.../datum/DefaultTemporalDatumTest.java | 14 +-
.../datum/DefaultVerticalDatumTest.java | 25 +--
.../factory/GeodeticObjectFactoryTest.java | 3 -
.../referencing/factory/sql/EPSGFactoryTest.java | 14 +-
.../referencing/geoapi/AuthorityFactoryTest.java | 5 +-
.../geoapi/ParameterizedTransformTest.java | 3 -
.../DefaultConcatenatedOperationTest.java | 14 +-
.../operation/DefaultPassThroughOperationTest.java | 14 +-
.../operation/SingleOperationMarshallingTest.java | 17 ++-
.../operation/projection/InitializerTest.java | 8 +-
.../operation/transform/LinearTransformTest.java | 5 +-
.../transform/ProjectiveTransformTest.java | 3 -
.../sis/test/integration/MetadataVerticalTest.java | 15 +-
.../sis/internal/system/OptionalDependency.java | 50 ++----
.../apache/sis/internal/util/MetadataServices.java | 12 +-
.../org/apache/sis/internal/util/Numerics.java | 59 +------
.../java/org/apache/sis/math/SequenceVector.java | 5 +-
.../java/org/apache/sis/measure/NumberRange.java | 4 +-
.../java/org/apache/sis/setup/GeometryLibrary.java | 25 ++-
.../java/org/apache/sis/util/ArgumentChecks.java | 21 +++
.../src/main/java/org/apache/sis/util/Numbers.java | 13 +-
.../sis/util/ResourceInternationalString.java | 82 +++-------
.../org/apache/sis/internal/util/NumericsTest.java | 28 ----
.../test/java/org/apache/sis/test/TestCase.java | 2 -
.../java/org/apache/sis/test/TestUtilities.java | 16 +-
ide-project/NetBeans/build.xml | 14 ++
ide-project/NetBeans/nbproject/project.properties | 4 +-
pom.xml | 31 ++--
.../profile/fra/DirectReferenceSystemTest.java | 13 +-
.../apache/sis/profile/japan/JapanProfileTest.java | 26 ++--
.../sis/internal/netcdf/DiscreteSampling.java | 4 +-
.../jdbc/AbstractTestBaseForInternalJDBC.java | 3 +-
.../internal/shapefile/jdbc/DBFConnectionTest.java | 4 +-
.../internal/shapefile/jdbc/DBFResultSetTest.java | 2 -
.../internal/shapefile/jdbc/DBFStatementTest.java | 2 -
.../sis/storage/shapefile/ShapeFileTest.java | 3 +-
.../apache/sis/internal/sql/feature/Database.java | 2 +-
.../sis/internal/sql/feature/GeometryGetter.java | 6 +-
.../sis/internal/sql/feature/SelectionClause.java | 2 +-
.../internal/sql/feature/GeometryGetterTest.java | 12 +-
.../sql/feature/SelectionClauseWriterTest.java | 5 +-
.../sis/internal/sql/postgis/PostgresTest.java | 28 +++-
.../org/apache/sis/storage/sql/SQLStoreTest.java | 29 +++-
.../sis/internal/storage/MetadataBuilder.java | 5 +-
.../org/apache/sis/internal/storage/csv/Store.java | 4 +-
.../sis/internal/storage/wkt/StoreFormat.java | 4 +-
.../internal/storage/xml/MimeTypeDetectorTest.java | 6 +-
.../apache/sis/storage/StorageConnectorTest.java | 23 ++-
.../sis/internal/storage/gpx/Description.java | 62 ++++++++
.../org/apache/sis/internal/storage/gpx/Types.java | 7 +-
.../storage/xml/stream/StaxStreamReader.java | 3 +-
.../sis/internal/storage/gpx/ReaderTest.java | 27 ++--
.../apache/sis/internal/storage/gpx/TestData.java | 91 +++++++++++
.../sis/internal/storage/gpx/WriterTest.java | 35 +++--
184 files changed, 1880 insertions(+), 1139 deletions(-)
diff --cc
core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
index 3d02fd7ecc,67e0df0623..21f828af39
---
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
@@@ -241,12 -239,11 +246,11 @@@ public final class DefaultCitationTest
/**
* Tests XML marshalling for the given metadata version.
*
- * @param file file containing the expected metadata.
- * @param version the metadata version to marshal.
+ * @param format whether to use the 2007 or 2016 version of ISO 19115.
*/
- private void testMarshalling(final String file, final Version version)
throws JAXBException {
+ private void testMarshalling(final Format format) throws JAXBException {
final DefaultOnlineResource rs = new
DefaultOnlineResource(URI.create("https://tools.ietf.org/html/rfc1149";));
- rs.setName(new SimpleInternationalString("IP over Avian Carriers"));
+ rs.setName("IP over Avian Carriers");
rs.setDescription(new SimpleInternationalString("High delay, low
throughput, and low altitude service."));
rs.setFunction(OnLineFunction.OFFLINE_ACCESS);
diff --cc
profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
index 57144cc358,b78da8cc42..af4ad8892a
---
a/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
+++
b/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
@@@ -18,9 -18,11 +18,10 @@@ package org.apache.sis.internal.profile
import java.util.Set;
import java.util.Collection;
+ import java.io.InputStream;
import jakarta.xml.bind.JAXBException;
-import org.opengis.metadata.citation.Responsibility;
+import org.opengis.metadata.citation.ResponsibleParty;
import org.apache.sis.metadata.iso.DefaultMetadata;
-import org.apache.sis.metadata.iso.DefaultIdentifier;
import org.apache.sis.metadata.iso.citation.DefaultCitation;
import org.apache.sis.metadata.iso.citation.DefaultResponsibleParty;
import org.apache.sis.metadata.iso.citation.HardCodedCitations;
