Moved JDBC components to a separate package.

rapidoid · Nov 30, 2016 · f56fa9f · f56fa9f
1 parent dd75f89
commit f56fa9f
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 34 deletions.
diff --git a/rapidoid-commons/src/main/resources/rapidoid-classes.txt b/rapidoid-commons/src/main/resources/rapidoid-classes.txt
@@ -468,6 +468,12 @@ org.rapidoid.io.watch.FilesystemChangeQueueListener
 org.rapidoid.io.watch.Watch
 org.rapidoid.io.watch.WatcherThread
 org.rapidoid.io.watch.WatchingRefresherThread
+org.rapidoid.jdbc.C3P0ConnectionPool
+org.rapidoid.jdbc.ConnectionPool
+org.rapidoid.jdbc.JDBC
+org.rapidoid.jdbc.JdbcClient
+org.rapidoid.jdbc.JDBCConfig
+org.rapidoid.jdbc.NoConnectionPool
 org.rapidoid.job.CallbackExecutorJob
 org.rapidoid.job.ContextPreservingJobWrapper
 org.rapidoid.job.Jobs
@@ -671,12 +677,6 @@ org.rapidoid.sql.dsl.SQLSelectFromDSL
 org.rapidoid.sql.dsl.SQLSelectFromWhereDSL
 org.rapidoid.sql.dsl.SQLUpdateDSL
 org.rapidoid.sql.dsl.SQLUpdateWhereDSL
-org.rapidoid.sql.JDBC
-org.rapidoid.sql.JdbcClient
-org.rapidoid.sql.JDBCConfig
-org.rapidoid.sql.pool.C3P0ConnectionPool
-org.rapidoid.sql.pool.ConnectionPool
-org.rapidoid.sql.pool.NoConnectionPool
 org.rapidoid.sql.SQL
 org.rapidoid.sql.SQLModule
 org.rapidoid.standalone.Main

diff --git a/rapidoid-http-server/src/main/java/org/rapidoid/setup/App.java b/rapidoid-http-server/src/main/java/org/rapidoid/setup/App.java
@@ -44,7 +44,7 @@
 import org.rapidoid.reverseproxy.Reverse;
 import org.rapidoid.scan.ClasspathUtil;
 import org.rapidoid.scan.Scan;
-import org.rapidoid.sql.JDBC;
+import org.rapidoid.jdbc.JDBC;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Msc;
 

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/jdbc/JDBCPoolC3P0Test.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/jdbc/JDBCPoolC3P0Test.java
@@ -26,9 +26,6 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
 import org.rapidoid.http.IsolatedIntegrationTest;
-import org.rapidoid.sql.JDBC;
-import org.rapidoid.sql.JdbcClient;
-import org.rapidoid.sql.pool.C3P0ConnectionPool;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Msc;
 

diff --git a/rapidoid-integration-tests/src/test/java/org/rapidoid/jdbc/SqlRoutesTest.java b/rapidoid-integration-tests/src/test/java/org/rapidoid/jdbc/SqlRoutesTest.java
@@ -26,7 +26,6 @@
 import org.rapidoid.config.Conf;
 import org.rapidoid.http.IsolatedIntegrationTest;
 import org.rapidoid.setup.App;
-import org.rapidoid.sql.JDBC;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.2.5")

diff --git a/...rapidoid/sql/pool/C3P0ConnectionPool.java → ...org/rapidoid/jdbc/C3P0ConnectionPool.java b/...rapidoid/sql/pool/C3P0ConnectionPool.java → ...org/rapidoid/jdbc/C3P0ConnectionPool.java
@@ -1,11 +1,10 @@
-package org.rapidoid.sql.pool;
+package org.rapidoid.jdbc;
 
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.config.Conf;
-import org.rapidoid.sql.JdbcClient;
 import org.rapidoid.u.U;
 
 import java.beans.PropertyVetoException;

diff --git a/...org/rapidoid/sql/pool/ConnectionPool.java → ...ava/org/rapidoid/jdbc/ConnectionPool.java b/...org/rapidoid/sql/pool/ConnectionPool.java → ...ava/org/rapidoid/jdbc/ConnectionPool.java
@@ -1,4 +1,4 @@
-package org.rapidoid.sql.pool;
+package org.rapidoid.jdbc;
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;

diff --git a/.../src/main/java/org/rapidoid/sql/JDBC.java → ...src/main/java/org/rapidoid/jdbc/JDBC.java b/.../src/main/java/org/rapidoid/sql/JDBC.java → ...src/main/java/org/rapidoid/jdbc/JDBC.java
@@ -1,4 +1,4 @@
-package org.rapidoid.sql;
+package org.rapidoid.jdbc;
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;

diff --git a/...ain/java/org/rapidoid/sql/JDBCConfig.java → ...in/java/org/rapidoid/jdbc/JDBCConfig.java b/...ain/java/org/rapidoid/sql/JDBCConfig.java → ...in/java/org/rapidoid/jdbc/JDBCConfig.java
@@ -1,4 +1,4 @@
-package org.rapidoid.sql;
+package org.rapidoid.jdbc;
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;

