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 c89fcb2b94739229f6e1903f5d3171ce9c58c168
Merge: f5bc633ac3 0ea485eff4
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Mon Dec 26 14:13:31 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1
.../apache/sis/gui/dataset/ExpandedFeature.java | 2 +
.../apache/sis/internal/gui/DataStoreOpener.java | 7 +-
.../apache/sis/internal/gui/ExceptionReporter.java | 6 +-
cloud/pom.xml | 4 +-
cloud/sis-cloud-aws/pom.xml | 2 +-
.../apache/sis/cloud/aws/internal/Resources.java | 5 +
.../sis/cloud/aws/internal/Resources.properties | 1 +
.../sis/cloud/aws/internal/Resources_fr.properties | 1 +
.../apache/sis/cloud/aws/s3/CachedByteChannel.java | 288 ++------
.../org/apache/sis/cloud/aws/s3/FileService.java | 50 +-
.../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 6 +-
.../org/apache/sis/cloud/aws/s3/package-info.java | 2 +-
.../sis/internal/jaxb/gco/CharSequenceAdapter.java | 24 +-
.../org/apache/sis/internal/jaxb/lan/Country.java | 6 +-
.../apache/sis/internal/metadata/Identifiers.java | 33 +-
.../internal/metadata/ImplementationHelper.java | 5 +-
.../org/apache/sis/metadata/PropertyAccessor.java | 3 +-
.../apache/sis/metadata/PropertyInformation.java | 7 +-
.../sis/metadata/iso/citation/Citations.java | 2 +-
.../main/java/org/apache/sis/xml/NilReason.java | 2 +-
.../java/org/apache/sis/xml/ValueConverter.java | 27 +-
.../apache/sis/test/xml/DocumentComparator.java | 8 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 5 +-
.../org/apache/sis/geometry/CoordinateFormat.java | 4 +-
.../apache/sis/internal/jaxb/referencing/Code.java | 2 +-
.../sis/internal/referencing/AxisDirections.java | 2 +-
.../main/java/org/apache/sis/io/wkt/Formatter.java | 4 +-
.../apache/sis/io/wkt/GeodeticObjectParser.java | 5 +-
.../main/java/org/apache/sis/io/wkt/Symbols.java | 6 +-
.../org/apache/sis/parameter/TensorValues.java | 7 +-
.../sis/referencing/ImmutableIdentifier.java | 15 +-
.../sis/referencing/cs/CoordinateSystems.java | 5 +-
.../cs/DefaultCoordinateSystemAxis.java | 28 +-
.../factory/GeodeticAuthorityFactory.java | 2 +-
.../DefaultCoordinateOperationFactory.java | 4 +-
.../transform/DefaultMathTransformFactory.java | 4 +-
.../java/org/apache/sis/referencing/CRSTest.java | 21 +-
.../apache/sis/referencing/factory/GIGS2001.java | 73 --
.../apache/sis/referencing/factory/GIGS2002.java | 121 ----
.../apache/sis/referencing/factory/GIGS2003.java | 77 ---
.../apache/sis/referencing/factory/GIGS2004.java | 166 -----
.../apache/sis/referencing/factory/GIGS2005.java | 123 ----
.../apache/sis/referencing/factory/GIGS2006.java | 118 ----
.../apache/sis/referencing/factory/GIGS2007.java | 77 ---
.../apache/sis/referencing/factory/GIGS2008.java | 77 ---
.../apache/sis/referencing/factory/GIGS2009.java | 77 ---
.../apache/sis/referencing/factory/GIGS3002.java | 49 --
.../apache/sis/referencing/factory/GIGS3003.java | 49 --
.../apache/sis/referencing/factory/GIGS3004.java | 56 --
.../apache/sis/referencing/factory/GIGS3005.java | 49 --
.../referencing/factory/sql/EPSGFactoryTest.java | 2 -
.../DefaultCoordinateOperationFactoryTest.java | 19 +-
.../apache/sis/test/integration/MetadataTest.java | 5 +-
.../sis/test/suite/ReferencingTestSuite.java | 17 +-
.../sis/internal/converter/StringConverter.java | 6 +-
.../java/org/apache/sis/internal/jdk17/JDK17.java | 19 +
.../java/org/apache/sis/internal/jdk17/Record.java | 22 +-
.../sis/internal/system/DelayedExecutor.java | 2 +-
.../org/apache/sis/internal/util/CodeLists.java | 8 +-
.../org/apache/sis/internal/util/Constants.java | 6 +-
.../apache/sis/internal/util/DefinitionURI.java | 6 +-
.../org/apache/sis/internal/util/Numerics.java | 20 +
.../java/org/apache/sis/internal/util/Strings.java | 8 +-
.../java/org/apache/sis/internal/util/X364.java | 3 +-
.../main/java/org/apache/sis/io/DefaultFormat.java | 2 +-
.../java/org/apache/sis/measure/UnitFormat.java | 5 +-
.../java/org/apache/sis/util/CharSequences.java | 3 +-
.../main/java/org/apache/sis/util/Exceptions.java | 4 +-
.../src/main/java/org/apache/sis/util/Numbers.java | 4 +-
.../src/main/java/org/apache/sis/util/Version.java | 2 +-
.../sis/util/collection/DefaultTreeTable.java | 5 +-
.../org/apache/sis/util/collection/RangeSet.java | 61 +-
.../apache/sis/util/collection/package-info.java | 2 +-
.../apache/sis/util/logging/MonolineFormatter.java | 2 +-
.../sis/util/resources/IndexedResourceBundle.java | 3 +-
.../org/apache/sis/util/CharSequencesTest.java | 3 -
pom.xml | 2 +-
.../apache/sis/internal/geotiff/Compression.java | 46 +-
.../org/apache/sis/internal/geotiff/Predictor.java | 8 +-
.../apache/sis/internal/geotiff/package-info.java | 2 +-
.../storage/inflater/CompressionChannel.java | 11 +-
.../sis/internal/storage/inflater/Inflater.java | 2 +-
.../org/apache/sis/storage/geotiff/DataCube.java | 6 +-
.../apache/sis/storage/geotiff/GeoKeysLoader.java | 23 +-
.../sis/storage/geotiff/ImageFileDirectory.java | 222 +++---
.../sis/storage/geotiff/ImageMetadataBuilder.java | 18 +-
.../apache/sis/storage/geotiff/NativeMetadata.java | 26 +-
.../java/org/apache/sis/storage/geotiff/Tags.java | 192 ++---
.../java/org/apache/sis/storage/geotiff/Type.java | 76 +-
.../apache/sis/storage/geotiff/package-info.java | 2 +-
.../org/apache/sis/storage/geotiff/TagsTest.java} | 33 +-
.../apache/sis/test/suite/GeoTiffTestSuite.java | 3 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 2 +-
.../org/apache/sis/internal/storage/CodeType.java | 9 +-
.../sis/internal/storage/io/ChannelData.java | 3 +-
.../sis/internal/storage/io/ChannelDataInput.java | 25 +-
.../sis/internal/storage/io/ChannelFactory.java | 16 +-
.../internal/storage/io/FileCacheByteChannel.java | 769 +++++++++++++++++++++
.../sis/internal/storage/io/HttpByteChannel.java | 147 ++++
.../sis/internal/storage/io/IOUtilities.java | 32 +-
.../sis/internal/storage/io/package-info.java | 2 +-
.../org/apache/sis/storage/StorageConnector.java | 11 +-
.../sis/storage/aggregate/GridSliceLocator.java | 4 +-
.../sis/storage/aggregate/GroupAggregate.java | 20 +
.../sis/storage/aggregate/GroupByTransform.java | 17 +-
.../java/org/apache/sis/storage/package-info.java | 2 +-
.../internal/storage/io/ComputedInputStream.java | 149 ++++
.../storage/io/FileCacheByteChannelTest.java | 236 +++++++
.../sis/internal/storage/io/IOUtilitiesTest.java | 4 +-
.../storage/aggregate/CoverageAggregatorTest.java} | 31 +-
.../apache/sis/test/suite/StorageTestSuite.java | 4 +-
111 files changed, 2139 insertions(+), 1972 deletions(-)
diff --cc
core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
index 1b136c2330,dfb2593c6b..38d7ce4ae5
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyInformation.java
@@@ -17,15 -17,15 +17,15 @@@
package org.apache.sis.metadata;
import java.util.Locale;
- import java.util.Set;
import java.util.Collection;
+ import java.util.Collections;
import java.lang.reflect.Method;
import org.opengis.annotation.UML;
-import org.opengis.annotation.Obligation;
import org.opengis.metadata.Datatype;
+import org.opengis.metadata.Obligation;
import org.opengis.metadata.citation.Citation;
import org.opengis.metadata.ExtendedElementInformation;
-import org.opengis.metadata.citation.Responsibility;
+import org.opengis.metadata.citation.ResponsibleParty;
import org.opengis.util.CodeList;
import org.opengis.util.InternationalString;
import org.apache.sis.internal.simple.SimpleIdentifier;
diff --cc
core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
index 7d6e3a7da0,1d3950bedc..ecee2b2ec5
---
a/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
+++
b/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
@@@ -164,9 -165,9 +165,9 @@@ public final strictfp class MetadataTes
new DefaultCitationDate(TestUtilities.date("1979-08-02
22:00:00"), DateType.CREATION)));
{
@SuppressWarnings("deprecation")
- final DefaultResponsibility originator = new
DefaultResponsibleParty(Role.ORIGINATOR);
+ final DefaultResponsibleParty originator = new
DefaultResponsibleParty(Role.ORIGINATOR);
final DefaultOnlineResource online = new
DefaultOnlineResource(URI.create("http://www.com.univ-mrs.fr/LOB/";));
- online.setProtocol("http");
+ online.setProtocol(Constants.HTTP);
final DefaultContact contact = new DefaultContact(online);
contact.setPhones(List.of(
new DefaultTelephone("+33 (0)4 xx.xx.xx.x5",
TelephoneType.VOICE),
