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 bd6a16c7b865a6dbeb8bbb84a2f4e3a742c2cf5c Merge: 5d62feec97 e2028b13c9 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Oct 11 17:06:27 2025 +0200 Merge of automatic reorganization of imports order. .../apache/sis/coverage/grid/DimensionalityReductionTest.java | 2 -- .../sis/metadata/iso/acquisition/DefaultRequestedDate.java | 4 +++- .../sis/metadata/iso/acquisition/DefaultRequirement.java | 4 ++-- .../org/apache/sis/metadata/iso/citation/DefaultCitation.java | 4 ++-- .../test/org/apache/sis/metadata/iso/DefaultMetadataTest.java | 2 +- .../test/org/apache/sis/metadata/sql/MetadataSourceTest.java | 2 +- .../test/org/apache/sis/metadata/sql/MetadataWriterTest.java | 2 +- .../test/org/apache/sis/xml/test/TestCase.java | 2 +- .../org/apache/sis/referencing/crs/DefaultEngineeringCRS.java | 2 +- .../apache/sis/referencing/factory/GeodeticObjectFactory.java | 2 +- .../apache/sis/referencing/legacy/DefaultUserDefinedCS.java | 2 +- .../operation/transform/DefaultMathTransformFactory.java | 4 ++-- .../test/org/apache/sis/geometry/AbstractEnvelopeTest.java | 2 +- .../test/org/apache/sis/geometry/CoordinateFormatTest.java | 2 +- .../org/apache/sis/geometry/GeneralDirectPositionTest.java | 2 +- .../test/org/apache/sis/geometry/GeneralEnvelopeTest.java | 2 +- .../test/org/apache/sis/geometry/ImmutableEnvelopeTest.java | 2 +- .../test/org/apache/sis/geometry/TransformTestCase.java | 2 +- .../test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 6 +++--- .../test/org/apache/sis/io/wkt/WKTFormatTest.java | 2 +- .../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +- .../org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java | 2 +- .../apache/sis/referencing/crs/DefaultGeographicCRSTest.java | 2 +- .../referencing/operation/DefaultPassThroughOperationTest.java | 4 +++- .../referencing/operation/transform/ScaleTransformTest.java | 2 +- .../operation/transform/TranslationTransformTest.java | 2 ++ .../org/apache/sis/test/integration/MetadataVerticalTest.java | 2 +- .../test/org/apache/sis/storage/esri/AsciiGridStoreTest.java | 2 +- .../test/org/apache/sis/storage/image/WorldFileStoreTest.java | 2 +- .../test/org/apache/sis/test/Assertions.java | 10 +++++----- .../test/org/apache/sis/test/OptionalTestData.java | 2 -- 31 files changed, 43 insertions(+), 41 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java index 490de2cf75,3315d2fd25..60eb40ee73 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java @@@ -23,8 -22,7 +22,11 @@@ import jakarta.xml.bind.annotation.XmlE import jakarta.xml.bind.annotation.XmlRootElement; import org.opengis.metadata.acquisition.RequestedDate; import org.apache.sis.metadata.iso.ISOMetadata; + ++// Specific to the main and geoapi-3.1 branches: ++import java.util.Date; +import org.apache.sis.temporal.TemporalDate; + /** * Range of date validity. diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java index 51f29eee48,5dd0541705..c8e29c1e58 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java @@@ -29,10 -28,9 +28,11 @@@ import org.opengis.metadata.acquisition import org.opengis.metadata.acquisition.Requirement; import org.opengis.metadata.citation.Citation; import org.apache.sis.metadata.iso.ISOMetadata; - import org.apache.sis.temporal.TemporalDate; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.citation.Responsibility; +// Specific to the main and geoapi-3.1 branches: ++import java.util.Date; +import org.opengis.metadata.citation.ResponsibleParty; ++import org.apache.sis.temporal.TemporalDate; /** diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java index 49eed59250,5fbdae63c0..d3f5d44435 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java @@@ -41,8 -39,8 +39,10 @@@ import org.apache.sis.metadata.TitlePro import org.apache.sis.metadata.iso.ISOMetadata; import static org.apache.sis.util.collection.Containers.isNullOrEmpty; -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.citation.Responsibility; +// Specific to the main and geoapi-3.1 branches: ++import java.util.Date; +import org.opengis.metadata.citation.ResponsibleParty; ++import org.apache.sis.temporal.TemporalDate; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java index 64593b9891,c6210c1a8c..97e8271516 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java @@@ -64,11 -64,6 +64,11 @@@ import org.apache.sis.util.logging.Logg import org.apache.sis.io.wkt.Parser; import org.apache.sis.xml.XML; - // Specific the the main and geoapi-3.1 branches: ++// Specific to the main and geoapi-3.1 branches: +import org.apache.sis.referencing.legacy.DefaultImageCRS; +import org.apache.sis.referencing.legacy.DefaultImageDatum; +import org.apache.sis.referencing.legacy.DefaultUserDefinedCS; + /** * Creates Coordinate Reference System (CRS) implementations, with their Coordinate System (CS) and Datum components. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultUserDefinedCS.java index b12b1f3532,771156d8b2..99ff3a8e10 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultUserDefinedCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultUserDefinedCS.java @@@ -19,13 -19,10 +19,13 @@@ package org.apache.sis.referencing.lega import java.util.Map; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.XmlRootElement; + import org.opengis.referencing.cs.CoordinateSystemAxis; import org.apache.sis.referencing.cs.AbstractCS; import org.apache.sis.referencing.internal.shared.NilReferencingObject; - import org.opengis.referencing.cs.CoordinateSystemAxis; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.cs.UserDefinedCS; + /** * A 2- or 3-dimensional coordinate system for any combination of coordinate axes not covered by other CS types. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java index 0cf9b63dbe,65397554b0..84aea08aee --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java @@@ -48,11 -46,6 +46,13 @@@ import org.apache.sis.referencing.facto import org.apache.sis.parameter.DefaultParameterValueGroup; import org.apache.sis.system.Reflect; +// Specific to the main and geoapi-3.1 branches: ++import org.opengis.parameter.ParameterValueGroup; +import org.opengis.parameter.ParameterDescriptorGroup; ++import org.opengis.referencing.cs.CoordinateSystem; +import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.apache.sis.util.resources.Errors; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.apache.sis.referencing.operation.matrix.Matrices; diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java index e2b4e30c67,037ff9060a..e25864b011 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java @@@ -59,12 -59,9 +59,12 @@@ import static org.apache.sis.test.Asser import static org.apache.sis.test.Assertions.assertSingleton; import static org.apache.sis.test.Assertions.assertSingletonAuthorityCode; import static org.apache.sis.test.Assertions.assertSingletonScope; + import static org.apache.sis.referencing.Assertions.assertAxisEquals; + import static org.apache.sis.referencing.Assertions.assertDiagonalEquals; +// Specific to the main and geoapi-3.1 branches: +import org.apache.sis.temporal.TemporalDate; + /** * Tests {@link GeodeticObjectParser}.
