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 e0e5cfd7503d552bdde04728e39cf7334859106d Merge: 255bd22df2 93c592d047 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Nov 27 10:33:02 2025 +0100 Merge of automatic reorganization of imports order. .../sis/feature/internal/shared/FeatureProjection.java | 4 ++-- .../apache/sis/feature/internal/shared/OperationView.java | 2 +- .../main/org/apache/sis/filter/TemporalFilter.java | 2 +- .../apache/sis/pending/geoapi/filter/ValueReference.java | 2 +- .../sis/feature/internal/shared/FeatureProjectionTest.java | 13 ++++++------- .../geometry/wrapper/jts/PackedCoordinateSequenceTest.java | 2 +- .../sis/referencing/factory/MultiAuthoritiesFactory.java | 2 +- .../org/apache/sis/storage/sql/feature/FeatureStream.java | 2 +- .../main/org/apache/sis/storage/base/MetadataFetcher.java | 2 +- .../main/org/apache/sis/storage/base/PseudoResource.java | 2 +- .../org/apache/sis/storage/shapefile/ShapefileStore.java | 2 +- 11 files changed, 17 insertions(+), 18 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java index af40f81d17,297d4257f5..fcf8de79c0 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/FeatureProjection.java @@@ -43,13 -43,14 +43,13 @@@ import org.apache.sis.feature.builder.P import org.apache.sis.filter.visitor.ListingPropertyVisitor; import org.apache.sis.io.TableAppender; -// 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.PropertyType; -import org.opengis.feature.Operation; -import org.opengis.filter.Expression; -import org.opengis.filter.Literal; -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.AbstractIdentifiedType; ++import org.apache.sis.filter.Expression; +import org.apache.sis.pending.geoapi.filter.Literal; +import org.apache.sis.pending.geoapi.filter.ValueReference; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/OperationView.java index d77d3bd23e,190150dcd5..bfa873d64e --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/OperationView.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/internal/shared/OperationView.java @@@ -20,14 -20,20 +20,14 @@@ import org.opengis.util.GenericName import org.opengis.parameter.ParameterValueGroup; import org.opengis.parameter.ParameterDescriptorGroup; import org.apache.sis.feature.AbstractOperation; + import org.apache.sis.feature.DefaultFeatureType; import org.apache.sis.feature.internal.Resources; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import java.util.Optional; -import java.io.Serializable; -import org.opengis.util.InternationalString; -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureOperationException; -import org.opengis.feature.IdentifiedType; -import org.opengis.feature.Operation; -import org.opengis.feature.Property; -import org.opengis.feature.PropertyNotFoundException; -import org.apache.sis.util.Deprecable; +// Specific to the main branch: +import java.util.Map; +import java.util.Set; +import org.apache.sis.feature.AbstractFeature; - import org.apache.sis.feature.DefaultFeatureType; +import org.apache.sis.feature.AbstractIdentifiedType; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/ValueReference.java index b8de20e5db,458250e064..5770a6e24e --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/ValueReference.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/pending/geoapi/filter/ValueReference.java @@@ -14,11 -14,7 +14,11 @@@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.geometries.math; +package org.apache.sis.pending.geoapi.filter; + +import java.util.List; - import org.apache.sis.filter.Expression; +import org.opengis.util.ScopedName; ++import org.apache.sis.filter.Expression; /** diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/FeatureProjectionTest.java index 4ad3cc0893,2d58afe83e..66d748d483 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/FeatureProjectionTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/feature/internal/shared/FeatureProjectionTest.java @@@ -37,6 -30,13 +30,12 @@@ import static org.junit.jupiter.api.Ass import static org.apache.sis.test.Assertions.assertSetEquals; import org.apache.sis.test.TestCase; -// 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.Operation; -import org.opengis.filter.FilterFactory; ++// Specific to the main branch: ++import org.apache.sis.feature.AbstractFeature; ++import org.apache.sis.feature.DefaultFeatureType; ++import org.apache.sis.feature.DefaultAttributeType; ++import org.apache.sis.feature.AbstractOperation; + /** * Tests {@link FeatureProjection} and {@link FeatureProjectionBuilder}. diff --cc endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java index 9300163ccf,77e62ca76a..61366f2b7e --- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java +++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java @@@ -38,13 -39,12 +39,12 @@@ import org.apache.sis.util.ArgumentChec import org.apache.sis.util.internal.shared.Strings; import org.apache.sis.util.stream.DeferredStream; import org.apache.sis.util.stream.PaginedStream; - import org.apache.sis.storage.DataStoreException; import org.apache.sis.feature.internal.shared.FeatureProjection; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.Feature; -import org.opengis.filter.Filter; -import org.opengis.filter.SortBy; +// Specific to the main branch: +import org.apache.sis.filter.Filter; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.pending.geoapi.filter.SortBy; /** diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java index 24b13796b4,02d0a6715a..96aa757b02 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/MetadataFetcher.java @@@ -48,9 -47,9 +47,10 @@@ import org.apache.sis.storage.event.Sto import org.apache.sis.util.collection.CodeListSet; import org.apache.sis.temporal.TemporalDate; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.metadata.citation.Party; -import org.opengis.metadata.citation.Responsibility; +// Specific to the main branch: ++import java.util.Date; +import org.opengis.metadata.citation.ResponsibleParty; +import org.apache.sis.metadata.iso.DefaultMetadata; /** diff --cc incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java index 70c18d41fd,2f7f9f5e87..8789c04500 --- 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 @@@ -113,21 -113,22 +113,21 @@@ import org.apache.sis.util.ArraysExt import org.apache.sis.util.Classes; import org.apache.sis.util.Utilities; import org.apache.sis.util.collection.BackingStoreException; + import org.apache.sis.storage.base.WarningAdapter; -// 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.apache.sis.storage.base.WarningAdapter; /**
