sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/03: Regroup the SQL classes in "org.apache.sis.internal.sql.feature" package.
Date Wed, 04 Jul 2018 16:08:14 GMT
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 188ba7ca1d572801146ff9c1420e010f91d94212
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Tue Jul 3 17:21:25 2018 +0200

    Regroup the SQL classes in "org.apache.sis.internal.sql.feature" package.
---
 .../sql/{reverse => feature}/CachedResultSet.java  |  2 +-
 .../sql/{reverse => feature}/ColumnMetaModel.java  |  3 +-
 .../sql/{reverse => feature}/DataBaseModel.java    |  6 ++--
 .../sis/internal/sql/{ => feature}/Dialect.java    |  3 +-
 .../sql/{reverse => feature}/InsertRelation.java   |  2 +-
 .../{reverse => feature}/MetaDataConstants.java    |  2 +-
 .../sql/{reverse => feature}/MetaModel.java        |  2 +-
 .../sql/{reverse => feature}/PrimaryKey.java       |  3 +-
 .../sql/{reverse => feature}/QueryFeatureSet.java  |  2 +-
 .../{reverse => feature}/RelationMetaModel.java    |  2 +-
 .../sql/{reverse => feature}/SchemaMetaModel.java  |  2 +-
 .../{ => feature}/SingleAttributeTypeBuilder.java  |  4 +--
 .../sql/{reverse => feature}/TableMetaModel.java   |  2 +-
 .../internal/sql/{ => feature}/package-info.java   |  2 +-
 .../sis/internal/sql/postgres/PostgresDialect.java |  6 ++--
 .../sis/internal/sql/postgres/PostgresStore.java   |  4 +--
 .../sis/internal/sql/reverse/package-info.java     | 32 ----------------------
 .../java/org/apache/sis/storage/sql/SQLStore.java  |  2 +-
 .../org/apache/sis/storage/sql/package-info.java   |  2 +-
 19 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/CachedResultSet.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/CachedResultSet.java
similarity index 98%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/CachedResultSet.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/CachedResultSet.java
index 13c653a..4aba4fc 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/CachedResultSet.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/CachedResultSet.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/ColumnMetaModel.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/ColumnMetaModel.java
similarity index 98%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/ColumnMetaModel.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/ColumnMetaModel.java
index 5970f9e..6ff5453 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/ColumnMetaModel.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/ColumnMetaModel.java
@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.sql.reverse;
+package org.apache.sis.internal.sql.feature;
 
-import org.apache.sis.internal.sql.Dialect;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/DataBaseModel.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/DataBaseModel.java
similarity index 99%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/DataBaseModel.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/DataBaseModel.java
index 0823140..5f73ec4 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/DataBaseModel.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/DataBaseModel.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -45,9 +45,7 @@ import org.apache.sis.feature.builder.AttributeTypeBuilder;
 import org.apache.sis.feature.builder.FeatureTypeBuilder;
 import org.apache.sis.feature.builder.PropertyTypeBuilder;
 import org.apache.sis.internal.feature.Geometries;
-import org.apache.sis.internal.sql.Dialect;
-import org.apache.sis.internal.sql.SingleAttributeTypeBuilder;
-import org.apache.sis.internal.sql.reverse.MetaDataConstants.*;
+import org.apache.sis.internal.sql.feature.MetaDataConstants.*;
 import org.apache.sis.storage.sql.SQLStore;
 import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.DataStoreException;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/Dialect.java b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Dialect.java
similarity index 98%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/Dialect.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Dialect.java
index fcc6cb9..17f9547 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/Dialect.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/Dialect.java
@@ -14,14 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sis.internal.sql;
+package org.apache.sis.internal.sql.feature;
 
 import java.util.Map;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.internal.sql.reverse.ColumnMetaModel;
 import org.apache.sis.storage.DataStoreException;
 
 
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/InsertRelation.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/InsertRelation.java
similarity index 96%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/InsertRelation.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/InsertRelation.java
index 47becf9..2d494d0 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/InsertRelation.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/InsertRelation.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import org.opengis.feature.Feature;
 
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/MetaDataConstants.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/MetaDataConstants.java
similarity index 99%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/MetaDataConstants.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/MetaDataConstants.java
index d8eccef..393785b 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/MetaDataConstants.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/MetaDataConstants.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 
 /**
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/MetaModel.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/MetaModel.java
similarity index 98%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/MetaModel.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/MetaModel.java
index 94aa43f..880437e 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/MetaModel.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/MetaModel.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import java.util.Iterator;
 import org.apache.sis.util.CharSequences;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/PrimaryKey.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/PrimaryKey.java
similarity index 97%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/PrimaryKey.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/PrimaryKey.java
index 543082b..ff2667a 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/PrimaryKey.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -22,7 +22,6 @@ import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
-import org.apache.sis.internal.sql.Dialect;
 import org.apache.sis.storage.DataStoreException;
 
 
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/QueryFeatureSet.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/QueryFeatureSet.java
similarity index 98%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/QueryFeatureSet.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/QueryFeatureSet.java
index d40fe67..d2ce7d0 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/QueryFeatureSet.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/QueryFeatureSet.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/RelationMetaModel.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/RelationMetaModel.java
similarity index 98%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/RelationMetaModel.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/RelationMetaModel.java
index ed64d6c..ab09cf3 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/RelationMetaModel.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/RelationMetaModel.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import org.apache.sis.util.ArgumentChecks;
 
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/SchemaMetaModel.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/SchemaMetaModel.java
similarity index 97%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/SchemaMetaModel.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/SchemaMetaModel.java
index f53866a..21b4a60 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/SchemaMetaModel.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/SchemaMetaModel.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/SingleAttributeTypeBuilder.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/SingleAttributeTypeBuilder.java
similarity index 98%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/SingleAttributeTypeBuilder.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/SingleAttributeTypeBuilder.java
index 9179971..ad22d65 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/SingleAttributeTypeBuilder.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/SingleAttributeTypeBuilder.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;
+package org.apache.sis.internal.sql.feature;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -44,7 +44,7 @@ import static org.apache.sis.feature.AbstractIdentifiedType.*;
  *
  * @todo Is this class really needed?
  */
