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 39ea192688ebf1606ce8ce061703484adca9696c Merge: a5507ba075 d8e3bc5a7f Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Jul 21 17:04:28 2025 +0200 Merge of automatic reorganization of imports order. .../main/org/apache/sis/feature/StringJoinOperation.java | 2 +- .../main/org/apache/sis/feature/privy/AttributeConvention.java | 2 +- .../main/org/apache/sis/feature/privy/FeatureProjectionBuilder.java | 2 +- .../main/org/apache/sis/filter/internal/GeometryFromFeature.java | 2 +- .../main/org/apache/sis/geometry/wrapper/Geometries.java | 6 +++--- .../main/org/apache/sis/geometry/wrapper/jts/ConverterTo2D.java | 2 +- .../main/org/apache/sis/geometry/wrapper/jts/JTS.java | 2 +- .../main/org/apache/sis/metadata/MetadataStandard.java | 2 +- .../main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java | 4 +++- .../apache/sis/referencing/operation/provider/AbstractProvider.java | 2 +- .../apache/sis/referencing/operation/provider/Geographic2Dto3D.java | 2 +- .../operation/transform/EllipsoidToCentricTransform.java | 2 +- .../sis/referencing/operation/transform/LinearTransform1D.java | 2 ++ .../operation/transform/EllipsoidToRadiusTransformTest.java | 2 ++ .../main/org/apache/sis/storage/sql/feature/InfoStatements.java | 2 +- .../main/org/apache/sis/storage/sql/feature/Table.java | 2 +- .../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 4 ++-- 17 files changed, 24 insertions(+), 18 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java index 3c62aa7964,c6dd9105ce..02d2310d03 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java @@@ -36,9 -37,20 +37,8 @@@ import org.apache.sis.util.privy.Unmodi import org.apache.sis.converter.SurjectiveConverter; import org.apache.sis.feature.privy.AttributeConvention; import org.apache.sis.feature.internal.Resources; - import org.apache.sis.util.privy.UnmodifiableArrayList; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.AttributeType; -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.feature.FeatureAssociationRole; -import org.opengis.feature.IdentifiedType; -import org.opengis.feature.InvalidPropertyValueException; -import org.opengis.feature.Operation; -import org.opengis.feature.Property; -import org.opengis.feature.PropertyType; -import org.opengis.feature.PropertyNotFoundException; - /** * An operation concatenating the string representations of the values of multiple properties. diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java index d781d9cc5b,c927308d49..b103b0a626 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/AttributeConvention.java @@@ -24,13 -24,19 +24,13 @@@ import org.opengis.referencing.crs.Coor import org.apache.sis.util.Static; import org.apache.sis.util.iso.Names; import org.apache.sis.feature.Features; + import org.apache.sis.feature.AbstractFeature; import org.apache.sis.geometry.wrapper.Geometries; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.Feature; -import org.opengis.feature.Attribute; -import org.opengis.feature.AttributeType; -import org.opengis.feature.IdentifiedType; -import org.opengis.feature.Operation; -import org.opengis.feature.Property; -import org.opengis.feature.PropertyType; -import org.opengis.feature.FeatureType; -import org.opengis.feature.PropertyNotFoundException; +// Specific to the main branch: - import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.AbstractIdentifiedType; +import org.apache.sis.feature.DefaultAttributeType; +import org.apache.sis.feature.DefaultFeatureType; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjectionBuilder.java index 8951b1e8bb,51ab93d85f..621337d342 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjectionBuilder.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/privy/FeatureProjectionBuilder.java @@@ -42,13 -42,15 +42,13 @@@ import org.apache.sis.util.privy.String import org.apache.sis.util.resources.Errors; import org.apache.sis.util.resources.Vocabulary; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.feature.AttributeType; -import org.opengis.feature.PropertyType; -import org.opengis.feature.IdentifiedType; -import org.opengis.feature.Operation; -import org.opengis.filter.Expression; -import org.opengis.filter.ValueReference; +// Specific to the main branch: - import org.apache.sis.filter.Expression; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.feature.DefaultAttributeType; +import org.apache.sis.feature.AbstractIdentifiedType; ++import org.apache.sis.filter.Expression; +import org.apache.sis.pending.geoapi.filter.ValueReference; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java index 339a344190,178a668113..c221faf617 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryFromFeature.java @@@ -22,10 -22,11 +22,10 @@@ import org.apache.sis.geometry.wrapper. import org.apache.sis.feature.privy.AttributeConvention; import org.apache.sis.filter.privy.XPath; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.Feature; -import org.opengis.filter.Expression; -import org.opengis.filter.ValueReference; -import org.opengis.filter.InvalidFilterValueException; +// Specific to the main branch: - import org.apache.sis.filter.Expression; +import org.apache.sis.feature.AbstractFeature; ++import org.apache.sis.filter.Expression; +import org.apache.sis.pending.geoapi.filter.ValueReference; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java index 640dc3b8fd,ff220d6585..1532dab357 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java @@@ -44,9 -44,9 +44,9 @@@ import org.apache.sis.util.collection.B // Specific to the main and geoapi-3.1 branches: import org.opengis.geometry.MismatchedDimensionException; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.Feature; ++// Specific to the main branch: ++import org.apache.sis.feature.AbstractFeature; + /** * Utility methods on geometric objects defined in libraries outside Apache <abbr>SIS</abbr>. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java index 8e5a6c77ff,04b35f035e..2347f87a0c --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java @@@ -51,9 -51,16 +51,11 @@@ import org.apache.sis.util.resources.Er // Specific to the main and geoapi-3.1 branches: import java.util.Date; - import org.opengis.metadata.extent.Extent; import org.opengis.referencing.datum.VerticalDatumType; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.util.Optional; -import java.time.temporal.Temporal; -import org.opengis.referencing.crs.ParametricCRS; -import org.opengis.referencing.datum.DatumEnsemble; -import org.opengis.referencing.datum.ParametricDatum; -import org.opengis.referencing.datum.RealizationMethod; ++// Specific to the main branch: ++import org.opengis.metadata.extent.Extent; + /** * Collection of datums which for low accuracy requirements may be considered diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToRadiusTransformTest.java index 4530cfd75a,d4c6831e94..f8bf2f1d27 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToRadiusTransformTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/EllipsoidToRadiusTransformTest.java @@@ -29,8 -29,7 +29,10 @@@ import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.*; import org.apache.sis.referencing.datum.HardCodedDatum; import static org.apache.sis.test.Assertions.assertSerializedEquals; + ++// Specific to the main branch: +import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; + /** * Tests {@link EllipsoidToRadiusTransform}. diff --cc endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java index be139177ff,1bf546c8a2..e498a8a665 --- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java +++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java @@@ -57,10 -58,9 +58,9 @@@ import org.apache.sis.util.privy.Consta import org.apache.sis.io.wkt.Convention; import org.apache.sis.io.wkt.WKTFormat; import org.apache.sis.io.wkt.Warnings; - import org.apache.sis.util.Workaround; -// 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 incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java index 4cf9d48d05,9c2559444b..aea823e311 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java @@@ -57,8 -57,11 +57,9 @@@ import org.locationtech.jts.geom.MultiP import org.locationtech.jts.geom.MultiPolygon; import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; -import org.opengis.util.FactoryException; -import org.opengis.util.GenericName; import org.opengis.geometry.Envelope; import org.opengis.metadata.Metadata; + import org.opengis.metadata.Identifier; import org.opengis.parameter.ParameterValueGroup; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.TransformException; @@@ -113,19 -113,20 +113,19 @@@ import org.apache.sis.util.Classes import org.apache.sis.util.Utilities; import org.apache.sis.util.collection.BackingStoreException; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.util.CodeList; -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.feature.PropertyType; -import org.opengis.feature.AttributeType; -import org.opengis.filter.Expression; -import org.opengis.filter.Filter; -import org.opengis.filter.Literal; -import org.opengis.filter.LogicalOperator; -import org.opengis.filter.LogicalOperatorName; -import org.opengis.filter.SpatialOperatorName; -import org.opengis.filter.ValueReference; -import org.apache.sis.geometry.wrapper.*; +// Specific to the main branch: +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.feature.AbstractIdentifiedType; +import org.apache.sis.feature.DefaultAttributeType; +import org.apache.sis.filter.Expression; +import org.apache.sis.filter.Filter; ++import org.apache.sis.geometry.wrapper.Geometries; +import org.apache.sis.pending.geoapi.filter.Literal; +import org.apache.sis.pending.geoapi.filter.LogicalOperator; +import org.apache.sis.pending.geoapi.filter.LogicalOperatorName; +import org.apache.sis.pending.geoapi.filter.SpatialOperatorName; +import org.apache.sis.pending.geoapi.filter.ValueReference; - import org.opengis.metadata.Identifier; /**
