[sis] branch geoapi-4.0 updated (ec0eaa68d9 -> 62842c07be)

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git


    from ec0eaa68d9 Bug fixes related to unmarshalling of GML documents. Those bugs were identified by OGC TestBed 18 D025 scenario. This is a port of 3 commits on `master` branch.
     new 3fcbaf7d69 Javadoc adjustments: - Replace some <cite> HTML tags by more appropriate <em> or <dfn> tags. - Fix erroneous versions of ISO 19115 standard.
     new 62842c07be Add missing @Dependencies annotations on metadata elements that became depreceted in ISO 19157.

The 2 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:
 .../java/org/apache/sis/feature/DenseFeature.java  |  8 ++---
 .../java/org/apache/sis/feature/SparseFeature.java |  8 ++---
 .../apache/sis/internal/jaxb/code/CI_RoleCode.java |  4 +--
 .../internal/jaxb/code/CI_TelephoneTypeCode.java   |  4 +--
 .../internal/jaxb/code/DS_AssociationTypeCode.java |  4 +--
 .../internal/jaxb/code/DS_InitiativeTypeCode.java  |  4 +--
 .../sis/internal/jaxb/gts/TM_PeriodDuration.java   |  4 +--
 .../sis/internal/jaxb/metadata/CI_Citation.java    |  4 +--
 .../internal/jaxb/metadata/CI_OnlineResource.java  |  4 +--
 .../sis/internal/jaxb/metadata/MD_Identifier.java  |  4 +--
 .../internal/jaxb/metadata/MD_KeywordClass.java    |  4 +--
 .../sis/internal/jaxb/metadata/MD_Medium.java      |  4 +--
 .../internal/jaxb/metadata/MD_Releasability.java   |  4 +--
 .../sis/internal/jaxb/metadata/MD_Resolution.java  |  4 +--
 .../sis/internal/jaxb/metadata/MD_Scope.java       |  4 +--
 .../internal/jaxb/metadata/RS_ReferenceSystem.java |  4 +--
 .../jaxb/metadata/SV_OperationMetadata.java        |  4 +--
 .../org/apache/sis/metadata/MetadataStandard.java  |  2 +-
 .../org/apache/sis/metadata/PropertyAccessor.java  |  6 ++--
 .../iso/DefaultApplicationSchemaInformation.java   |  4 +--
 .../iso/DefaultExtendedElementInformation.java     |  4 +--
 .../apache/sis/metadata/iso/DefaultIdentifier.java |  4 +--
 .../apache/sis/metadata/iso/DefaultMetadata.java   |  4 +--
 .../iso/DefaultMetadataExtensionInformation.java   |  4 +--
 .../sis/metadata/iso/DefaultMetadataScope.java     |  4 +--
 .../iso/DefaultPortrayalCatalogueReference.java    |  4 +--
 .../acquisition/DefaultAcquisitionInformation.java |  4 +--
 .../acquisition/DefaultEnvironmentalRecord.java    |  4 +--
 .../sis/metadata/iso/acquisition/DefaultEvent.java |  4 +--
 .../iso/acquisition/DefaultInstrument.java         |  4 +--
 .../metadata/iso/acquisition/DefaultObjective.java |  4 +--
 .../metadata/iso/acquisition/DefaultOperation.java |  4 +--
 .../sis/metadata/iso/acquisition/DefaultPlan.java  |  4 +--
 .../metadata/iso/acquisition/DefaultPlatform.java  |  4 +--
 .../iso/acquisition/DefaultPlatformPass.java       |  4 +--
 .../iso/acquisition/DefaultRequestedDate.java      |  4 +--
 .../iso/acquisition/DefaultRequirement.java        |  4 +--
 .../sis/metadata/iso/citation/AbstractParty.java   |  4 +--
 .../sis/metadata/iso/citation/DefaultAddress.java  |  4 +--
 .../sis/metadata/iso/citation/DefaultCitation.java |  4 +--
 .../metadata/iso/citation/DefaultCitationDate.java |  4 +--
 .../sis/metadata/iso/citation/DefaultContact.java  |  4 +--
 .../metadata/iso/citation/DefaultIndividual.java   |  4 +--
 .../iso/citation/DefaultOnlineResource.java        |  4 +--
 .../metadata/iso/citation/DefaultOrganisation.java |  4 +--
 .../iso/citation/DefaultResponsibility.java        |  4 +--
 .../iso/citation/DefaultResponsibleParty.java      |  4 +--
 .../sis/metadata/iso/citation/DefaultSeries.java   |  4 +--
 .../metadata/iso/citation/DefaultTelephone.java    |  4 +--
 .../iso/constraint/DefaultConstraints.java         |  4 +--
 .../iso/constraint/DefaultLegalConstraints.java    |  4 +--
 .../iso/constraint/DefaultReleasability.java       |  4 +--
 .../iso/constraint/DefaultSecurityConstraints.java |  4 +--
 .../iso/content/AbstractContentInformation.java    |  4 +--
 .../iso/content/DefaultAttributeGroup.java         |  4 +--
 .../sis/metadata/iso/content/DefaultBand.java      |  4 +--
 .../iso/content/DefaultCoverageDescription.java    |  4 +--
 .../DefaultFeatureCatalogueDescription.java        |  4 +--
 .../iso/content/DefaultFeatureTypeInfo.java        |  4 +--
 .../iso/content/DefaultImageDescription.java       |  4 +--
 .../iso/content/DefaultRangeDimension.java         |  4 +--
 .../content/DefaultRangeElementDescription.java    |  4 +--
 .../iso/content/DefaultSampleDimension.java        |  4 +--
 .../metadata/iso/distribution/DefaultDataFile.java |  4 +--
 .../DefaultDigitalTransferOptions.java             |  4 +--
 .../iso/distribution/DefaultDistribution.java      |  4 +--
 .../iso/distribution/DefaultDistributor.java       |  4 +--
 .../metadata/iso/distribution/DefaultFormat.java   |  4 +--
 .../metadata/iso/distribution/DefaultMedium.java   |  4 +--
 .../distribution/DefaultStandardOrderProcess.java  |  4 +--
 .../iso/extent/AbstractGeographicExtent.java       |  4 +--
 .../iso/extent/DefaultBoundingPolygon.java         |  4 +--
 .../sis/metadata/iso/extent/DefaultExtent.java     |  4 +--
 .../iso/extent/DefaultGeographicBoundingBox.java   |  4 +--
 .../iso/extent/DefaultGeographicDescription.java   |  4 +--
 .../iso/extent/DefaultSpatialTemporalExtent.java   |  4 +--
 .../metadata/iso/extent/DefaultTemporalExtent.java |  4 +--
 .../metadata/iso/extent/DefaultVerticalExtent.java |  4 +--
 .../iso/identification/AbstractIdentification.java |  4 +--
 .../DefaultAggregateInformation.java               |  4 +--
 .../identification/DefaultAssociatedResource.java  |  4 +--
 .../iso/identification/DefaultBrowseGraphic.java   |  4 +--
 .../iso/identification/DefaultCoupledResource.java |  4 +--
 .../identification/DefaultDataIdentification.java  |  4 +--
 .../iso/identification/DefaultKeywordClass.java    |  4 +--
 .../iso/identification/DefaultKeywords.java        |  4 +--
 .../DefaultOperationChainMetadata.java             |  4 +--
 .../identification/DefaultOperationMetadata.java   |  4 +--
 .../DefaultRepresentativeFraction.java             |  2 +-
 .../iso/identification/DefaultResolution.java      |  4 +--
 .../DefaultServiceIdentification.java              |  4 +--
 .../metadata/iso/identification/DefaultUsage.java  |  4 +--
 .../sis/metadata/iso/lineage/DefaultAlgorithm.java |  4 +--
 .../sis/metadata/iso/lineage/DefaultLineage.java   |  4 +--
 .../iso/lineage/DefaultNominalResolution.java      |  4 +--
 .../metadata/iso/lineage/DefaultProcessStep.java   |  4 +--
 .../iso/lineage/DefaultProcessStepReport.java      |  4 +--
 .../metadata/iso/lineage/DefaultProcessing.java    |  4 +--
 .../sis/metadata/iso/lineage/DefaultSource.java    |  4 +--
 .../maintenance/DefaultMaintenanceInformation.java |  4 +--
 .../sis/metadata/iso/maintenance/DefaultScope.java |  4 +--
 .../iso/maintenance/DefaultScopeDescription.java   |  4 +--
 .../metadata/iso/quality/AbstractCompleteness.java |  4 +--
 .../iso/quality/AbstractDataEvaluation.java        |  4 +--
 .../sis/metadata/iso/quality/AbstractElement.java  | 42 ++++++++++++++--------
 .../iso/quality/AbstractLogicalConsistency.java    |  4 +--
 .../metadata/iso/quality/AbstractMetaquality.java  |  4 +--
 .../iso/quality/AbstractPositionalAccuracy.java    |  4 +--
 .../sis/metadata/iso/quality/AbstractResult.java   |  4 +--
 .../iso/quality/AbstractTemporalAccuracy.java      |  6 ++--
 .../iso/quality/AbstractTemporalQuality.java       |  4 +--
 .../iso/quality/AbstractThematicAccuracy.java      |  4 +--
 .../DefaultAbsoluteExternalPositionalAccuracy.java |  4 +--
 .../quality/DefaultAccuracyOfATimeMeasurement.java |  4 +--
 .../iso/quality/DefaultAggregationDerivation.java  |  4 +--
 .../metadata/iso/quality/DefaultBasicMeasure.java  |  4 +--
 .../iso/quality/DefaultCompletenessCommission.java |  4 +--
 .../iso/quality/DefaultCompletenessOmission.java   |  4 +--
 .../iso/quality/DefaultConceptualConsistency.java  |  4 +--
 .../metadata/iso/quality/DefaultConfidence.java    |  4 +--
 .../iso/quality/DefaultConformanceResult.java      |  4 +--
 .../iso/quality/DefaultCoverageResult.java         |  7 ++--
 .../metadata/iso/quality/DefaultDataQuality.java   |  4 +--
 .../metadata/iso/quality/DefaultDescription.java   |  4 +--
 .../iso/quality/DefaultDescriptiveResult.java      |  4 +--
 .../iso/quality/DefaultDomainConsistency.java      |  4 +--
 .../iso/quality/DefaultEvaluationMethod.java       |  4 +--
 .../iso/quality/DefaultFormatConsistency.java      |  4 +--
 .../iso/quality/DefaultFullInspection.java         |  4 +--
 .../DefaultGriddedDataPositionalAccuracy.java      |  4 +--
 .../metadata/iso/quality/DefaultHomogeneity.java   |  4 +--
 .../iso/quality/DefaultIndirectEvaluation.java     |  4 +--
 .../sis/metadata/iso/quality/DefaultMeasure.java   |  4 +--
 .../iso/quality/DefaultMeasureReference.java       |  4 +--
 .../DefaultNonQuantitativeAttributeAccuracy.java   |  4 +--
 ...DefaultNonQuantitativeAttributeCorrectness.java |  4 +--
 .../DefaultQuantitativeAttributeAccuracy.java      |  4 +--
 .../iso/quality/DefaultQuantitativeResult.java     |  4 +--
 .../DefaultRelativeInternalPositionalAccuracy.java |  4 +--
 .../iso/quality/DefaultRepresentativity.java       |  4 +--
 .../iso/quality/DefaultSampleBasedInspection.java  |  4 +--
 .../sis/metadata/iso/quality/DefaultScope.java     |  4 +--
 .../iso/quality/DefaultSourceReference.java        |  4 +--
 .../DefaultStandaloneQualityReportInformation.java |  4 +--
 .../iso/quality/DefaultTemporalConsistency.java    |  4 +--
 .../iso/quality/DefaultTemporalValidity.java       |  4 +--
 .../DefaultThematicClassificationCorrectness.java  |  4 +--
 .../iso/quality/DefaultTopologicalConsistency.java |  4 +--
 .../sis/metadata/iso/quality/DefaultUsability.java |  4 +--
 .../iso/quality/DefaultUsabilityElement.java       |  4 +--
 .../spatial/AbstractGeolocationInformation.java    |  4 +--
 .../iso/spatial/AbstractSpatialRepresentation.java |  4 +--
 .../sis/metadata/iso/spatial/DefaultDimension.java |  4 +--
 .../sis/metadata/iso/spatial/DefaultGCP.java       |  4 +--
 .../metadata/iso/spatial/DefaultGCPCollection.java |  4 +--
 .../iso/spatial/DefaultGeometricObjects.java       |  4 +--
 .../metadata/iso/spatial/DefaultGeorectified.java  |  4 +--
 .../iso/spatial/DefaultGeoreferenceable.java       |  4 +--
 .../spatial/DefaultGridSpatialRepresentation.java  |  4 +--
 .../DefaultVectorSpatialRepresentation.java        |  4 +--
 .../sis/referencing/AbstractIdentifiedObject.java  |  2 +-
 .../sis/referencing/ImmutableIdentifier.java       |  2 +-
 .../apache/sis/referencing/NamedIdentifier.java    |  4 +--
 .../apache/sis/referencing/crs/AbstractCRS.java    |  2 +-
 .../org/apache/sis/referencing/cs/AbstractCS.java  |  2 +-
 .../sis/referencing/datum/AbstractDatum.java       |  6 ++--
 .../operation/AbstractCoordinateOperation.java     |  2 +-
 .../operation/DefaultConcatenatedOperation.java    |  4 +--
 .../referencing/operation/DefaultConversion.java   |  2 +-
 .../operation/DefaultPassThroughOperation.java     |  4 +--
 .../operation/DefaultTransformation.java           |  4 +--
 171 files changed, 369 insertions(+), 354 deletions(-)

