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 f057125eea Move aggregation classes to a separated package, in anticipation for more classes to be added. f057125eea is described below commit f057125eeaf8cbddc8e6c69b7fdceffcd34540a9 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Tue Aug 16 17:22:42 2022 +0200 Move aggregation classes to a separated package, in anticipation for more classes to be added. --- .../{ => aggregate}/AggregatedFeatureSet.java | 3 +- .../{ => aggregate}/ConcatenatedFeatureSet.java | 2 +- .../storage/{ => aggregate}/JoinFeatureSet.java | 2 +- .../internal/storage/aggregate/package-info.java | 32 ++++++++++++++++++++++ .../ConcatenatedFeatureSetTest.java | 3 +- .../{ => aggregate}/JoinFeatureSetTest.java | 3 +- .../apache/sis/test/suite/StorageTestSuite.java | 4 +-- 7 files changed, 42 insertions(+), 7 deletions(-) diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AggregatedFeatureSet.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedFeatureSet.java similarity index 98% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AggregatedFeatureSet.java rename to storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedFeatureSet.java index 44870f51d6..e1aadfec5c 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AggregatedFeatureSet.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedFeatureSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.storage; +package org.apache.sis.internal.storage.aggregate; import java.util.List; import java.util.ArrayList; @@ -30,6 +30,7 @@ import org.apache.sis.storage.FeatureSet; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.event.StoreListeners; import org.apache.sis.storage.AbstractFeatureSet; +import org.apache.sis.internal.storage.MetadataBuilder; // Branch-dependent imports import org.opengis.feature.FeatureType; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ConcatenatedFeatureSet.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSet.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ConcatenatedFeatureSet.java rename to storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSet.java index 1b6645f8c5..e20f898012 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ConcatenatedFeatureSet.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.storage; +package org.apache.sis.internal.storage.aggregate; import java.util.Arrays; import java.util.List; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/JoinFeatureSet.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSet.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/JoinFeatureSet.java rename to storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSet.java index 5906016940..b4d7ed9f25 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/JoinFeatureSet.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.storage; +package org.apache.sis.internal.storage.aggregate; import java.util.Map; import java.util.List; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/package-info.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/package-info.java new file mode 100644 index 0000000000..8c24249e4c --- /dev/null +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/package-info.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Resources which are aggregations of other resources. + * + * <STRONG>Do not use!</STRONG> + * + * This package is for internal use by SIS only. Classes in this package + * may change in incompatible ways in any future version without notice. + * + * @author Johann Sorel (Geomatys) + * @author Martin Desruisseaux (Geomatys) + * @version 1.3 + * @since 1.3 + * @module + */ +package org.apache.sis.internal.storage.aggregate; diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ConcatenatedFeatureSetTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSetTest.java similarity index 98% rename from storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ConcatenatedFeatureSetTest.java rename to storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSetTest.java index 7841638f2e..5236d635cb 100644 --- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/ConcatenatedFeatureSetTest.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.storage; +package org.apache.sis.internal.storage.aggregate; import java.util.Arrays; import java.util.Collections; @@ -22,6 +22,7 @@ import org.opengis.metadata.Metadata; import org.opengis.metadata.lineage.Lineage; import org.opengis.metadata.content.FeatureCatalogueDescription; import org.apache.sis.feature.builder.FeatureTypeBuilder; +import org.apache.sis.internal.storage.MemoryFeatureSet; import org.apache.sis.storage.DataStoreContentException; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.FeatureSet; diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/JoinFeatureSetTest.java b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSetTest.java similarity index 99% rename from storage/sis-storage/src/test/java/org/apache/sis/internal/storage/JoinFeatureSetTest.java rename to storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSetTest.java index 7a380753f4..cf7adaa38f 100644 --- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/JoinFeatureSetTest.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSetTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.sis.internal.storage; +package org.apache.sis.internal.storage.aggregate; import java.util.Map; import java.util.HashMap; @@ -25,6 +25,7 @@ import java.util.stream.Stream; import org.apache.sis.filter.DefaultFilterFactory; import org.apache.sis.feature.builder.FeatureTypeBuilder; import org.apache.sis.internal.feature.AttributeConvention; +import org.apache.sis.internal.storage.MemoryFeatureSet; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.FeatureSet; import org.apache.sis.test.DependsOnMethod; diff --git a/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java b/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java index 2392c0f1de..25c40d5fd7 100644 --- a/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java @@ -65,8 +65,8 @@ import org.junit.BeforeClass; org.apache.sis.internal.storage.esri.BIPConsistencyTest.class, org.apache.sis.internal.storage.esri.BILConsistencyTest.class, org.apache.sis.internal.storage.folder.StoreTest.class, - org.apache.sis.internal.storage.JoinFeatureSetTest.class, - org.apache.sis.internal.storage.ConcatenatedFeatureSetTest.class, + org.apache.sis.internal.storage.aggregate.JoinFeatureSetTest.class, + org.apache.sis.internal.storage.aggregate.ConcatenatedFeatureSetTest.class, org.apache.sis.storage.DataStoresTest.class }) public final strictfp class StorageTestSuite extends TestSuite {