diff --git a/...ain/java/org/rapidoid/sql/JdbcClient.java → ...in/java/org/rapidoid/jdbc/JdbcClient.java b/...ain/java/org/rapidoid/sql/JdbcClient.java → ...in/java/org/rapidoid/jdbc/JdbcClient.java
@@ -1,12 +1,9 @@
-package org.rapidoid.sql;
+package org.rapidoid.jdbc;
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.log.Log;
-import org.rapidoid.sql.pool.C3P0ConnectionPool;
-import org.rapidoid.sql.pool.ConnectionPool;
-import org.rapidoid.sql.pool.NoConnectionPool;
 import org.rapidoid.u.U;
 
 import java.sql.*;

diff --git a/...g/rapidoid/sql/pool/NoConnectionPool.java → ...a/org/rapidoid/jdbc/NoConnectionPool.java b/...g/rapidoid/sql/pool/NoConnectionPool.java → ...a/org/rapidoid/jdbc/NoConnectionPool.java
@@ -1,4 +1,4 @@
-package org.rapidoid.sql.pool;
+package org.rapidoid.jdbc;
 
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/orm/ORM.java b/rapidoid-sql/src/main/java/org/rapidoid/orm/ORM.java
@@ -7,8 +7,8 @@
 import org.rapidoid.beany.Prop;
 import org.rapidoid.cls.Cls;
 import org.rapidoid.cls.TypeKind;
-import org.rapidoid.sql.JDBC;
-import org.rapidoid.sql.JdbcClient;
+import org.rapidoid.jdbc.JDBC;
+import org.rapidoid.jdbc.JdbcClient;
 import org.rapidoid.sql.SQL;
 import org.rapidoid.u.U;
 

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/SQL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/SQL.java
@@ -4,6 +4,8 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.Str;
+import org.rapidoid.jdbc.JDBC;
+import org.rapidoid.jdbc.JdbcClient;
 import org.rapidoid.sql.dsl.*;
 import org.rapidoid.u.U;
 

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/SQLModule.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/SQLModule.java
@@ -24,6 +24,8 @@
 import org.rapidoid.RapidoidThing;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
+import org.rapidoid.jdbc.JDBC;
+import org.rapidoid.jdbc.JdbcClient;
 import org.rapidoid.log.Log;
 
 @Authors("Nikolche Mihajlovski")

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLDeleteDSL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLDeleteDSL.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.collection.Coll;
 import org.rapidoid.commons.Str;
-import org.rapidoid.sql.JdbcClient;
+import org.rapidoid.jdbc.JdbcClient;
 import org.rapidoid.u.U;
 
 import java.util.List;

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLInsertDSL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLInsertDSL.java
@@ -23,7 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.commons.Str;
-import org.rapidoid.sql.JdbcClient;
+import org.rapidoid.jdbc.JdbcClient;
 import org.rapidoid.u.U;
 
 import java.util.Map;

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLSelectDSL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLSelectDSL.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.sql.JdbcClient;
+import org.rapidoid.jdbc.JdbcClient;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.3.0")

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLSelectFromDSL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLSelectFromDSL.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.sql.JdbcClient;
+import org.rapidoid.jdbc.JdbcClient;
 
 @Authors("Nikolche Mihajlovski")
 @Since("5.3.0")

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLSelectFromWhereDSL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLSelectFromWhereDSL.java
@@ -22,7 +22,7 @@
 
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.sql.JdbcClient;
+import org.rapidoid.jdbc.JdbcClient;
 import org.rapidoid.u.U;
 
 import java.util.List;

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLUpdateDSL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLUpdateDSL.java
@@ -23,7 +23,7 @@
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
 import org.rapidoid.collection.Coll;
-import org.rapidoid.sql.JdbcClient;
+import org.rapidoid.jdbc.JdbcClient;
 
 import java.util.Map;
 

diff --git a/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLUpdateWhereDSL.java b/rapidoid-sql/src/main/java/org/rapidoid/sql/dsl/SQLUpdateWhereDSL.java
@@ -24,7 +24,7 @@
 import org.rapidoid.annotation.Since;
 import org.rapidoid.collection.Coll;
 import org.rapidoid.commons.Str;
-import org.rapidoid.sql.JdbcClient;
+import org.rapidoid.jdbc.JdbcClient;
 import org.rapidoid.u.U;
 
 import java.util.Map;

diff --git a/rapidoid-sql/src/test/java/org/rapidoid/sql/test/JDBCTest.java b/rapidoid-sql/src/test/java/org/rapidoid/sql/test/JDBCTest.java
@@ -24,9 +24,9 @@
 import org.junit.Test;
 import org.rapidoid.annotation.Authors;
 import org.rapidoid.annotation.Since;
-import org.rapidoid.sql.JDBC;
-import org.rapidoid.sql.JdbcClient;
-import org.rapidoid.sql.pool.C3P0ConnectionPool;
+import org.rapidoid.jdbc.JDBC;
+import org.rapidoid.jdbc.JdbcClient;
+import org.rapidoid.jdbc.C3P0ConnectionPool;
 import org.rapidoid.u.U;
 import org.rapidoid.util.Msc;
 

diff --git a/rapidoid-web/src/main/java/org/rapidoid/goodies/X.java b/rapidoid-web/src/main/java/org/rapidoid/goodies/X.java
@@ -20,7 +20,7 @@
 import org.rapidoid.setup.App;
 import org.rapidoid.setup.On;
 import org.rapidoid.setup.Setup;
-import org.rapidoid.sql.JDBC;
+import org.rapidoid.jdbc.JDBC;
 import org.rapidoid.u.U;
 
 import javax.persistence.metamodel.EntityType;