[sis] 02/02: Add missing @Dependencies annotations on metadata elements that became depreceted in ISO 19157.

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 62842c07be5171e00a133618a22ee9087b9996cd
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sun Nov 20 17:03:25 2022 +0100

    Add missing @Dependencies annotations on metadata elements that became depreceted in ISO 19157.
---
 .../sis/metadata/iso/quality/AbstractElement.java  | 38 +++++++++++++++-------
 .../iso/quality/AbstractTemporalAccuracy.java      |  2 +-
 .../iso/quality/DefaultCoverageResult.java         |  3 +-
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
index c0577b6331..6f67d60fd5 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
@@ -286,7 +286,7 @@ public class AbstractElement extends ISOMetadata implements Element {
      * @see #getEvaluationMethodProperty(Function)
      */
     private <V> V getMeasureReferenceProperty(final Function<MeasureReference,V> getter) {
-        final MeasureReference m = measureReference;
+        final MeasureReference m = getMeasureReference();
         return (m != null) && FilterByVersion.LEGACY_METADATA.accept() ? getter.apply(m) : null;
     }
 
@@ -314,18 +314,23 @@ public class AbstractElement extends ISOMetadata implements Element {
      */
     @Override
     @Deprecated
+    @Dependencies("getMeasureReference")
     @XmlElement(name = "nameOfMeasure", namespace = LegacyNamespaces.GMD)
     public Collection<InternationalString> getNamesOfMeasure() {
         if (!FilterByVersion.LEGACY_METADATA.accept()) {
             return null;
         }
-        if (measureReference == null) {
-            measureReference = new DefaultMeasureReference();
+        MeasureReference m = getMeasureReference();
+        if (m == null) {
+            if (state() == State.FINAL) {
+                return Collections.emptyList();
+            }
+            setMeasureReference(m = new DefaultMeasureReference());
         }
-        if (measureReference instanceof DefaultMeasureReference) {
-            return ((DefaultMeasureReference) measureReference).getNamesOfMeasure();
+        if (m instanceof DefaultMeasureReference) {
+            return ((DefaultMeasureReference) m).getNamesOfMeasure();
         }
-        return Collections.unmodifiableCollection(measureReference.getNamesOfMeasure());
+        return Collections.unmodifiableCollection(m.getNamesOfMeasure());
     }
 
     /**
@@ -351,6 +356,7 @@ public class AbstractElement extends ISOMetadata implements Element {
      */
     @Override
     @Deprecated
+    @Dependencies("getMeasureReference")
     @XmlElement(name = "measureIdentification", namespace = LegacyNamespaces.GMD)
     public Identifier getMeasureIdentification() {
         return getMeasureReferenceProperty(MeasureReference::getMeasureIdentification);
@@ -377,6 +383,7 @@ public class AbstractElement extends ISOMetadata implements Element {
      */
     @Override
     @Deprecated
+    @Dependencies("getMeasureReference")
     @XmlElement(name = "measureDescription", namespace = LegacyNamespaces.GMD)
     public InternationalString getMeasureDescription() {
         return getMeasureReferenceProperty(MeasureReference::getMeasureDescription);
@@ -426,7 +433,7 @@ public class AbstractElement extends ISOMetadata implements Element {
      * @see #getMeasureReferenceProperty(Function)
      */
     private <V> V getEvaluationMethodProperty(final Function<EvaluationMethod,V> getter) {
-        final EvaluationMethod m = evaluationMethod;
+        final EvaluationMethod m = getEvaluationMethod();
         return (m != null) && FilterByVersion.LEGACY_METADATA.accept() ? getter.apply(m) : null;
     }
 
@@ -454,6 +461,7 @@ public class AbstractElement extends ISOMetadata implements Element {
      */
     @Override
     @Deprecated
+    @Dependencies("getEvaluationMethod")
     @XmlElement(name = "evaluationMethodType", namespace = LegacyNamespaces.GMD)
     public EvaluationMethodType getEvaluationMethodType() {
         return getEvaluationMethodProperty(EvaluationMethod::getEvaluationMethodType);
@@ -480,6 +488,7 @@ public class AbstractElement extends ISOMetadata implements Element {
      */
     @Override
     @Deprecated
+    @Dependencies("getEvaluationMethod")
     @XmlElement(name = "evaluationMethodDescription", namespace = LegacyNamespaces.GMD)
     public InternationalString getEvaluationMethodDescription() {
         return getEvaluationMethodProperty(EvaluationMethod::getEvaluationMethodDescription);
@@ -506,6 +515,7 @@ public class AbstractElement extends ISOMetadata implements Element {
      */
     @Override
     @Deprecated
+    @Dependencies("getEvaluationMethod")
     @XmlElement(name = "evaluationProcedure", namespace = LegacyNamespaces.GMD)
     public Citation getEvaluationProcedure() {
         return getEvaluationMethodProperty(EvaluationMethod::getEvaluationProcedure);
@@ -540,13 +550,17 @@ public class AbstractElement extends ISOMetadata implements Element {
         if (!FilterByVersion.LEGACY_METADATA.accept()) {
             return null;
         }
-        if (evaluationMethod == null) {
-            evaluationMethod = new DefaultEvaluationMethod();
+        EvaluationMethod m = getEvaluationMethod();
+        if (m == null) {
+            if (state() == State.FINAL) {
+                return Collections.emptyList();
+            }
+            setEvaluationMethod(m = new DefaultEvaluationMethod());
         }
-        if (evaluationMethod instanceof DefaultEvaluationMethod) {
-            return ((DefaultEvaluationMethod) evaluationMethod).getDates();
+        if (m instanceof DefaultEvaluationMethod) {
+            return ((DefaultEvaluationMethod) m).getDates();
         }
-        return Collections.unmodifiableCollection(evaluationMethod.getDates());
+        return Collections.unmodifiableCollection(m.getDates());
     }
 
     /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
index d13899bd90..47812b4d50 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
@@ -18,11 +18,11 @@ package org.apache.sis.metadata.iso.quality;
 
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlRootElement;
-import org.apache.sis.xml.Namespaces;
 import org.opengis.metadata.quality.TemporalAccuracy;
 import org.opengis.metadata.quality.TemporalValidity;
 import org.opengis.metadata.quality.TemporalConsistency;
 import org.opengis.metadata.quality.AccuracyOfATimeMeasurement;
+import org.apache.sis.xml.Namespaces;
 
 
 /**
diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
index 73cc3882ec..4be6b40559 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
@@ -27,6 +27,7 @@ import org.opengis.metadata.distribution.Format;
 import org.opengis.metadata.distribution.DataFile;
 import org.opengis.metadata.spatial.SpatialRepresentation;
 import org.opengis.metadata.spatial.SpatialRepresentationType;
+import org.apache.sis.internal.jaxb.FilterByVersion;
 import org.apache.sis.internal.xml.LegacyNamespaces;
 
 
@@ -244,7 +245,7 @@ public class DefaultCoverageResult extends AbstractResult implements CoverageRes
     @Deprecated
     @XmlElement(name = "resultContentDescription", namespace = LegacyNamespaces.GMI)
     public CoverageDescription getResultContentDescription() {
-        return resultContentDescription;
+        return FilterByVersion.LEGACY_METADATA.accept() ? resultContentDescription : null;
     }
 
     /**

[sis] 01/02: Javadoc adjustments: - Replace some HTML tags by more appropriate or tags. - Fix erroneous versions of ISO 19115 standard.