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 8c93960ed7ee7621dc210912ac754734da7c6a70
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sun Aug 20 14:55:32 2023 +0200
Rename the internal packages of the `org.apache.sis.storage.sql` module.
Since they are not exported, the `internal` name convention is not needed
anymore.
---
.../apache/sis/storage/sql/ResourceDefinition.java | 2 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 6 +++---
.../org/apache/sis/storage/sql/SQLStoreProvider.java | 4 ++--
.../{internal => storage}/sql/feature/Analyzer.java | 4 ++--
.../sql/feature/BinaryEncoding.java | 2 +-
.../sis/{internal => storage}/sql/feature/Column.java | 2 +-
.../{internal => storage}/sql/feature/Database.java | 4 ++--
.../sql/feature/FeatureAdapter.java | 2 +-
.../sql/feature/FeatureAnalyzer.java | 2 +-
.../sql/feature/FeatureIterator.java | 2 +-
.../sql/feature/FeatureStream.java | 6 +++---
.../sql/feature/GeometryGetter.java | 4 ++--
.../sql/feature/InfoStatements.java | 2 +-
.../{internal => storage}/sql/feature/PrimaryKey.java | 2 +-
.../sql/feature/QueryAnalyzer.java | 2 +-
.../{internal => storage}/sql/feature/Relation.java | 2 +-
.../{internal => storage}/sql/feature/Resources.java | 2 +-
.../sql/feature/Resources.properties | 0
.../sql/feature/Resources_en.java | 2 +-
.../sql/feature/Resources_fr.java | 2 +-
.../sql/feature/Resources_fr.properties | 0
.../sql/feature/SchemaModifier.java | 2 +-
.../sql/feature/SelectionClause.java | 2 +-
.../sql/feature/SelectionClauseWriter.java | 2 +-
.../sis/{internal => storage}/sql/feature/Table.java | 2 +-
.../sql/feature/TableAnalyzer.java | 2 +-
.../sql/feature/TableReference.java | 2 +-
.../sql/feature/ValueGetter.java | 2 +-
.../sql/feature/package-info.java | 4 ++--
.../sis/{internal => storage}/sql/postgis/Band.java | 2 +-
.../sql/postgis/ExtendedClauseWriter.java | 4 ++--
.../sql/postgis/ExtendedInfo.java | 10 +++++-----
.../sql/postgis/ExtentEstimator.java | 8 ++++----
.../sql/postgis/ObjectGetter.java | 6 +++---
.../{internal => storage}/sql/postgis/Postgres.java | 18 +++++++++---------
.../sql/postgis/RasterFormat.java | 4 ++--
.../sql/postgis/RasterGetter.java | 10 +++++-----
.../sql/postgis/RasterReader.java | 6 +++---
.../sql/postgis/RasterWriter.java | 6 +++---
.../sql/postgis/package-info.java | 4 ++--
.../{internal => util}/stream/BaseStreamWrapper.java | 2 +-
.../sis/{internal => util}/stream/DeferredStream.java | 2 +-
.../stream/DoubleStreamWrapper.java | 2 +-
.../stream/PaginedDoubleStream.java | 2 +-
.../sis/{internal => util}/stream/PaginedStream.java | 2 +-
.../sis/{internal => util}/stream/StreamWrapper.java | 2 +-
.../sis/{internal => util}/stream/package-info.java | 2 +-
.../test/org/apache/sis/storage/sql/SQLStoreTest.java | 4 ++--
.../sql/feature/GeometryGetterTest.java | 4 ++--
.../sql/feature/ResultSetMock.java | 2 +-
.../sql/feature/SelectionClauseWriterTest.java | 2 +-
.../sql/feature/TemporalValueGetterTest.java | 2 +-
.../{internal => storage}/sql/postgis/BandTest.java | 2 +-
.../sql/postgis/PostgresTest.java | 10 +++++-----
.../sql/postgis/RasterReaderTest.java | 2 +-
.../sql/postgis/RasterWriterTest.java | 2 +-
.../sql/postgis/SpatialFeatures.sql | 0
.../{internal => storage}/sql/postgis/TestRaster.java | 2 +-
.../sql/postgis/raster-ushort.wkb | Bin
59 files changed, 98 insertions(+), 98 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/ResourceDefinition.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/ResourceDefinition.java
index cf95ba7253..b154f0289e 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/ResourceDefinition.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/ResourceDefinition.java
@@ -25,7 +25,7 @@ import org.opengis.util.GenericName;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.iso.DefaultNameFactory;
-import static org.apache.sis.internal.sql.feature.Database.WILDCARD;
+import static org.apache.sis.storage.sql.feature.Database.WILDCARD;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
index 9d06901015..15a14fbaa5 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
@@ -36,9 +36,9 @@ import org.apache.sis.storage.StorageConnector;
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.internal.sql.feature.Database;
-import org.apache.sis.internal.sql.feature.Resources;
-import org.apache.sis.internal.sql.feature.SchemaModifier;
+import org.apache.sis.storage.sql.feature.Database;
+import org.apache.sis.storage.sql.feature.Resources;
+import org.apache.sis.storage.sql.feature.SchemaModifier;
import org.apache.sis.internal.storage.MetadataBuilder;
import org.apache.sis.internal.util.Strings;
import org.apache.sis.setup.GeometryLibrary;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStoreProvider.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStoreProvider.java
index 1f72004120..07980b47f9 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStoreProvider.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStoreProvider.java
@@ -26,7 +26,7 @@ import org.opengis.parameter.ParameterValueGroup;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.parameter.ParameterNotFoundException;
-import org.apache.sis.internal.sql.feature.Resources;
+import org.apache.sis.storage.sql.feature.Resources;
import org.apache.sis.internal.storage.Capability;
import org.apache.sis.internal.storage.StoreMetadata;
import org.apache.sis.storage.DataStore;
@@ -43,7 +43,7 @@ import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.ArgumentChecks;
-import static org.apache.sis.internal.sql.feature.Database.WILDCARD;
+import static org.apache.sis.storage.sql.feature.Database.WILDCARD;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Analyzer.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Analyzer.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Analyzer.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Analyzer.java
index 7e35c42e5d..6e6dd01749 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Analyzer.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Analyzer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Set;
import java.util.Map;
@@ -233,7 +233,7 @@ final class Analyzer {
/**
* Returns a message for unexpected errors. Those errors are caused by a
bug in this
- * {@code org.apache.sis.internal.sql.feature} package instead of a
database issue.
+ * {@code org.apache.sis.storage.sql.feature} package instead of a
database issue.
*/
final String internalError() {
return resources().getString(Resources.Keys.InternalError);
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/BinaryEncoding.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/BinaryEncoding.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/BinaryEncoding.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/BinaryEncoding.java
index 9f0ac7dc1e..d5642ce73b 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/BinaryEncoding.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/BinaryEncoding.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.io.EOFException;
import java.io.IOException;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Column.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Column.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Column.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Column.java
index 3550760200..40f7a56efd 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Column.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Column.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.sql.Types;
import java.sql.ResultSet;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Database.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Database.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
index 84295e2fa5..1565bd9470 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Database.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Set;
import java.util.Map;
@@ -48,7 +48,7 @@ import org.apache.sis.internal.feature.Geometries;
import org.apache.sis.internal.feature.GeometryType;
import org.apache.sis.internal.system.Modules;
import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.internal.sql.postgis.Postgres;
+import org.apache.sis.storage.sql.postgis.Postgres;
import org.apache.sis.storage.sql.SQLStore;
import org.apache.sis.storage.sql.ResourceDefinition;
import org.apache.sis.storage.FeatureSet;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureAdapter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAdapter.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureAdapter.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAdapter.java
index b26fdab1dc..8c51d58bf7 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureAdapter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAdapter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Map;
import java.util.List;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureAnalyzer.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAnalyzer.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureAnalyzer.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAnalyzer.java
index d0bb8bd3b7..d5560980b1 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureAnalyzer.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureAnalyzer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.List;
import java.util.Map;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureIterator.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureIterator.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureIterator.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureIterator.java
index b46eae89e9..5a929eb847 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureIterator.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureIterator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.List;
import java.util.ArrayList;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureStream.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureStream.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
index 28649cb1c4..656549f958 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/FeatureStream.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/FeatureStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Spliterator;
import java.util.stream.Stream;
@@ -29,8 +29,8 @@ import java.sql.SQLException;
import java.sql.Statement;
import org.apache.sis.filter.Optimization;
import org.apache.sis.internal.metadata.sql.SQLBuilder;
-import org.apache.sis.internal.stream.DeferredStream;
-import org.apache.sis.internal.stream.PaginedStream;
+import org.apache.sis.util.stream.DeferredStream;
+import org.apache.sis.util.stream.PaginedStream;
import org.apache.sis.internal.filter.SortByComparator;
import org.apache.sis.internal.util.Strings;
import org.apache.sis.storage.DataStoreException;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/GeometryGetter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/GeometryGetter.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/GeometryGetter.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/GeometryGetter.java
index 5c91616927..54ad4938ae 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/GeometryGetter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/GeometryGetter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.OptionalInt;
import java.nio.ByteBuffer;
@@ -52,7 +52,7 @@ import org.apache.sis.internal.feature.Geometries;
*
* @version 1.4
*
- * @see org.apache.sis.internal.sql.postgis.RasterGetter
+ * @see org.apache.sis.storage.sql.postgis.RasterGetter
*
* @since 1.1
*/
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/InfoStatements.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/InfoStatements.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
index 28a159504e..61b49ef9c9 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/InfoStatements.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Map;
import java.util.Set;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/PrimaryKey.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/PrimaryKey.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/PrimaryKey.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/PrimaryKey.java
index c0dbb53136..5102987bfb 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/PrimaryKey.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/PrimaryKey.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.List;
import java.util.Collection;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/QueryAnalyzer.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/QueryAnalyzer.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/QueryAnalyzer.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/QueryAnalyzer.java
index 9a23aceef0..47b3b42172 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/QueryAnalyzer.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/QueryAnalyzer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Map;
import java.util.Set;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Relation.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Relation.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
index 0790d058ed..ed06d388a4 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Relation.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Relation.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.List;
import java.util.Map;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources.java
index cc853e2d76..f26e83369d 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.io.InputStream;
import java.util.Locale;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources.properties
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources.properties
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources.properties
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources.properties
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources_en.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources_en.java
similarity index 95%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources_en.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources_en.java
index 1c7e4fcedd..6dcfc4f56b 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources_en.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources_en.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources_fr.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources_fr.java
similarity index 95%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources_fr.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources_fr.java
index 8f60f11d01..72abd68956 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources_fr.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources_fr.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources_fr.properties
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources_fr.properties
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Resources_fr.properties
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Resources_fr.properties
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SchemaModifier.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SchemaModifier.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SchemaModifier.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SchemaModifier.java
index 3cb11607c2..1b382a8dc2 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SchemaModifier.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SchemaModifier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.storage.DataStoreException;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SelectionClause.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SelectionClause.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java
index b2cf68c18e..ce210ef28b 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SelectionClause.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClause.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import org.opengis.geometry.Envelope;
import org.opengis.geometry.Geometry;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SelectionClauseWriter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SelectionClauseWriter.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
index 0d847b22c5..89bdba09b8 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/SelectionClauseWriter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/SelectionClauseWriter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.List;
import java.util.Map;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Table.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Table.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
index a9694a62cc..97b61e5c43 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/Table.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Map;
import java.util.HashMap;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/TableAnalyzer.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableAnalyzer.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/TableAnalyzer.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableAnalyzer.java
index 6790559af6..a65a009d8a 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/TableAnalyzer.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableAnalyzer.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Map;
import java.util.List;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/TableReference.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableReference.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/TableReference.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableReference.java
index 60af7665b9..bd43eeaa52 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/TableReference.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/TableReference.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Objects;
import java.util.function.Consumer;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/ValueGetter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/ValueGetter.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/ValueGetter.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/ValueGetter.java
index 803c0d1002..844ad517eb 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/ValueGetter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/ValueGetter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.Collection;
import java.sql.Array;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/package-info.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/package-info.java
similarity index 90%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/package-info.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/package-info.java
index f9bed5e7b0..5658692563 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/feature/package-info.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/package-info.java
@@ -26,7 +26,7 @@
* may change in incompatible ways in any future version without notice.
*
* <h2>Implementation notes</h2>
- * Feature type analysis is done through {@link
org.apache.sis.internal.sql.feature.Analyzer} class.
+ * Feature type analysis is done through {@link
org.apache.sis.storage.sql.feature.Analyzer} class.
*
* @author Johann Sorel (Geomatys)
* @author Martin Desruisseaux (Geomatys)
@@ -34,4 +34,4 @@
* @version 1.4
* @since 1.0
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/Band.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Band.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/Band.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Band.java
index 17303b834d..416a0aaa76 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/Band.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Band.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.awt.image.DataBuffer;
import java.awt.image.RasterFormatException;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtendedClauseWriter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtendedClauseWriter.java
similarity index 95%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtendedClauseWriter.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtendedClauseWriter.java
index f208501c3e..402fc59d6d 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtendedClauseWriter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtendedClauseWriter.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
-import org.apache.sis.internal.sql.feature.SelectionClauseWriter;
+import org.apache.sis.storage.sql.feature.SelectionClauseWriter;
// Branch-dependent imports
import org.opengis.filter.SpatialOperatorName;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtendedInfo.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtendedInfo.java
similarity index 93%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtendedInfo.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtendedInfo.java
index 209ba8bd6a..447c2b25aa 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtendedInfo.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtendedInfo.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.util.Map;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-import org.apache.sis.internal.sql.feature.Column;
-import org.apache.sis.internal.sql.feature.Database;
-import org.apache.sis.internal.sql.feature.TableReference;
-import org.apache.sis.internal.sql.feature.InfoStatements;
+import org.apache.sis.storage.sql.feature.Column;
+import org.apache.sis.storage.sql.feature.Database;
+import org.apache.sis.storage.sql.feature.TableReference;
+import org.apache.sis.storage.sql.feature.InfoStatements;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtentEstimator.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtentEstimator.java
similarity index 96%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtentEstimator.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtentEstimator.java
index db158b8d44..e72bddab36 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ExtentEstimator.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ExtentEstimator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.sql.Statement;
import java.sql.ResultSet;
@@ -22,9 +22,9 @@ import java.sql.SQLException;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
-import org.apache.sis.internal.sql.feature.Database;
-import org.apache.sis.internal.sql.feature.Column;
-import org.apache.sis.internal.sql.feature.TableReference;
+import org.apache.sis.storage.sql.feature.Database;
+import org.apache.sis.storage.sql.feature.Column;
+import org.apache.sis.storage.sql.feature.TableReference;
import org.apache.sis.internal.metadata.sql.SQLBuilder;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ObjectGetter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ObjectGetter.java
similarity index 94%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ObjectGetter.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ObjectGetter.java
index 4576799000..4371e14132 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/ObjectGetter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/ObjectGetter.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.sql.Array;
import java.sql.ResultSet;
-import org.apache.sis.internal.sql.feature.InfoStatements;
-import org.apache.sis.internal.sql.feature.ValueGetter;
+import org.apache.sis.storage.sql.feature.InfoStatements;
+import org.apache.sis.storage.sql.feature.ValueGetter;
import org.postgresql.util.PGobject;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/Postgres.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Postgres.java
similarity index 95%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/Postgres.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Postgres.java
index 453fa479cd..2bd05b89e2 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/Postgres.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/Postgres.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.util.Map;
import java.util.Locale;
@@ -29,14 +29,14 @@ import javax.sql.DataSource;
import java.util.logging.Level;
import org.opengis.geometry.Envelope;
import org.apache.sis.internal.feature.Geometries;
-import org.apache.sis.internal.sql.feature.BinaryEncoding;
-import org.apache.sis.internal.sql.feature.InfoStatements;
-import org.apache.sis.internal.sql.feature.TableReference;
-import org.apache.sis.internal.sql.feature.Column;
-import org.apache.sis.internal.sql.feature.Database;
-import org.apache.sis.internal.sql.feature.ValueGetter;
-import org.apache.sis.internal.sql.feature.Resources;
-import org.apache.sis.internal.sql.feature.SelectionClauseWriter;
+import org.apache.sis.storage.sql.feature.BinaryEncoding;
+import org.apache.sis.storage.sql.feature.InfoStatements;
+import org.apache.sis.storage.sql.feature.TableReference;
+import org.apache.sis.storage.sql.feature.Column;
+import org.apache.sis.storage.sql.feature.Database;
+import org.apache.sis.storage.sql.feature.ValueGetter;
+import org.apache.sis.storage.sql.feature.Resources;
+import org.apache.sis.storage.sql.feature.SelectionClauseWriter;
import org.apache.sis.internal.metadata.sql.Dialect;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.util.Version;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterFormat.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterFormat.java
similarity index 96%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterFormat.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterFormat.java
index 7d259ceb8c..f6f3ba5ee2 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterFormat.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterFormat.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import org.opengis.referencing.datum.PixelInCell;
-import org.apache.sis.internal.sql.feature.InfoStatements;
+import org.apache.sis.storage.sql.feature.InfoStatements;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterGetter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterGetter.java
similarity index 92%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterGetter.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterGetter.java
index 5fc9496f60..79a17bf171 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterGetter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterGetter.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.sql.ResultSet;
import java.io.InputStream;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.internal.sql.feature.BinaryEncoding;
-import org.apache.sis.internal.sql.feature.InfoStatements;
-import org.apache.sis.internal.sql.feature.ValueGetter;
+import org.apache.sis.storage.sql.feature.BinaryEncoding;
+import org.apache.sis.storage.sql.feature.InfoStatements;
+import org.apache.sis.storage.sql.feature.ValueGetter;
import org.apache.sis.coverage.grid.GridCoverage;
@@ -35,7 +35,7 @@ import org.apache.sis.coverage.grid.GridCoverage;
* @author Martin Desruisseaux (Geomatys)
* @version 1.2
*
- * @see org.apache.sis.internal.sql.feature.GeometryGetter
+ * @see org.apache.sis.storage.sql.feature.GeometryGetter
*
* @since 1.2
*/
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterReader.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterReader.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
index 5213e9cdad..b7b1f1eaf8 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterReader.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterReader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.util.List;
import java.util.Arrays;
@@ -48,7 +48,7 @@ import org.apache.sis.internal.coverage.j2d.ObservableImage;
import org.apache.sis.internal.referencing.j2d.AffineTransform2D;
import org.apache.sis.internal.storage.io.InputStreamArrayGetter;
import org.apache.sis.internal.storage.io.ChannelDataInput;
-import org.apache.sis.internal.sql.feature.InfoStatements;
+import org.apache.sis.storage.sql.feature.InfoStatements;
import org.apache.sis.internal.util.Constants;
import org.apache.sis.internal.util.Numerics;
import org.apache.sis.measure.NumberRange;
@@ -56,7 +56,7 @@ import org.apache.sis.referencing.CRS;
import org.apache.sis.math.Vector;
import org.apache.sis.util.resources.Errors;
-import static org.apache.sis.internal.sql.postgis.Band.OPPOSITE_SIGN;
+import static org.apache.sis.storage.sql.postgis.Band.OPPOSITE_SIGN;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterWriter.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterWriter.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterWriter.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterWriter.java
index 1bdc5b7b91..4769d87c1b 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/RasterWriter.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/RasterWriter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.util.List;
import java.util.Arrays;
@@ -40,8 +40,8 @@ import org.apache.sis.image.PixelIterator;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridGeometry;
-import org.apache.sis.internal.sql.feature.Resources;
-import org.apache.sis.internal.sql.feature.InfoStatements;
+import org.apache.sis.storage.sql.feature.Resources;
+import org.apache.sis.storage.sql.feature.InfoStatements;
import org.apache.sis.internal.storage.io.ChannelDataOutput;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.operation.matrix.AffineTransforms2D;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/package-info.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/package-info.java
similarity index 89%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/package-info.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/package-info.java
index 27cbaa85b3..d7c8c35214 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/sql/postgis/package-info.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/postgis/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Specialization of {@code org.apache.sis.internal.sql.feature} for the
PostGIS database.
+ * Specialization of {@code org.apache.sis.storage.sql.feature} for the
PostGIS database.
* Provides also support for <cite>Well Known Binary</cite> (WKB) raster
format, which at
* the time of writing is PostGIS-specific (so the "well known" part of the
format name
* is not accurate).
@@ -27,4 +27,4 @@
* @version 1.4
* @since 1.1
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/BaseStreamWrapper.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/BaseStreamWrapper.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/BaseStreamWrapper.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/BaseStreamWrapper.java
index c272dc16b8..75d84d5902 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/BaseStreamWrapper.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/BaseStreamWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.stream;
+package org.apache.sis.util.stream;
import java.util.stream.BaseStream;
import org.apache.sis.util.ArgumentChecks;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/DeferredStream.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/DeferredStream.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/DeferredStream.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/DeferredStream.java
index e805c5e731..d147095505 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/DeferredStream.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/DeferredStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.stream;
+package org.apache.sis.util.stream;
import java.util.Spliterator;
import java.util.stream.Stream;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/DoubleStreamWrapper.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/DoubleStreamWrapper.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/DoubleStreamWrapper.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/DoubleStreamWrapper.java
index 7143752446..6cfba6a8f9 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/DoubleStreamWrapper.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/DoubleStreamWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.stream;
+package org.apache.sis.util.stream;
import java.util.DoubleSummaryStatistics;
import java.util.OptionalDouble;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/PaginedDoubleStream.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedDoubleStream.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/PaginedDoubleStream.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedDoubleStream.java
index 1367ce37be..cb7f9df804 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/PaginedDoubleStream.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedDoubleStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.stream;
+package org.apache.sis.util.stream;
import java.util.function.DoublePredicate;
import java.util.function.DoubleUnaryOperator;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/PaginedStream.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedStream.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/PaginedStream.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedStream.java
index 872ab0aa6f..bb90d86ece 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/PaginedStream.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/PaginedStream.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.stream;
+package org.apache.sis.util.stream;
import java.util.Comparator;
import java.util.function.Predicate;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/StreamWrapper.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/StreamWrapper.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/StreamWrapper.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/StreamWrapper.java
index 1c2f73bdb7..d4623bd0be 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/StreamWrapper.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/StreamWrapper.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.stream;
+package org.apache.sis.util.stream;
import java.util.Comparator;
import java.util.Iterator;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/package-info.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/package-info.java
similarity index 96%
rename from
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/package-info.java
rename to
endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/package-info.java
index eee85d4d93..3856f0068b 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/internal/stream/package-info.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/util/stream/package-info.java
@@ -30,4 +30,4 @@
* @version 1.1
* @since 1.1
*/
-package org.apache.sis.internal.stream;
+package org.apache.sis.util.stream;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
index 8649b4145d..6e3471de42 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/SQLStoreTest.java
@@ -32,8 +32,8 @@ import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.internal.feature.AttributeConvention;
-import org.apache.sis.internal.sql.feature.SchemaModifier;
-import org.apache.sis.internal.sql.feature.TableReference;
+import org.apache.sis.storage.sql.feature.SchemaModifier;
+import org.apache.sis.storage.sql.feature.TableReference;
import org.apache.sis.test.sql.TestDatabase;
import org.apache.sis.test.TestUtilities;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/GeometryGetterTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/GeometryGetterTest.java
similarity index 97%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/GeometryGetterTest.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/GeometryGetterTest.java
index 1369d1312b..6af6962f51 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/GeometryGetterTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/GeometryGetterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.nio.ByteBuffer;
import java.sql.Connection;
@@ -124,7 +124,7 @@ public final class GeometryGetterTest extends TestCase {
/**
* Compares WKB with WKT parsing using the {@code features."Geometries"}
view of test database.
* This test is <em>not</em> executed by this {@code GeometryGetterTest}
class. This is a method
- * to be invoked from {@linkplain
org.apache.sis.internal.sql.postgis.PostgresTest#testGeometryGetter
+ * to be invoked from {@linkplain
org.apache.sis.storage.sql.postgis.PostgresTest#testGeometryGetter
* another test class} having a connection to a database.
*
* @param connection connection to the database.
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/ResultSetMock.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/ResultSetMock.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/ResultSetMock.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/ResultSetMock.java
index b93c76db77..d2c1bd5eb4 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/ResultSetMock.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/ResultSetMock.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.sql.ResultSet;
import java.lang.reflect.Proxy;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/SelectionClauseWriterTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/SelectionClauseWriterTest.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
index b38b6c0ad8..d8f44d64a6 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/SelectionClauseWriterTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/SelectionClauseWriterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.util.List;
import org.apache.sis.geometry.GeneralEnvelope;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/TemporalValueGetterTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/TemporalValueGetterTest.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
index d90873b74c..fb79cf1afa 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/feature/TemporalValueGetterTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/TemporalValueGetterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.feature;
+package org.apache.sis.storage.sql.feature;
import java.sql.Connection;
import java.sql.ResultSet;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/BandTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/BandTest.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/BandTest.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/BandTest.java
index e28f65c93f..6e1e7a053e 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/BandTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/BandTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.awt.image.DataBuffer;
import org.apache.sis.test.TestCase;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/PostgresTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
similarity index 96%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/PostgresTest.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
index 1a114b6ad3..1546f69b2b 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/PostgresTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/PostgresTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.util.List;
import java.util.stream.Stream;
@@ -41,8 +41,8 @@ import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.sql.SQLStoreTest;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.internal.storage.io.ChannelDataInput;
-import org.apache.sis.internal.sql.feature.BinaryEncoding;
-import org.apache.sis.internal.sql.feature.GeometryGetterTest;
+import org.apache.sis.storage.sql.feature.BinaryEncoding;
+import org.apache.sis.storage.sql.feature.GeometryGetterTest;
import org.apache.sis.internal.feature.jts.JTS;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.referencing.crs.HardCodedCRS;
@@ -145,7 +145,7 @@ public final class PostgresTest extends TestCase {
}
/**
- * Tests {@link org.apache.sis.internal.sql.feature.InfoStatements}.
+ * Tests {@link org.apache.sis.storage.sql.feature.InfoStatements}.
*
* @throws Exception if an error occurred while testing the database.
*/
@@ -160,7 +160,7 @@ public final class PostgresTest extends TestCase {
}
/**
- * Tests {@link org.apache.sis.internal.sql.feature.GeometryGetter}
+ * Tests {@link org.apache.sis.storage.sql.feature.GeometryGetter}
* in the context of querying a database.
*
* @throws Exception if an error occurred while testing the database.
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/RasterReaderTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/RasterReaderTest.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/RasterReaderTest.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/RasterReaderTest.java
index e96f0c2989..fee6fd0270 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/RasterReaderTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/RasterReaderTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.util.Arrays;
import java.awt.image.RenderedImage;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/RasterWriterTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/RasterWriterTest.java
similarity index 98%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/RasterWriterTest.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/RasterWriterTest.java
index 8c5234cdee..636e626af0 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/RasterWriterTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/RasterWriterTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.awt.image.Raster;
import java.io.IOException;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/SpatialFeatures.sql
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/SpatialFeatures.sql
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/SpatialFeatures.sql
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/SpatialFeatures.sql
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/TestRaster.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/TestRaster.java
similarity index 99%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/TestRaster.java
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/TestRaster.java
index f7309a75dc..c486a98b49 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/TestRaster.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/TestRaster.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.sql.postgis;
+package org.apache.sis.storage.sql.postgis;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/raster-ushort.wkb
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/raster-ushort.wkb
similarity index 100%
rename from
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/internal/sql/postgis/raster-ushort.wkb
rename to
endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/postgis/raster-ushort.wkb
