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 07ebe0c95ed312101364e1f8d9b3fe8379355119
Merge: 83156f2 2f74561
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Mar 6 20:29:49 2022 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
Contains a first version of cloud module for S3.
cloud/pom.xml | 122 +++
cloud/sis-cloud-S3/pom.xml | 97 +++
.../apache/sis/cloud/aws/internal/Resources.java | 168 ++++
.../sis/cloud/aws/internal/Resources.properties | 28 +
.../sis/cloud/aws/internal/Resources_fr.properties | 33 +
.../sis/cloud/aws/internal/package-info.java | 32 +
.../org/apache/sis/cloud/aws/s3/BucketStore.java | 170 ++++
.../apache/sis/cloud/aws/s3/CachedByteChannel.java | 287 +++++++
.../apache/sis/cloud/aws/s3/ClientFileSystem.java | 246 ++++++
.../org/apache/sis/cloud/aws/s3/DerivedList.java | 122 +++
.../org/apache/sis/cloud/aws/s3/FileService.java | 576 +++++++++++++
.../java/org/apache/sis/cloud/aws/s3/KeyPath.java | 900 +++++++++++++++++++++
.../apache/sis/cloud/aws/s3/KeyPathMatcher.java | 120 +++
.../apache/sis/cloud/aws/s3/ObjectAttributes.java | 304 +++++++
.../org/apache/sis/cloud/aws/s3/PathIterator.java | 203 +++++
.../org/apache/sis/cloud/aws/s3/package-info.java | 59 ++
.../services/java.nio.file.spi.FileSystemProvider | 1 +
.../sis/cloud/aws/s3/ClientFileSystemTest.java | 62 ++
.../sis/cloud/aws/s3/KeyPathMatcherTest.java | 44 +
.../org/apache/sis/cloud/aws/s3/KeyPathTest.java | 259 ++++++
.../org/apache/sis/test/suite/AWSTestSuite.java | 41 +
.../org/apache/sis/test/suite/package-info.txt | 3 +
.../org/apache/sis/coverage/grid/GridGeometry.java | 2 +-
.../org/apache/sis/feature/AbstractFeature.java | 2 +-
.../sis/internal/referencing/EPSGFactoryProxy.java | 92 +--
.../internal/referencing/EPSGFactoryProxyCOP.java | 59 ++
...GFactoryProxy.java => EPSGFactoryProxyCRS.java} | 43 +-
.../internal/referencing/EPSGFactoryProxyCS.java | 107 +++
.../referencing/EPSGFactoryProxyDatum.java | 95 +++
.../sis/internal/referencing/ExtentSelector.java | 2 +-
...org.opengis.referencing.crs.CRSAuthorityFactory | 2 +-
... org.opengis.referencing.cs.CSAuthorityFactory} | 3 +-
...pengis.referencing.datum.DatumAuthorityFactory} | 3 +-
....operation.CoordinateOperationAuthorityFactory} | 3 +-
.../org/apache/sis/internal/util/EmptyQueue.java | 2 +-
.../main/java/org/apache/sis/math/ArrayVector.java | 24 +-
.../src/main/java/org/apache/sis/math/Vector.java | 12 +-
.../test/java/org/apache/sis/math/VectorTest.java | 69 +-
ide-project/NetBeans/build.xml | 21 +
pom.xml | 1 +
.../sis/storage/geotiff/MultiResolutionImage.java | 62 +-
.../org/apache/sis/internal/netcdf/CRSBuilder.java | 102 ++-
.../org/apache/sis/internal/netcdf/Convention.java | 10 +-
.../org/apache/sis/internal/netcdf/Decoder.java | 16 +-
.../org/apache/sis/internal/netcdf/Dimension.java | 2 +-
.../org/apache/sis/internal/netcdf/FeatureSet.java | 2 +-
.../java/org/apache/sis/internal/netcdf/Grid.java | 6 +-
.../apache/sis/internal/netcdf/GridAdjustment.java | 8 +-
.../org/apache/sis/internal/netcdf/Variable.java | 25 +-
.../apache/sis/internal/netcdf/VariableRole.java | 2 +-
.../sis/internal/netcdf/impl/ChannelDecoder.java | 4 +-
.../apache/sis/internal/netcdf/impl/GridInfo.java | 6 +-
.../sis/internal/netcdf/impl/VariableInfo.java | 30 +-
.../sis/internal/netcdf/ucar/DecoderWrapper.java | 43 +-
.../sis/internal/netcdf/ucar/GridWrapper.java | 5 +-
.../sis/internal/netcdf/ucar/VariableWrapper.java | 33 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 84 +-
.../apache/sis/storage/netcdf/package-info.java | 2 +-
.../org/apache/sis/internal/netcdf/GridTest.java | 8 +-
.../org/apache/sis/internal/sql/feature/Table.java | 4 +-
.../sis/internal/storage/MetadataBuilder.java | 51 +-
.../sis/internal/storage/MetadataBuilderTest.java | 18 +-
62 files changed, 4590 insertions(+), 352 deletions(-)
diff --cc
storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
index 993e461,405b518..a4e8567
---
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
+++
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
@@@ -461,10 -467,10 +467,10 @@@ split: while ((start = CharSequences.s
role = isPointOfContact ? Role.POINT_OF_CONTACT :
keys.DEFAULT_ROLE;
}
/*
- * Verify if we can share the existing 'pointOfContact' instance.
This is often the case in practice.
+ * Verify if we can share the existing `pointOfContact` instance.
This is often the case in practice.
* If we can not share the whole existing instance, we usually can
share parts of it like the address.
*/
- Responsibility responsibility = pointOfContact;
+ ResponsibleParty responsibility = pointOfContact;
Contact contact = null;
Address address = null;
OnlineResource resource = null;
@@@ -625,10 -629,8 +630,8 @@@
for (final String keyword :
split(stringValue(ACCESS_CONSTRAINT))) {
addAccessConstraint(forCodeName(Restriction.class, keyword));
}
- addTopicCategory(forEnumName(TopicCategory.class,
stringValue(TOPIC_CATEGORY)));
+ addTopicCategory(forCodeName(TopicCategory.class,
stringValue(TOPIC_CATEGORY)));
- SpatialRepresentationType dt =
forCodeName(SpatialRepresentationType.class, stringValue(DATA_TYPE));
- addSpatialRepresentation(dt);
- hasDataType |= (dt != null);
+
addSpatialRepresentation(forCodeName(SpatialRepresentationType.class,
stringValue(DATA_TYPE)));
if (!hasExtent) {
/*
* Takes only ONE extent, because a netCDF file may declare
many time the same
