This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 7d4feeea52a760804d9bb5be5933442191957e22 Merge: d5c8e985dd bd6a16c7b8 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Oct 11 17:09:34 2025 +0200 Merge of automatic reorganization of imports order. .../apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java | 4 +++- .../org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java | 4 ++-- .../main/org/apache/sis/metadata/iso/citation/DefaultCitation.java | 4 ++-- .../test/org/apache/sis/metadata/sql/MetadataWriterTest.java | 2 +- .../test/org/apache/sis/xml/test/TestCase.java | 2 +- .../org/apache/sis/referencing/factory/GeodeticObjectFactory.java | 4 +++- .../org/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 +- .../test/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 +- .../test/org/apache/sis/referencing/crs/DefaultGeodeticCRSTest.java | 2 +- .../org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java | 2 +- .../sis/referencing/operation/DefaultPassThroughOperationTest.java | 2 +- .../sis/referencing/operation/transform/ScaleTransformTest.java | 2 +- .../test/org/apache/sis/test/integration/MetadataVerticalTest.java | 2 +- .../org.apache.sis.util/test/org/apache/sis/test/Assertions.java | 2 +- .../test/org/apache/sis/test/OptionalTestData.java | 2 -- 24 files changed, 32 insertions(+), 30 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/citation/DefaultCitation.java index 4e200793c9,d3f5d44435..6f964345a3 --- 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 @@@ -42,13 -40,10 +40,15 @@@ import org.apache.sis.metadata.iso.ISOM import static org.apache.sis.util.collection.Containers.isNullOrEmpty; // 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; +// Specific to the main branch: +import org.opengis.annotation.UML; +import static org.opengis.annotation.Obligation.OPTIONAL; +import static org.opengis.annotation.Specification.ISO_19115; + /** * Standardized resource reference. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java index 65d5c8aad1,97e8271516..5c2a8b7b65 --- 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 @@@ -68,8 -68,7 +68,10 @@@ import org.apache.sis.xml.XML import org.apache.sis.referencing.legacy.DefaultImageCRS; import org.apache.sis.referencing.legacy.DefaultImageDatum; import org.apache.sis.referencing.legacy.DefaultUserDefinedCS; + ++// Specific to the main branch: +import org.apache.sis.referencing.datum.DefaultDatumEnsemble; + /** * Creates Coordinate Reference System (CRS) implementations, with their Coordinate System (CS) and Datum components. diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java index 2f7043ba3f,4b5556e845..184aa5a3f7 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/crs/DefaultGeographicCRSTest.java @@@ -29,11 -29,11 +29,11 @@@ import static org.junit.jupiter.api.Ass import org.opengis.test.Validators; import org.apache.sis.test.TestCase; import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata; - import static org.apache.sis.referencing.Assertions.assertWktEquals; import static org.apache.sis.test.Assertions.assertSingleton; + import static org.apache.sis.referencing.Assertions.assertWktEquals; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.metadata.Identifier; +// Specific to the main branch: +import org.opengis.referencing.ReferenceIdentifier; /** diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java index 7dd4f5d2de,1114372ace..21ee99189a --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultPassThroughOperationTest.java @@@ -28,12 -28,12 +28,12 @@@ import org.opengis.referencing.operatio // Test dependencies import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; - import static org.apache.sis.test.Assertions.assertSingleton; import org.opengis.test.Validators; + import static org.apache.sis.test.Assertions.assertSingleton; import org.apache.sis.xml.test.TestCase; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import static org.opengis.test.Assertions.assertIdentifierEquals; +// Specific to the main branch: +import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals; /** diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java index 03ac6997c1,e1c28de621..0957245449 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/test/integration/MetadataVerticalTest.java @@@ -49,10 -48,10 +48,11 @@@ import static org.apache.sis.test.Asser import static org.apache.sis.test.Assertions.assertSingletonScope; import org.apache.sis.xml.test.TestCase; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.nio.charset.StandardCharsets; -import static org.opengis.test.Assertions.assertIdentifierEquals; -import static org.apache.sis.test.Assertions.assertSingletonReferenceSystem; +// Specific to the main branch: +import org.opengis.metadata.identification.CharacterSet; +import org.opengis.referencing.datum.VerticalDatumType; ++import org.apache.sis.temporal.TemporalDate; +import static org.apache.sis.test.GeoapiAssert.assertIdentifierEquals; /** diff --cc endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java index 77c6388f7b,a9ae0e1e85..a856c806e4 --- a/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java +++ b/endorsed/src/org.apache.sis.util/test/org/apache/sis/test/Assertions.java @@@ -51,11 -51,12 +51,11 @@@ import org.apache.sis.util.Classes // Test dependencies import static org.junit.jupiter.api.Assertions.*; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.metadata.extent.GeographicExtent; -import org.opengis.metadata.content.FeatureTypeInfo; -import org.opengis.metadata.citation.Responsibility; -import org.opengis.metadata.maintenance.Scope; -import org.opengis.referencing.ObjectDomain; +// Specific to the main branch: ++import org.opengis.metadata.identification.DataIdentification; +import org.opengis.referencing.datum.Datum; +import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.opengis.referencing.operation.CoordinateOperation; - import org.opengis.metadata.identification.DataIdentification; /**
