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 2021/09/23 10:25:32 UTC
[sis] branch master updated (a56028b -> 880d42d)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git.
from a56028b Merge branch 'geoapi-3.1'
add d4b8541 Rename the `metadata` parameter for avoiding confusion with the `metadata` field. They do not always have the same value because of the same class being used both as a `XmlAdapter` and a wrapper object.
add 8d0380b Update SIS version number.
add 138552b Compatibility with Java 17 and upgrade to NetBeans 12.5.
add 19acaac Fix unmarshalling of <gmi:MI_PolarizationOrientationCode>.
add 7485605 Move `RasterLoadingStrategy` to public API.
add 75db362 Move `WraparoundAdjustment` outside of `sis-referencing` module. It is specific to grid coverage support.
add 93868d7 Rename `FolderStoreProvider` as `StoreProvider` for consistency with other internal store provider. The `Folder` prefix is redundant with package names and these providers are no expected to be used directly.
add 63a6974 Use better method names for some `SQLBuilder` methods.
add 975a191 Rename `insert(…)` as `insertDimension` and `reduce(…)` as `reduceDimension`.
add c3bb6f3 Remove link to UCAR Javadoc. The link seems to not work anymore.
add a493472 Remove <scope>provided</scope> in declarations of Jakarta API dependency. Environments providing JAXB by default are rare now.
add d859b67 Merge branch 'geoapi-4.0' into geoapi-3.1
new 880d42d Merge branch 'geoapi-3.1'
The 1 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:
application/sis-console/pom.xml | 4 -
application/sis-console/src/main/artifact/README | 6 +-
application/sis-javafx/pom.xml | 5 -
application/sis-openoffice/pom.xml | 5 -
.../apache/sis/coverage/grid/GridDerivation.java | 1 -
.../org/apache/sis/coverage/grid/GridExtent.java | 34 ++++-
.../org/apache/sis/coverage/grid/GridGeometry.java | 2 +-
.../apache/sis/coverage/grid/SliceGeometry.java | 2 +-
.../sis/coverage/grid}/WraparoundAdjustment.java | 47 +------
.../sis/coverage/grid/GridDerivationTest.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 16 +--
.../coverage/grid}/WraparoundAdjustmentTest.java | 19 +--
.../apache/sis/test/suite/FeatureTestSuite.java | 1 +
.../sis/internal/jaxb/metadata/CI_Address.java | 16 +--
.../sis/internal/jaxb/metadata/CI_Citation.java | 16 +--
.../sis/internal/jaxb/metadata/CI_Contact.java | 16 +--
.../apache/sis/internal/jaxb/metadata/CI_Date.java | 16 +--
.../internal/jaxb/metadata/CI_OnlineResource.java | 16 +--
.../sis/internal/jaxb/metadata/CI_Party.java | 16 +--
.../internal/jaxb/metadata/CI_Responsibility.java | 16 +--
.../jaxb/metadata/CI_ResponsibleParty.java | 22 ++--
.../sis/internal/jaxb/metadata/CI_Series.java | 16 +--
.../sis/internal/jaxb/metadata/CI_Telephone.java | 16 +--
.../sis/internal/jaxb/metadata/DQ_DataQuality.java | 16 +--
.../sis/internal/jaxb/metadata/DQ_Element.java | 16 +--
.../jaxb/metadata/DQ_PositionalAccuracy.java | 16 +--
.../sis/internal/jaxb/metadata/DQ_Result.java | 16 +--
.../sis/internal/jaxb/metadata/EX_Extent.java | 16 +--
.../jaxb/metadata/EX_GeographicExtent.java | 16 +--
.../internal/jaxb/metadata/EX_TemporalExtent.java | 16 +--
.../internal/jaxb/metadata/EX_VerticalExtent.java | 16 +--
.../sis/internal/jaxb/metadata/LE_Algorithm.java | 16 +--
.../jaxb/metadata/LE_NominalResolution.java | 16 +--
.../jaxb/metadata/LE_ProcessStepReport.java | 16 +--
.../sis/internal/jaxb/metadata/LE_Processing.java | 16 +--
.../sis/internal/jaxb/metadata/LI_Lineage.java | 16 +--
.../sis/internal/jaxb/metadata/LI_ProcessStep.java | 16 +--
.../sis/internal/jaxb/metadata/LI_Source.java | 16 +--
.../jaxb/metadata/MD_AggregateInformation.java | 16 +--
.../metadata/MD_ApplicationSchemaInformation.java | 16 +--
.../internal/jaxb/metadata/MD_AttributeGroup.java | 16 +--
.../internal/jaxb/metadata/MD_BrowseGraphic.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Constraints.java | 16 +--
.../jaxb/metadata/MD_ContentInformation.java | 16 +--
.../jaxb/metadata/MD_DataIdentification.java | 16 +--
.../jaxb/metadata/MD_DigitalTransferOptions.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Dimension.java | 16 +--
.../internal/jaxb/metadata/MD_Distribution.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Distributor.java | 16 +--
.../metadata/MD_ExtendedElementInformation.java | 16 +--
.../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Format.java | 16 +--
.../jaxb/metadata/MD_GeometricObjects.java | 16 +--
.../internal/jaxb/metadata/MD_Identification.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Identifier.java | 16 +--
.../internal/jaxb/metadata/MD_KeywordClass.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Keywords.java | 16 +--
.../jaxb/metadata/MD_MaintenanceInformation.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Medium.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Metadata.java | 16 +--
.../metadata/MD_MetadataExtensionInformation.java | 16 +--
.../internal/jaxb/metadata/MD_MetadataScope.java | 16 +--
.../metadata/MD_PortrayalCatalogueReference.java | 16 +--
.../internal/jaxb/metadata/MD_RangeDimension.java | 16 +--
.../internal/jaxb/metadata/MD_Releasability.java | 16 +--
.../jaxb/metadata/MD_RepresentativeFraction.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Resolution.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Scope.java | 18 +--
.../jaxb/metadata/MD_ScopeDescription.java | 16 +--
.../jaxb/metadata/MD_SpatialRepresentation.java | 16 +--
.../jaxb/metadata/MD_StandardOrderProcess.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Usage.java | 16 +--
.../jaxb/metadata/MI_AcquisitionInformation.java | 16 +--
.../jaxb/metadata/MI_EnvironmentalRecord.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Event.java | 16 +--
.../apache/sis/internal/jaxb/metadata/MI_GCP.java | 16 +--
.../jaxb/metadata/MI_GeolocationInformation.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Instrument.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Objective.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Operation.java | 16 +--
.../apache/sis/internal/jaxb/metadata/MI_Plan.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Platform.java | 16 +--
.../internal/jaxb/metadata/MI_PlatformPass.java | 16 +--
.../jaxb/metadata/MI_RangeElementDescription.java | 16 +--
.../internal/jaxb/metadata/MI_RequestedDate.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Requirement.java | 16 +--
.../sis/internal/jaxb/metadata/MX_DataFile.java | 16 +--
.../internal/jaxb/metadata/RS_ReferenceSystem.java | 18 +--
.../internal/jaxb/metadata/SV_CoupledResource.java | 16 +--
.../jaxb/metadata/SV_OperationChainMetadata.java | 16 +--
.../jaxb/metadata/SV_OperationMetadata.java | 16 +--
.../sis/internal/jaxb/metadata/SV_Parameter.java | 16 +--
.../sis/internal/jaxb/metadata/package-info.java | 2 +-
.../sis/internal/metadata/sql/SQLBuilder.java | 10 +-
.../sis/metadata/sql/IdentifierGenerator.java | 2 +-
.../apache/sis/metadata/sql/MetadataSource.java | 2 +-
.../apache/sis/metadata/sql/MetadataWriter.java | 2 +-
.../org/apache/sis/xml/RenameOnImport.lst | 1 +
.../sis/metadata/iso/content/DefaultBandTest.java | 141 +++++++++++++++++++++
.../apache/sis/test/suite/MetadataTestSuite.java | 1 +
.../internal/referencing/WraparoundApplicator.java | 37 +++++-
.../referencing/WraparoundApplicatorTest.java} | 22 ++--
.../sis/test/suite/ReferencingTestSuite.java | 2 +-
ide-project/NetBeans/nbproject/build-impl.xml | 4 +-
ide-project/NetBeans/nbproject/genfiles.properties | 4 +-
pom.xml | 7 -
.../sis/internal/netcdf/ucar/package-info.java | 5 +-
.../apache/sis/storage/netcdf/AttributeNames.java | 2 +-
.../sis/internal/sql/feature/FeatureIterator.java | 2 +-
.../sis/internal/storage/AbstractGridResource.java | 30 +----
.../sis/internal/storage/TiledGridResource.java | 1 +
.../apache/sis/internal/storage/folder/Store.java | 4 +-
...FolderStoreProvider.java => StoreProvider.java} | 8 +-
.../sis/internal/storage/folder/WritableStore.java | 4 +-
.../apache/sis/storage/GridCoverageResource.java | 32 +++++
.../storage/RasterLoadingStrategy.java | 6 +-
.../org.apache.sis.storage.DataStoreProvider | 2 +-
.../sis/internal/storage/folder/StoreTest.java | 4 +-
.../sis/test/storage/CoverageReadConsistency.java | 2 +-
119 files changed, 942 insertions(+), 815 deletions(-)
rename core/{sis-referencing/src/main/java/org/apache/sis/internal/referencing => sis-feature/src/main/java/org/apache/sis/coverage/grid}/WraparoundAdjustment.java (92%)
rename core/{sis-referencing/src/test/java/org/apache/sis/internal/referencing => sis-feature/src/test/java/org/apache/sis/coverage/grid}/WraparoundAdjustmentTest.java (93%)
create mode 100644 core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
copy core/sis-referencing/src/test/java/org/apache/sis/{referencing/operation/DefaultFormulaTest.java => internal/referencing/WraparoundApplicatorTest.java} (62%)
rename storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/{FolderStoreProvider.java => StoreProvider.java} (98%)
rename storage/sis-storage/src/main/java/org/apache/sis/{internal => }/storage/RasterLoadingStrategy.java (95%)
[sis] 01/01: 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 master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 880d42d9998d4cbcdca5eab3f4350558470d6302
Merge: a56028b d859b67
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Thu Sep 23 12:25:22 2021 +0200
Merge branch 'geoapi-3.1'
application/sis-console/pom.xml | 4 -
application/sis-console/src/main/artifact/README | 6 +-
application/sis-javafx/pom.xml | 5 -
application/sis-openoffice/pom.xml | 5 -
.../apache/sis/coverage/grid/GridDerivation.java | 1 -
.../org/apache/sis/coverage/grid/GridExtent.java | 34 ++++-
.../org/apache/sis/coverage/grid/GridGeometry.java | 2 +-
.../apache/sis/coverage/grid/SliceGeometry.java | 2 +-
.../sis/coverage/grid}/WraparoundAdjustment.java | 47 +------
.../sis/coverage/grid/GridDerivationTest.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 16 +--
.../coverage/grid}/WraparoundAdjustmentTest.java | 19 +--
.../apache/sis/test/suite/FeatureTestSuite.java | 1 +
.../sis/internal/jaxb/metadata/CI_Address.java | 16 +--
.../sis/internal/jaxb/metadata/CI_Citation.java | 16 +--
.../sis/internal/jaxb/metadata/CI_Contact.java | 16 +--
.../apache/sis/internal/jaxb/metadata/CI_Date.java | 16 +--
.../internal/jaxb/metadata/CI_OnlineResource.java | 16 +--
.../sis/internal/jaxb/metadata/CI_Party.java | 16 +--
.../internal/jaxb/metadata/CI_Responsibility.java | 16 +--
.../jaxb/metadata/CI_ResponsibleParty.java | 22 ++--
.../sis/internal/jaxb/metadata/CI_Series.java | 16 +--
.../sis/internal/jaxb/metadata/CI_Telephone.java | 16 +--
.../sis/internal/jaxb/metadata/DQ_DataQuality.java | 16 +--
.../sis/internal/jaxb/metadata/DQ_Element.java | 16 +--
.../jaxb/metadata/DQ_PositionalAccuracy.java | 16 +--
.../sis/internal/jaxb/metadata/DQ_Result.java | 16 +--
.../sis/internal/jaxb/metadata/EX_Extent.java | 16 +--
.../jaxb/metadata/EX_GeographicExtent.java | 16 +--
.../internal/jaxb/metadata/EX_TemporalExtent.java | 16 +--
.../internal/jaxb/metadata/EX_VerticalExtent.java | 16 +--
.../sis/internal/jaxb/metadata/LE_Algorithm.java | 16 +--
.../jaxb/metadata/LE_NominalResolution.java | 16 +--
.../jaxb/metadata/LE_ProcessStepReport.java | 16 +--
.../sis/internal/jaxb/metadata/LE_Processing.java | 16 +--
.../sis/internal/jaxb/metadata/LI_Lineage.java | 16 +--
.../sis/internal/jaxb/metadata/LI_ProcessStep.java | 16 +--
.../sis/internal/jaxb/metadata/LI_Source.java | 16 +--
.../jaxb/metadata/MD_AggregateInformation.java | 16 +--
.../metadata/MD_ApplicationSchemaInformation.java | 16 +--
.../internal/jaxb/metadata/MD_AttributeGroup.java | 16 +--
.../internal/jaxb/metadata/MD_BrowseGraphic.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Constraints.java | 16 +--
.../jaxb/metadata/MD_ContentInformation.java | 16 +--
.../jaxb/metadata/MD_DataIdentification.java | 16 +--
.../jaxb/metadata/MD_DigitalTransferOptions.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Dimension.java | 16 +--
.../internal/jaxb/metadata/MD_Distribution.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Distributor.java | 16 +--
.../metadata/MD_ExtendedElementInformation.java | 16 +--
.../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Format.java | 16 +--
.../jaxb/metadata/MD_GeometricObjects.java | 16 +--
.../internal/jaxb/metadata/MD_Identification.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Identifier.java | 16 +--
.../internal/jaxb/metadata/MD_KeywordClass.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Keywords.java | 16 +--
.../jaxb/metadata/MD_MaintenanceInformation.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Medium.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Metadata.java | 16 +--
.../metadata/MD_MetadataExtensionInformation.java | 16 +--
.../internal/jaxb/metadata/MD_MetadataScope.java | 16 +--
.../metadata/MD_PortrayalCatalogueReference.java | 16 +--
.../internal/jaxb/metadata/MD_RangeDimension.java | 16 +--
.../internal/jaxb/metadata/MD_Releasability.java | 16 +--
.../jaxb/metadata/MD_RepresentativeFraction.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Resolution.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Scope.java | 18 +--
.../jaxb/metadata/MD_ScopeDescription.java | 16 +--
.../jaxb/metadata/MD_SpatialRepresentation.java | 16 +--
.../jaxb/metadata/MD_StandardOrderProcess.java | 16 +--
.../sis/internal/jaxb/metadata/MD_Usage.java | 16 +--
.../jaxb/metadata/MI_AcquisitionInformation.java | 16 +--
.../jaxb/metadata/MI_EnvironmentalRecord.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Event.java | 16 +--
.../apache/sis/internal/jaxb/metadata/MI_GCP.java | 16 +--
.../jaxb/metadata/MI_GeolocationInformation.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Instrument.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Objective.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Operation.java | 16 +--
.../apache/sis/internal/jaxb/metadata/MI_Plan.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Platform.java | 16 +--
.../internal/jaxb/metadata/MI_PlatformPass.java | 16 +--
.../jaxb/metadata/MI_RangeElementDescription.java | 16 +--
.../internal/jaxb/metadata/MI_RequestedDate.java | 16 +--
.../sis/internal/jaxb/metadata/MI_Requirement.java | 16 +--
.../sis/internal/jaxb/metadata/MX_DataFile.java | 16 +--
.../internal/jaxb/metadata/RS_ReferenceSystem.java | 18 +--
.../internal/jaxb/metadata/SV_CoupledResource.java | 16 +--
.../jaxb/metadata/SV_OperationChainMetadata.java | 16 +--
.../jaxb/metadata/SV_OperationMetadata.java | 16 +--
.../sis/internal/jaxb/metadata/SV_Parameter.java | 16 +--
.../sis/internal/jaxb/metadata/package-info.java | 2 +-
.../sis/internal/metadata/sql/SQLBuilder.java | 10 +-
.../sis/metadata/sql/IdentifierGenerator.java | 2 +-
.../apache/sis/metadata/sql/MetadataSource.java | 2 +-
.../apache/sis/metadata/sql/MetadataWriter.java | 2 +-
.../org/apache/sis/xml/RenameOnImport.lst | 1 +
.../sis/metadata/iso/content/DefaultBandTest.java | 141 +++++++++++++++++++++
.../apache/sis/test/suite/MetadataTestSuite.java | 1 +
.../internal/referencing/WraparoundApplicator.java | 37 +++++-
.../referencing/WraparoundApplicatorTest.java | 30 +++--
.../sis/test/suite/ReferencingTestSuite.java | 2 +-
ide-project/NetBeans/nbproject/build-impl.xml | 4 +-
ide-project/NetBeans/nbproject/genfiles.properties | 4 +-
pom.xml | 7 -
.../sis/internal/netcdf/ucar/package-info.java | 5 +-
.../apache/sis/storage/netcdf/AttributeNames.java | 2 +-
.../sis/internal/sql/feature/FeatureIterator.java | 2 +-
.../sis/internal/storage/AbstractGridResource.java | 30 +----
.../sis/internal/storage/TiledGridResource.java | 1 +
.../apache/sis/internal/storage/folder/Store.java | 4 +-
...FolderStoreProvider.java => StoreProvider.java} | 8 +-
.../sis/internal/storage/folder/WritableStore.java | 4 +-
.../apache/sis/storage/GridCoverageResource.java | 32 +++++
.../storage/RasterLoadingStrategy.java | 6 +-
.../org.apache.sis.storage.DataStoreProvider | 2 +-
.../sis/internal/storage/folder/StoreTest.java | 4 +-
.../sis/test/storage/CoverageReadConsistency.java | 2 +-
119 files changed, 953 insertions(+), 812 deletions(-)
diff --cc core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
index e26f79c,7368d8e..040cc2f
--- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
+++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
@@@ -589,8 -625,9 +589,8 @@@ public class GridExtent implements Seri
*
* @return the number of dimensions.
*
- * @see #reduce(int...)
+ * @see #reduceDimension(int[])
*/
- @Override
public final int getDimension() {
return coordinates.length >>> 1;
}
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Party.java
index a83766e,e7f6042..32db806
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Party.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Party.java
@@@ -50,8 -53,8 +50,8 @@@ public final class CI_Party extends Pro
/**
* Constructor for the {@link #wrap} method only.
*/
- private CI_Party(final AbstractParty metadata) {
- super(metadata);
- private CI_Party(final Party value) {
++ private CI_Party(final AbstractParty value) {
+ super(value);
}
/**
@@@ -62,8 -65,8 +62,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected CI_Party wrap(final AbstractParty metadata) {
- return new CI_Party(metadata);
- protected CI_Party wrap(final Party value) {
++ protected CI_Party wrap(final AbstractParty value) {
+ return new CI_Party(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
index fb1f066,4de669b..319d598
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
@@@ -54,8 -57,8 +54,8 @@@ public final class CI_Responsibility ex
/**
* Constructor for the {@link #wrap} method only.
*/
- private CI_Responsibility(final DefaultResponsibility metadata) {
- super(metadata);
- private CI_Responsibility(final Responsibility value) {
++ private CI_Responsibility(final DefaultResponsibility value) {
+ super(value);
}
/**
@@@ -66,8 -69,8 +66,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected CI_Responsibility wrap(final DefaultResponsibility metadata) {
- return new CI_Responsibility(metadata);
- protected CI_Responsibility wrap(final Responsibility value) {
++ protected CI_Responsibility wrap(final DefaultResponsibility value) {
+ return new CI_Responsibility(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java
index cabd87d,0f2a149..0a20155
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AttributeGroup.java
@@@ -50,8 -53,8 +50,8 @@@ public final class MD_AttributeGroup ex
/**
* Constructor for the {@link #wrap} method only.
*/
- private MD_AttributeGroup(final DefaultAttributeGroup metadata) {
- super(metadata);
- private MD_AttributeGroup(final AttributeGroup value) {
++ private MD_AttributeGroup(final DefaultAttributeGroup value) {
+ super(value);
}
/**
@@@ -62,8 -65,8 +62,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected MD_AttributeGroup wrap(final DefaultAttributeGroup metadata) {
- return new MD_AttributeGroup(metadata);
- protected MD_AttributeGroup wrap(final AttributeGroup value) {
++ protected MD_AttributeGroup wrap(final DefaultAttributeGroup value) {
+ return new MD_AttributeGroup(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java
index 5e549b6,6faa790..38cb76c
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java
@@@ -53,8 -54,8 +53,8 @@@ public final class MD_FeatureTypeInfo e
/**
* Constructor for the {@link #wrap} method only.
*/
- private MD_FeatureTypeInfo(final DefaultFeatureTypeInfo metadata) {
- super(metadata);
- private MD_FeatureTypeInfo(final FeatureTypeInfo value) {
++ private MD_FeatureTypeInfo(final DefaultFeatureTypeInfo value) {
+ super(value);
}
/**
@@@ -65,8 -66,8 +65,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected MD_FeatureTypeInfo wrap(final DefaultFeatureTypeInfo metadata) {
- return new MD_FeatureTypeInfo(metadata);
- protected MD_FeatureTypeInfo wrap(final FeatureTypeInfo value) {
++ protected MD_FeatureTypeInfo wrap(final DefaultFeatureTypeInfo value) {
+ return new MD_FeatureTypeInfo(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java
index 07aa3c4,abafc74..2c45152
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java
@@@ -52,8 -53,8 +52,8 @@@ public class MD_KeywordClass extends Pr
/**
* Constructor for the {@link #wrap} method only.
*/
- private MD_KeywordClass(final DefaultKeywordClass metadata) {
- super(metadata);
- private MD_KeywordClass(final KeywordClass value) {
++ private MD_KeywordClass(final DefaultKeywordClass value) {
+ super(value);
}
/**
@@@ -64,8 -65,8 +64,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected MD_KeywordClass wrap(final DefaultKeywordClass metadata) {
- return new MD_KeywordClass(metadata);
- protected MD_KeywordClass wrap(final KeywordClass value) {
++ protected MD_KeywordClass wrap(final DefaultKeywordClass value) {
+ return new MD_KeywordClass(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java
index 2f53adb,5bfaea6..2ac07f8
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataScope.java
@@@ -50,8 -53,8 +50,8 @@@ public final class MD_MetadataScope ext
/**
* Constructor for the {@link #wrap} method only.
*/
- private MD_MetadataScope(final DefaultMetadataScope metadata) {
- super(metadata);
- private MD_MetadataScope(final MetadataScope value) {
++ private MD_MetadataScope(final DefaultMetadataScope value) {
+ super(value);
}
/**
@@@ -62,8 -65,8 +62,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected MD_MetadataScope wrap(final DefaultMetadataScope metadata) {
- return new MD_MetadataScope(metadata);
- protected MD_MetadataScope wrap(final MetadataScope value) {
++ protected MD_MetadataScope wrap(final DefaultMetadataScope value) {
+ return new MD_MetadataScope(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java
index 9b05522,2d240e8..724f296
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java
@@@ -53,8 -54,8 +53,8 @@@ public class MD_Releasability extends P
/**
* Constructor for the {@link #wrap} method only.
*/
- private MD_Releasability(final DefaultReleasability metadata) {
- super(metadata);
- private MD_Releasability(final Releasability value) {
++ private MD_Releasability(final DefaultReleasability value) {
+ super(value);
}
/**
@@@ -65,8 -66,8 +65,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected MD_Releasability wrap(final DefaultReleasability metadata) {
- return new MD_Releasability(metadata);
- protected MD_Releasability wrap(final Releasability value) {
++ protected MD_Releasability wrap(final DefaultReleasability value) {
+ return new MD_Releasability(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java
index a1cdf15,65f78ea..3421484
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java
@@@ -103,7 -103,7 +103,7 @@@ public class MD_Scope extends PropertyT
/** Converts an adapter read from an XML stream. */
@Override public Scope unmarshal(final MD_Scope value) throws URISyntaxException {
- return DefaultScope.castOrCopy( super.unmarshal(value));
- return org.apache.sis.metadata.iso.quality.DefaultScope.castOrCopy(super.unmarshal(value));
++ return DefaultScope.castOrCopy(super.unmarshal(value));
}
}
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
index 9b69733,ddcc040..b876539
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_CoupledResource.java
@@@ -50,8 -53,8 +50,8 @@@ public final class SV_CoupledResource e
/**
* Constructor for the {@link #wrap} method only.
*/
- private SV_CoupledResource(final DefaultCoupledResource metadata) {
- super(metadata);
- private SV_CoupledResource(final CoupledResource value) {
++ private SV_CoupledResource(final DefaultCoupledResource value) {
+ super(value);
}
/**
@@@ -62,8 -65,8 +62,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected SV_CoupledResource wrap(final DefaultCoupledResource metadata) {
- return new SV_CoupledResource(metadata);
- protected SV_CoupledResource wrap(final CoupledResource value) {
++ protected SV_CoupledResource wrap(final DefaultCoupledResource value) {
+ return new SV_CoupledResource(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
index 0e1fc4a,94b6ad2..017382f
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationChainMetadata.java
@@@ -50,8 -53,8 +50,8 @@@ public final class SV_OperationChainMet
/**
* Constructor for the {@link #wrap} method only.
*/
- private SV_OperationChainMetadata(final DefaultOperationChainMetadata metadata) {
- super(metadata);
- private SV_OperationChainMetadata(final OperationChainMetadata value) {
++ private SV_OperationChainMetadata(final DefaultOperationChainMetadata value) {
+ super(value);
}
/**
@@@ -62,8 -65,8 +62,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected SV_OperationChainMetadata wrap(final DefaultOperationChainMetadata metadata) {
- return new SV_OperationChainMetadata(metadata);
- protected SV_OperationChainMetadata wrap(final OperationChainMetadata value) {
++ protected SV_OperationChainMetadata wrap(final DefaultOperationChainMetadata value) {
+ return new SV_OperationChainMetadata(value);
}
/**
diff --cc core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
index 5dcce0c,5a07a58..5420abf
--- a/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
@@@ -50,8 -53,8 +50,8 @@@ public class SV_OperationMetadata exten
/**
* Constructor for the {@link #wrap} method only.
*/
- private SV_OperationMetadata(final DefaultOperationMetadata metadata) {
- super(metadata);
- private SV_OperationMetadata(final OperationMetadata value) {
++ private SV_OperationMetadata(final DefaultOperationMetadata value) {
+ super(value);
}
/**
@@@ -62,8 -65,8 +62,8 @@@
* @return a {@code PropertyType} wrapping the given the metadata element.
*/
@Override
- protected SV_OperationMetadata wrap(final DefaultOperationMetadata metadata) {
- return new SV_OperationMetadata(metadata);
- protected SV_OperationMetadata wrap(final OperationMetadata value) {
++ protected SV_OperationMetadata wrap(final DefaultOperationMetadata value) {
+ return new SV_OperationMetadata(value);
}
/**
diff --cc core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
index 0000000,84a76f0..5bd0cf1
mode 000000,100644..100644
--- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
+++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
@@@ -1,0 -1,141 +1,141 @@@
+ /*
+ * 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.metadata.iso.content;
+
+ import javax.xml.bind.JAXBException;
+ import org.opengis.metadata.content.PolarizationOrientation;
+ import org.apache.sis.util.Version;
+ import org.apache.sis.test.xml.TestCase;
+ import org.junit.Test;
+
+ import static org.apache.sis.test.MetadataAssert.*;
+
+
+ /**
+ * Tests {@link DefaultBand}.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.1
+ * @since 1.1
+ * @module
+ */
+ public final strictfp class DefaultBandTest extends TestCase {
+ /**
+ * The XML fragment used for testing.
+ */
+ private static final String XML =
+ "<mrc:MI_Band xmlns:mrc=\"http://standards.iso.org/iso/19115/-3/mrc/1.0\" xmlns:gco=\"http://standards.iso.org/iso/19115/-3/gco/1.0\">\n"
+ + " <mrc:numberOfValues>\n"
+ + " <gco:Integer>1000</gco:Integer>\n" // Only in 2014 schema.
+ + " </mrc:numberOfValues>\n"
+ + " <mrc:nominalSpatialResolution>\n"
+ + " <gco:Real>10.0</gco:Real>\n"
+ + " </mrc:nominalSpatialResolution>\n"
+ + " <mrc:detectedPolarisation>\n"
+ + " <mrc:MI_PolarisationOrientationCode " // Spell with "s" in 2014 schema.
- + "codeList=\"http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#MI_PolarisationOrientationCode\" codeListValue=\"vertical\">"
++ + "codeList=\"http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#MI_PolarizationOrientationCode\" codeListValue=\"vertical\">"
+ + "Vertical"
+ + "</mrc:MI_PolarisationOrientationCode>\n"
+ + " </mrc:detectedPolarisation>\n"
+ + "</mrc:MI_Band>\n";
+
+ /**
+ * XML fragment using legacy schema. This XML contains an {@link PolarisationOrientation} code list,
+ * which was spell with a "z" in the 2003 version of ISO 19115 standard. This XML is used for testing
+ * that the legacy spelling is handled when (un)marshalling a legacy document.
+ */
+ private static final String XML_LEGACY =
+ "<gmi:MI_Band xmlns:gmi=\"http://standards.iso.org/iso/19115/-2/gmi/1.0\" xmlns:gco=\"http://www.isotc211.org/2005/gco\">\n"
+ + " <gmi:nominalSpatialResolution>\n"
+ + " <gco:Real>10.0</gco:Real>\n"
+ + " </gmi:nominalSpatialResolution>\n"
+ + " <gmi:detectedPolarisation>\n"
+ + " <gmi:MI_PolarizationOrientationCode " // Spell with "z" in 2003 schema.
- + "codeList=\"http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MI_PolarisationOrientationCode\" codeListValue=\"vertical\">" +
++ + "codeList=\"http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MI_PolarizationOrientationCode\" codeListValue=\"vertical\">" +
+ "Vertical"
+ + "</gmi:MI_PolarizationOrientationCode>\n"
+ + " </gmi:detectedPolarisation>\n"
+ + "</gmi:MI_Band>\n";
+
+ /**
+ * Tests marshalling a small metadata containing a {@link PolarisationOrientation}.
+ *
+ * @throws JAXBException if an error occurred during XML marshalling.
+ */
+ @Test
+ public void testMarshalling() throws JAXBException {
+ marshal(VERSION_2014, XML);
+ }
+
+ /**
+ * Tests marshalling a small metadata in legacy XML schema.
+ *
+ * @throws JAXBException if an error occurred during XML marshalling.
+ */
+ @Test
+ public void testMarshallingLegacy() throws JAXBException {
+ marshal(VERSION_2007, XML_LEGACY);
+ }
+
+ /**
+ * Implementation of marshalling tests.
+ *
+ * @param version version of the XML schema to test.
+ * @param expected expected XML fragment.
+ */
+ private void marshal(final Version version, final String expected) throws JAXBException {
+ final DefaultBand band = new DefaultBand();
+ band.setNumberOfValues(1000);
+ band.setNominalSpatialResolution(10d);
+ band.setDetectedPolarization(PolarizationOrientation.VERTICAL);
+ final String actual = marshal(band, version);
+ assertXmlEquals(expected, actual, "xmlns:*");
+ }
+
+ /**
+ * Tests unmarshalling a small metadata containing a {@link PolarisationOrientation}.
+ *
+ * @throws JAXBException if an error occurred during XML unmarshalling.
+ */
+ @Test
+ public void testUnmarshalling() throws JAXBException {
+ unmarshal(XML, 1000);
+ }
+
+ /**
+ * Tests unmarshalling a small metadata in legacy XML schema.
+ *
+ * @throws JAXBException if an error occurred during XML unmarshalling.
+ */
+ @Test
+ public void testUnmarshallingLegacy() throws JAXBException {
+ unmarshal(XML_LEGACY, null);
+ }
+
+ /**
+ * Implementation of unmarshalling tests.
+ *
+ * @param xml XML fragment to test.
+ * @param numberOfValues expected values of {@code numberOfValues} property.
+ */
+ private void unmarshal(final String xml, final Integer numberOfValues) throws JAXBException {
+ final DefaultBand band = unmarshal(DefaultBand.class, xml);
+ assertEquals(Double.valueOf(10), band.getNominalSpatialResolution());
+ assertEquals(PolarizationOrientation.VERTICAL, band.getDetectedPolarization());
+ assertEquals(numberOfValues, band.getNumberOfValues());
+ }
+ }
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 8b030ff,4048b15..c9bfff4
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=0142681e
-nbproject/build-impl.xml.script.CRC32=7ab9bfcf
+nbproject/build-impl.xml.data.CRC32=bff50692
- nbproject/build-impl.xml.script.CRC32=ef3dbbf1
- nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.99.0.48
++nbproject/build-impl.xml.script.CRC32=933f5834
+ nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.100.0.48
diff --cc pom.xml
index bebfae0,406c872..d8f2cd6
--- a/pom.xml
+++ b/pom.xml
@@@ -877,8 -871,7 +871,7 @@@
<links>
<link>https://docs.oracle.com/javase/8/docs/api</link>
<link>http://unitsofmeasurement.github.io/unit-api/site/apidocs</link>
- <link>http://www.geoapi.org/snapshot/javadoc</link>
+ <link>http://www.geoapi.org/3.0/javadoc</link>
- <link>https://docs.unidata.ucar.edu/netcdf-java/current/javadoc</link>
</links>
<additionalOptions>
diff --cc storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TiledGridResource.java
index 85987e4,bb67d36..4f9a4d6
--- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TiledGridResource.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TiledGridResource.java
@@@ -33,9 -34,9 +33,10 @@@ import org.apache.sis.coverage.grid.Gri
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridRoundingMode;
+import org.apache.sis.coverage.CannotEvaluateException;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
+ import org.apache.sis.storage.RasterLoadingStrategy;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.util.ArraysExt;
diff --cc storage/sis-storage/src/main/java/org/apache/sis/storage/RasterLoadingStrategy.java
index 59edba1,3c1a16e..92045e5
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/RasterLoadingStrategy.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/RasterLoadingStrategy.java
@@@ -22,9 -22,7 +22,7 @@@ import java.awt.image.ImagingOpExceptio
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridCoverage;
- import org.apache.sis.storage.GridCoverageResource;
- import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.coverage.CannotEvaluateException;
/**