(sis) 02/02: `ProcessStep.dateTime` replaced by `stepDateTime` in GeoAPI interface. https://github.com/opengeospatial/geoapi/issues/22

[desruisseaux]

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 e0fe9c0bacf013cb0a4b252fa03de5234af43efc
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri May 10 14:29:28 2024 +0200

    `ProcessStep.dateTime` replaced by `stepDateTime` in GeoAPI interface.
    https://github.com/opengeospatial/geoapi/issues/22
---
 .../apache/sis/metadata/iso/lineage/DefaultProcessStep.java    | 10 +++++++++-
 .../org/apache/sis/xml/test/AnnotationConsistencyCheck.java    |  6 ------
 geoapi/snapshot                                                |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
index 861ad6a85d..4442c0643c 100644
--- 
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
+++ 
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
@@ -271,6 +271,7 @@ public class DefaultProcessStep extends ISOMetadata 
implements ProcessStep {
      *
      * @since 1.0
      */
+    @Override
     @XmlElement(name = "stepDateTime")
     @XmlJavaTypeAdapter(TM_Primitive.Since2014.class)
     public TemporalPrimitive getStepDateTime() {
@@ -300,7 +301,14 @@ public class DefaultProcessStep extends ISOMetadata 
implements ProcessStep {
     @Deprecated(since="1.0")
     @XmlElement(name = "dateTime", namespace = LegacyNamespaces.GMD)
     public Date getDate() {
-        return FilterByVersion.LEGACY_METADATA.accept() ? 
TemporalUtilities.getAnyDate(getStepDateTime()) : null;
+        if (FilterByVersion.LEGACY_METADATA.accept()) {
+            Date date = TemporalUtilities.getAnyDate(getStepDateTime());
+            if (date == null) {
+                date = ProcessStep.super.getDate();
+            }
+            return date;
+        }
+        return null;
     }
 
     /**
diff --git 
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
 
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
index c9f6cc706c..838440acd1 100644
--- 
a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
+++ 
b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/test/AnnotationConsistencyCheck.java
@@ -406,12 +406,6 @@ public abstract class AnnotationConsistencyCheck extends 
TestCaseWithLogs {
     protected String getExpectedXmlElementName(final Class<?> enclosing, final 
UML uml) {
         String name = firstIdentifier(uml);
         switch (name) {
-            case "stepDateTime": {
-                if 
(org.opengis.metadata.lineage.ProcessStep.class.isAssignableFrom(enclosing)) {
-                    name = "dateTime";
-                }
-                break;
-            }
             case "satisfiedPlan": {
                 if 
(org.opengis.metadata.acquisition.Requirement.class.isAssignableFrom(enclosing))
 {
                     name = "satisifiedPlan";                // Misspelling in 
ISO 19115-3:2016
diff --git a/geoapi/snapshot b/geoapi/snapshot
index 76470c0640..1685784018 160000
--- a/geoapi/snapshot
+++ b/geoapi/snapshot
@@ -1 +1 @@
-Subproject commit 76470c06402aba756ce77dd98a0d36e4e2abcb14
+Subproject commit 1685784018d4e32484a2eedb6e63a41751335101