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
commit 9218bcd6b364cac8f6abebeb825b8bc1a00eeb5c Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Thu Sep 15 15:27:40 2022 +0200 Move `org.apache.sis.internal.storage.aggregate` package to public API. --- .../java/org/apache/sis/internal/storage/folder/Store.java | 2 +- .../sis/internal/storage/folder/UnstructuredAggregate.java | 2 +- .../storage/aggregate/AggregatedFeatureSet.java | 2 +- .../{internal => }/storage/aggregate/AggregatedResource.java | 2 +- .../storage/aggregate/ConcatenatedFeatureSet.java | 2 +- .../storage/aggregate/ConcatenatedGridCoverage.java | 2 +- .../storage/aggregate/ConcatenatedGridResource.java | 2 +- .../{internal => }/storage/aggregate/CoverageAggregator.java | 2 +- .../{internal => }/storage/aggregate/DimensionSelector.java | 2 +- .../sis/{internal => }/storage/aggregate/GridSlice.java | 2 +- .../{internal => }/storage/aggregate/GridSliceLocator.java | 2 +- .../apache/sis/{internal => }/storage/aggregate/Group.java | 2 +- .../sis/{internal => }/storage/aggregate/GroupAggregate.java | 2 +- .../sis/{internal => }/storage/aggregate/GroupByCRS.java | 2 +- .../sis/{internal => }/storage/aggregate/GroupBySample.java | 2 +- .../{internal => }/storage/aggregate/GroupByTransform.java | 2 +- .../sis/{internal => }/storage/aggregate/JoinFeatureSet.java | 2 +- .../sis/{internal => }/storage/aggregate/MergeStrategy.java | 2 +- .../sis/{internal => }/storage/aggregate/package-info.java | 11 ++++------- .../storage/aggregate/ConcatenatedFeatureSetTest.java | 2 +- .../{internal => }/storage/aggregate/JoinFeatureSetTest.java | 2 +- .../test/java/org/apache/sis/test/suite/StorageTestSuite.java | 4 ++-- 22 files changed, 26 insertions(+), 29 deletions(-) diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java index 364a1e4dda..6433b929dd 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java @@ -55,10 +55,10 @@ import org.apache.sis.internal.storage.MetadataBuilder; import org.apache.sis.internal.storage.StoreUtilities; import org.apache.sis.internal.storage.StoreResource; import org.apache.sis.internal.storage.Resources; -import org.apache.sis.internal.storage.aggregate.CoverageAggregator; import org.apache.sis.storage.event.StoreEvent; import org.apache.sis.storage.event.StoreListener; import org.apache.sis.storage.event.WarningEvent; +import org.apache.sis.storage.aggregate.CoverageAggregator; /** diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/UnstructuredAggregate.java b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/UnstructuredAggregate.java index a3d01f3397..48ca5f56fb 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/UnstructuredAggregate.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/UnstructuredAggregate.java @@ -19,7 +19,7 @@ package org.apache.sis.internal.storage.folder; import org.apache.sis.storage.Resource; import org.apache.sis.storage.Aggregate; import org.apache.sis.storage.DataStoreException; -import org.apache.sis.internal.storage.aggregate.CoverageAggregator; +import org.apache.sis.storage.aggregate.CoverageAggregator; /** diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedFeatureSet.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/AggregatedFeatureSet.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedFeatureSet.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/AggregatedFeatureSet.java index e1aadfec5c..5bfe71215c 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedFeatureSet.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.List; import java.util.ArrayList; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedResource.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/AggregatedResource.java similarity index 95% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedResource.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/AggregatedResource.java index 2537d356b6..6dbbdecbe0 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/AggregatedResource.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/AggregatedResource.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.aggregate; +package org.apache.sis.storage.aggregate; /** diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSet.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSet.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSet.java index 3aa4aac9a2..cf873ce758 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSet.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.Arrays; import java.util.List; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedGridCoverage.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedGridCoverage.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.java index 7e13c5128a..163fd34d41 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedGridCoverage.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/ConcatenatedGridCoverage.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.List; import java.util.ArrayList; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedGridResource.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedGridResource.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/ConcatenatedGridResource.java index 5254220c5e..b2ada74626 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/ConcatenatedGridResource.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/ConcatenatedGridResource.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.List; import java.util.Arrays; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/CoverageAggregator.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/CoverageAggregator.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/CoverageAggregator.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/CoverageAggregator.java index 43e08dafa4..6ccb2e70dc 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/CoverageAggregator.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/CoverageAggregator.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.Locale; import java.util.List; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/DimensionSelector.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/DimensionSelector.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/DimensionSelector.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/DimensionSelector.java index 9ad0278236..8adaff92de 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/DimensionSelector.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/DimensionSelector.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.Arrays; import java.math.BigInteger; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GridSlice.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GridSlice.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GridSlice.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GridSlice.java index e3664625a6..10726e535d 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GridSlice.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GridSlice.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.aggregate; +package org.apache.sis.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/GridSliceLocator.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GridSliceLocator.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GridSliceLocator.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GridSliceLocator.java index 35d061ca53..786c940fd6 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GridSliceLocator.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GridSliceLocator.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.aggregate; +package org.apache.sis.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/Group.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/Group.java similarity index 98% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/Group.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/Group.java index 7a51c4d337..d7f0f8f225 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/Group.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/Group.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.List; import java.util.ArrayList; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupAggregate.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupAggregate.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupAggregate.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupAggregate.java index ace63ef45c..d976fdaad8 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupAggregate.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupAggregate.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.List; import java.util.Collection; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupByCRS.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupByCRS.java similarity index 98% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupByCRS.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupByCRS.java index 1893360e8d..33d12ff520 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupByCRS.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupByCRS.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.List; import java.util.Locale; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupBySample.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupBySample.java similarity index 98% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupBySample.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupBySample.java index f42124f0da..162146ad21 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupBySample.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupBySample.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.List; import java.util.Locale; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupByTransform.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupByTransform.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupByTransform.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupByTransform.java index a62efcedc7..855d4c8878 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/GroupByTransform.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/GroupByTransform.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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.List; import java.util.Arrays; diff --git a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSet.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/JoinFeatureSet.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSet.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/JoinFeatureSet.java index b4d7ed9f25..13dd54bfec 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSet.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/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.aggregate; +package org.apache.sis.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/MergeStrategy.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/MergeStrategy.java similarity index 99% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/MergeStrategy.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/MergeStrategy.java index 66aa3303f6..82d7801cb1 100644 --- a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/MergeStrategy.java +++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/MergeStrategy.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.aggregate; +package org.apache.sis.storage.aggregate; import java.time.Instant; import java.time.Duration; 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/storage/aggregate/package-info.java similarity index 76% rename from storage/sis-storage/src/main/java/org/apache/sis/internal/storage/aggregate/package-info.java rename to storage/sis-storage/src/main/java/org/apache/sis/storage/aggregate/package-info.java index 8c24249e4c..b186db0d9b 100644 --- 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/storage/aggregate/package-info.java @@ -16,12 +16,9 @@ */ /** - * 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. + * Resources which are aggregations or concatenations of other resources. + * This package can concatenate set of features, or perform an operation + * equivalent to SQL "JOIN", or create a data cube from a set of slices. * * @author Johann Sorel (Geomatys) * @author Martin Desruisseaux (Geomatys) @@ -29,4 +26,4 @@ * @since 1.3 * @module */ -package org.apache.sis.internal.storage.aggregate; +package org.apache.sis.storage.aggregate; diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSetTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSetTest.java similarity index 99% rename from storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSetTest.java rename to storage/sis-storage/src/test/java/org/apache/sis/storage/aggregate/ConcatenatedFeatureSetTest.java index 5236d635cb..4fec239bca 100644 --- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/ConcatenatedFeatureSetTest.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.Arrays; import java.util.Collections; diff --git a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSetTest.java b/storage/sis-storage/src/test/java/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java similarity index 99% rename from storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSetTest.java rename to storage/sis-storage/src/test/java/org/apache/sis/storage/aggregate/JoinFeatureSetTest.java index cf7adaa38f..e9b1c3efd8 100644 --- a/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/aggregate/JoinFeatureSetTest.java +++ b/storage/sis-storage/src/test/java/org/apache/sis/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.aggregate; +package org.apache.sis.storage.aggregate; import java.util.Map; import java.util.HashMap; 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 25c40d5fd7..ad3ab0fa51 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.aggregate.JoinFeatureSetTest.class, - org.apache.sis.internal.storage.aggregate.ConcatenatedFeatureSetTest.class, + org.apache.sis.storage.aggregate.JoinFeatureSetTest.class, + org.apache.sis.storage.aggregate.ConcatenatedFeatureSetTest.class, org.apache.sis.storage.DataStoresTest.class }) public final strictfp class StorageTestSuite extends TestSuite {