sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jso...@apache.org
Subject [sis] branch geoapi-4.0 updated: SQLStore : accept a DataStore instead of SQLStore in Database methods
Date Mon, 15 Jun 2020 12:29:57 GMT
This is an automated email from the ASF dual-hosted git repository.

jsorel pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git


The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
     new e86d55d  SQLStore : accept a DataStore instead of SQLStore in Database methods
e86d55d is described below

commit e86d55dc1b9c3d0c1fd9a4508db0a3e277d9c8f3
Author: jsorel <johann.sorel@geomatys.com>
AuthorDate: Mon Jun 15 14:28:18 2020 +0200

    SQLStore : accept a DataStore instead of SQLStore in Database methods
---
 .../src/main/java/org/apache/sis/internal/sql/feature/Database.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Database.java
b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Database.java
index f908a74..8cf4bfd 100644
--- a/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Database.java
+++ b/storage/sis-sqlstore/src/main/java/org/apache/sis/internal/sql/feature/Database.java
@@ -30,7 +30,7 @@ import org.opengis.util.GenericName;
 import org.apache.sis.internal.metadata.sql.Reflection;
 import org.apache.sis.internal.storage.MetadataBuilder;
 import org.apache.sis.internal.util.UnmodifiableArrayList;
-import org.apache.sis.storage.sql.SQLStore;
+import org.apache.sis.storage.DataStore;
 import org.apache.sis.storage.Resource;
 import org.apache.sis.storage.FeatureSet;
 import org.apache.sis.storage.FeatureNaming;
@@ -107,7 +107,7 @@ public final class Database {
      * @throws SQLException if a database error occurred while reading metadata.
      * @throws DataStoreException if a logical error occurred while analyzing the database
structure.
      */
-    public Database(final SQLStore store, final Connection connection, final DataSource source,
+    public Database(final DataStore store, final Connection connection, final DataSource
source,
             final GenericName[] tableNames, final StoreListeners listeners)
             throws SQLException, DataStoreException
     {
@@ -205,7 +205,7 @@ public final class Database {
      * @return the table (never null).
      * @throws IllegalNameException if no table of the given name is found or if the name
is ambiguous.
      */
-    public final FeatureSet findTable(final SQLStore store, final String name) throws IllegalNameException
{
+    public final FeatureSet findTable(final DataStore store, final String name) throws IllegalNameException
{
         return tablesByNames.get(store, name);
     }
 


Mime
View raw message