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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new 021b5413be Automatic imports reorganization for taking in account the differences between the branches. 021b5413be is described below commit 021b5413bec2da3ff7e958f86903fe5d8c19033e Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Thu May 9 15:33:07 2024 +0200 Automatic imports reorganization for taking in account the differences between the branches. --- .../test/org/apache/sis/filter/PeriodLiteral.java | 4 ++-- .../apache/sis/metadata/iso/extent/DefaultTemporalExtent.java | 2 +- .../metadata/iso/identification/AbstractIdentification.java | 2 +- .../iso/maintenance/DefaultMaintenanceInformation.java | 2 +- .../org/apache/sis/metadata/iso/maintenance/package-info.java | 2 ++ .../main/org/apache/sis/pending/temporal/DefaultPeriod.java | 2 +- .../main/org/apache/sis/pending/temporal/Primitive.java | 2 +- .../org/apache/sis/pending/temporal/TemporalUtilities.java | 2 +- .../main/org/apache/sis/xml/bind/gml/TM_Primitive.java | 2 +- .../main/org/apache/sis/xml/bind/gml/TimeInstant.java | 4 +--- .../main/org/apache/sis/xml/bind/gml/TimePeriodBound.java | 4 +--- .../main/org/apache/sis/xml/bind/gts/TM_Duration.java | 10 ++++------ .../test/org/apache/sis/metadata/PropertyAccessorTest.java | 2 +- .../test/org/apache/sis/xml/bind/gml/TimePeriodTest.java | 4 +--- .../main/org/apache/sis/storage/base/MetadataBuilder.java | 2 +- 15 files changed, 20 insertions(+), 26 deletions(-) diff --git a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java index e9738893d7..27c99b5e9a 100644 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/PeriodLiteral.java @@ -17,12 +17,14 @@ package org.apache.sis.filter; import java.util.Date; +import java.time.Instant; import java.io.Serializable; // Test dependencies import org.apache.sis.test.TestUtilities; // Specific to the geoapi-3.1 and geoapi-4.0 branches: +import java.time.temporal.TemporalAmount; import org.opengis.feature.Feature; import org.opengis.filter.Expression; import org.opengis.filter.Literal; @@ -32,8 +34,6 @@ import org.opengis.temporal.TemporalPrimitive; import org.opengis.temporal.TemporalGeometricPrimitive; // Specific to the geoapi-4.0 branch: -import java.time.Instant; -import java.time.temporal.TemporalAmount; import org.opengis.metadata.Identifier; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java index cff6577ffc..64f6bea224 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java @@ -17,6 +17,7 @@ package org.apache.sis.metadata.iso.extent; import java.util.Date; +import java.time.Instant; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlElement; @@ -33,7 +34,6 @@ import org.apache.sis.xml.NilObject; import org.apache.sis.xml.NilReason; // Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.Instant; import org.opengis.temporal.Period; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java index e3132e1663..f6d67b7bc1 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/identification/AbstractIdentification.java @@ -17,6 +17,7 @@ package org.apache.sis.metadata.iso.identification; import java.util.Collection; +import java.time.temporal.TemporalAmount; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlElement; @@ -49,7 +50,6 @@ import org.apache.sis.xml.privy.LegacyNamespaces; import org.apache.sis.util.iso.Types; // Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.temporal.TemporalAmount; import org.opengis.metadata.identification.AssociatedResource; // Specific to the geoapi-4.0 branch: diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java index 9a6ca19e82..49b810f795 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java @@ -20,7 +20,6 @@ import java.util.Date; import java.util.Iterator; import java.util.Collection; import java.util.Collections; -import java.time.temporal.TemporalAmount; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlRootElement; @@ -44,6 +43,7 @@ import static org.apache.sis.metadata.privy.ImplementationHelper.valueIfDefined; import org.opengis.metadata.maintenance.Scope; // Specific to the geoapi-4.0 branch: +import java.time.temporal.TemporalAmount; import org.opengis.metadata.citation.Responsibility; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/package-info.java index e72b18db41..e74ef43ba6 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/package-info.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/maintenance/package-info.java @@ -104,4 +104,6 @@ import org.apache.sis.xml.privy.LegacyNamespaces; import org.apache.sis.xml.bind.gco.*; import org.apache.sis.xml.bind.metadata.*; import org.apache.sis.xml.bind.metadata.code.*; + +// Specific to the geoapi-4.0 branch: import org.apache.sis.xml.bind.gts.TM_Duration; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriod.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriod.java index 12a7573630..6dfcc8f17b 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriod.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriod.java @@ -17,9 +17,9 @@ package org.apache.sis.pending.temporal; import java.util.Objects; +import java.time.Instant; // Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.Instant; import java.time.Duration; import java.time.temporal.TemporalAmount; import org.opengis.temporal.Period; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/Primitive.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/Primitive.java index d8c284e1dd..0a8220d48c 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/Primitive.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/Primitive.java @@ -16,12 +16,12 @@ */ package org.apache.sis.pending.temporal; +import java.time.temporal.TemporalAmount; import org.opengis.temporal.RelativePosition; import org.opengis.temporal.TemporalGeometricPrimitive; import org.opengis.temporal.TemporalPrimitive; // Specific to the geoapi-4.0 branch: -import java.time.temporal.TemporalAmount; import org.opengis.metadata.Identifier; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/TemporalUtilities.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/TemporalUtilities.java index 8c7b1dac7c..3b10e63c48 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/TemporalUtilities.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/TemporalUtilities.java @@ -17,10 +17,10 @@ package org.apache.sis.pending.temporal; import java.util.Date; +import java.time.Instant; import org.opengis.temporal.TemporalPrimitive; // Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.Instant; import org.opengis.temporal.Period; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TM_Primitive.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TM_Primitive.java index c7a23ec8e8..a6bc941ef0 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TM_Primitive.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TM_Primitive.java @@ -17,6 +17,7 @@ package org.apache.sis.xml.bind.gml; import java.util.Date; +import java.time.Instant; import jakarta.xml.bind.annotation.XmlElement; import org.opengis.temporal.TemporalPrimitive; import org.apache.sis.xml.privy.XmlUtilities; @@ -26,7 +27,6 @@ import org.apache.sis.pending.temporal.TemporalUtilities; import org.apache.sis.util.resources.Errors; // Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.Instant; import org.opengis.temporal.Period; diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java index 3f3cbebe49..6f98717bb4 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimeInstant.java @@ -17,6 +17,7 @@ package org.apache.sis.xml.bind.gml; import java.util.Date; +import java.time.Instant; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.datatype.DatatypeConfigurationException; import jakarta.xml.bind.annotation.XmlType; @@ -26,9 +27,6 @@ import org.apache.sis.xml.bind.Context; import org.apache.sis.util.privy.Strings; import org.apache.sis.xml.privy.XmlUtilities; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.Instant; - /** * Encapsulates a {@code gml:TimeInstant}. This element may be used alone, or included in a diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java index 01fe46259c..288abe64ea 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gml/TimePeriodBound.java @@ -16,15 +16,13 @@ */ package org.apache.sis.xml.bind.gml; +import java.time.Instant; import javax.xml.datatype.XMLGregorianCalendar; import jakarta.xml.bind.annotation.XmlValue; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlTransient; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.Instant; - /** * The {@linkplain TimePeriod#begin begin} or {@linkplain TimePeriod#end end} position in diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/TM_Duration.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/TM_Duration.java index 945dca99d8..6f94b03432 100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/TM_Duration.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/gts/TM_Duration.java @@ -18,6 +18,10 @@ package org.apache.sis.xml.bind.gts; import java.math.BigDecimal; import java.math.BigInteger; +import java.time.Period; +import java.time.temporal.ChronoUnit; +import java.time.temporal.TemporalAmount; +import java.time.temporal.TemporalUnit; import javax.xml.datatype.Duration; import javax.xml.datatype.DatatypeConfigurationException; import jakarta.xml.bind.annotation.XmlElement; @@ -26,12 +30,6 @@ import org.apache.sis.xml.privy.XmlUtilities; import org.apache.sis.xml.bind.gco.PropertyType; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.Period; -import java.time.temporal.ChronoUnit; -import java.time.temporal.TemporalAmount; -import java.time.temporal.TemporalUnit; - /** * Wraps a {@code gts:TM_Duration} element. diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java index f093384518..1d0cf3aa69 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Locale; import java.util.Date; +import java.time.temporal.TemporalAmount; import org.opengis.metadata.Identifier; import org.opengis.metadata.extent.Extent; import org.opengis.metadata.citation.Series; @@ -68,7 +69,6 @@ import org.opengis.referencing.ObjectDomain; import org.opengis.referencing.datum.DatumEnsemble; // Specific to the geoapi-4.0 branch: -import java.time.temporal.TemporalAmount; import org.opengis.metadata.citation.Responsibility; diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java index 3036090230..4699f274c3 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/xml/bind/gml/TimePeriodTest.java @@ -18,6 +18,7 @@ package org.apache.sis.xml.bind.gml; import java.util.HashMap; import java.util.Locale; +import java.time.Instant; import javax.xml.datatype.DatatypeConfigurationException; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; @@ -37,9 +38,6 @@ import static org.apache.sis.metadata.Assertions.assertXmlEquals; import static org.apache.sis.test.TestUtilities.date; import static org.apache.sis.test.TestUtilities.format; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.time.Instant; - /** * Tests the {@link TimePeriod} class. The XML fragments used in this test cases are derived from diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java index 33dba9aa1b..4de046597f 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataBuilder.java @@ -38,8 +38,8 @@ import java.util.logging.Level; import java.net.URI; import java.nio.charset.Charset; import javax.measure.Unit; -import javax.measure.quantity.Length; import javax.measure.IncommensurableException; +import javax.measure.quantity.Length; import org.opengis.util.MemberName; import org.opengis.util.GenericName; import org.opengis.util.InternationalString;