-public class SingleAttributeTypeBuilder {
+public final class SingleAttributeTypeBuilder {
     /**
      * Properties (name, description, …) to give to the attribute type constructor.
      */
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/TableMetaModel.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/TableMetaModel.java
similarity index 98%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/TableMetaModel.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/TableMetaModel.java
index e80bf45..efb4239 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/TableMetaModel.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/TableMetaModel.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.reverse;
+package org.apache.sis.internal.sql.feature;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/package-info.java b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/package-info.java
similarity index 96%
rename from storage/sis-sql/src/main/java/org/apache/sis/internal/sql/package-info.java
rename to storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/package-info.java
index 6c3aa9c..4b8369b 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/package-info.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/feature/package-info.java
@@ -29,4 +29,4 @@
  * @since   1.0
  * @module
  */
-package org.apache.sis.internal.sql;
+package org.apache.sis.internal.sql.feature;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java
index 6eb207d..6bd82cd 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresDialect.java
@@ -23,10 +23,10 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.internal.sql.SingleAttributeTypeBuilder;
-import org.apache.sis.internal.sql.reverse.ColumnMetaModel;
+import org.apache.sis.internal.sql.feature.SingleAttributeTypeBuilder;
+import org.apache.sis.internal.sql.feature.ColumnMetaModel;
 import org.apache.sis.storage.DataStoreException;
-import org.apache.sis.internal.sql.Dialect;
+import org.apache.sis.internal.sql.feature.Dialect;
 
 
 /**
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java
index be3b7e0..5174621 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/postgres/PostgresStore.java
@@ -23,8 +23,8 @@ import org.apache.sis.storage.sql.SQLQuery;
 import org.apache.sis.storage.DataStoreException;
 import org.apache.sis.storage.event.ChangeEvent;
 import org.apache.sis.storage.event.ChangeListener;
-import org.apache.sis.internal.sql.reverse.DataBaseModel;
-import org.apache.sis.internal.sql.reverse.QueryFeatureSet;
+import org.apache.sis.internal.sql.feature.DataBaseModel;
+import org.apache.sis.internal.sql.feature.QueryFeatureSet;
 import org.apache.sis.storage.FeatureSet;
 import org.apache.sis.storage.StorageConnector;
 
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/package-info.java
b/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/package-info.java
deleted file mode 100644
index 46773e7..0000000
--- a/storage/sis-sql/src/main/java/org/apache/sis/internal/sql/reverse/package-info.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-
-/**
- * Inspect a database schema.
- *
- * <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)
- * @version 1.0
- * @since   1.0
- * @module
- */
-package org.apache.sis.internal.sql.reverse;
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java b/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java
index 37369d7..991c4b1 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/SQLStore.java
@@ -24,7 +24,7 @@ import org.apache.sis.storage.StorageConnector;
 
 
 /**
- * Parent store class for {@code DataStore} implementations using JDBC backend.
+ * A data store capable to read and create features from a database.
  *
  * <div class="warning">This is an experimental class,
  * not yet target for any Apache SIS release at this time.</div>
diff --git a/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java b/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java
index e749a39..4c3499b 100644
--- a/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java
+++ b/storage/sis-sql/src/main/java/org/apache/sis/storage/sql/package-info.java
@@ -17,7 +17,7 @@
 
 
 /**
- * Data stores that create features from a JDBC connection to a database.
+ * Data store capable to read and create features from a JDBC connection to a database.
  *
  * <div class="warning">This is an experimental package,
  * not yet target for any Apache SIS release at this time.</div>


Mime
View raw message