[jdbc-driver] Moves classes from package acolyte to acolyte.jdbc.…

… Classes in former package are deprecated, and will be removed in future release.
cchantep · Jul 3, 2014 · 9c261f1 · 9c261f1
1 parent 91a991c
commit 9c261f1
Show file tree

Hide file tree

Showing 89 changed files with 11,643 additions and 365 deletions.
diff --git a/faq.md b/faq.md
@@ -9,7 +9,7 @@ To supports this behaviour, to return rows when you consider statement to be a q
 Using composite handler, you can specify it using detection pattern(s) (regular expressions):
 
 ```java
-import acolyte.CompositeHandler;
+import acolyte.jdbc.CompositeHandler;
 
 CompositeHandler handler = CompositeHandler.empty().
   // Considers as query if starts with 'SELECT ' or contains 'EXEC fetch_data'
@@ -23,7 +23,7 @@ In previous example, handler is given different patterns. In such case, order in
 Equivalent with the Scala DSL is:
 
 ```scala
-import acolyte.Acolyte.handleStatement
+import acolyte.jdbc.Acolyte.handleStatement
 
 val handler = handleStatement.
   withQueryDetection("^SELECT ", "EXEC fetch_data"). 
@@ -33,8 +33,8 @@ val handler = handleStatement.
 With Scala DSL, if you want all statements to be considered as queries, you can use:
 
 ```scala
-import acolyte.QueryExecution
+import acolyte.jdbc.QueryExecution
-import acolyte.Acolyte.handleQuery
+import acolyte.jdbc.Acolyte.handleQuery
 
 val handler = handleQuery { e: QueryExecution =>
   // handleQueries
@@ -55,16 +55,16 @@ If you just need to mockup a result containing only 1 row with 1 column, single
 Example:
 ```
 overloaded method value rowList6 with alternatives:
-[error]   [A, B, C, D, E, F](x$1: acolyte.RowList.Column[A], x$2: acolyte.RowList.Column[B], x$3: acolyte.RowList.Column[C], x$4: acolyte.RowList.Column[D], x$5: acolyte.RowList.Column[E], x$6: acolyte.RowList.Column[F])acolyte.RowList6[A,B,C,D,E,F] <and>
+[error]   [A, B, C, D, E, F](x$1: acolyte.jdbc.RowList.Column[A], x$2: acolyte.jdbc.RowList.Column[B], x$3: acolyte.jdbc.RowList.Column[C], x$4: acolyte.jdbc.RowList.Column[D], x$5: acolyte.jdbc.RowList.Column[E], x$6: acolyte.jdbc.RowList.Column[F])acolyte.jdbc.RowList6[A,B,C,D,E,F] <and>
-[error]   [A, B, C, D, E, F](x$1: Class[A], x$2: Class[B], x$3: Class[C], x$4: Class[D], x$5: Class[E], x$6: Class[F])acolyte.RowList6[A,B,C,D,E,F]
+[error]   [A, B, C, D, E, F](x$1: Class[A], x$2: Class[B], x$3: Class[C], x$4: Class[D], x$5: Class[E], x$6: Class[F])acolyte.jdbc.RowList6[A,B,C,D,E,F]
 [error]  cannot be applied to ((Class[String], String), (Class[String], String), (Class[String], String), (Class[String], String), (Class[String], String), (Class[String], String))
 ```
 
-It occurs when `acolyte.Implicits.PairAsColumn` is missing while using 
+It occurs when `acolyte.jdbc.Implicits.PairAsColumn` is missing while using 
 pimped Scala syntax to declare row list:
 
 ```scala
-import acolyte.RowLists.rowList6
+import acolyte.jdbc.RowLists.rowList6
 
 // Corresponding to error example
 // - will raise compilation error
@@ -80,8 +80,8 @@ rowList6(
 Proper import simply fixes that:
 
 ```scala
-import acolyte.RowLists.rowList6
+import acolyte.jdbc.RowLists.rowList6
-import acolyte.Implicits.PairAsColumn // or acolyte.Implicits._
+import acolyte.jdbc.Implicits.PairAsColumn // or acolyte.jdbc.Implicits._
 
 rowList6( // Now it's ok
   classOf[String] -> "col1", 

diff --git a/jdbc-driver/src/main/java/acolyte/AbstractCompositeHandler.java b/jdbc-driver/src/main/java/acolyte/AbstractCompositeHandler.java
@@ -13,7 +13,9 @@
  * Base for rule-based (immutable/thread-safe) statement handler.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.AbstractCompositeHandler}
  */
+@Deprecated
 public abstract class AbstractCompositeHandler<T extends AbstractCompositeHandler> implements StatementHandler {
 
     // --- Properties ---

diff --git a/jdbc-driver/src/main/java/acolyte/AbstractResultSet.java b/jdbc-driver/src/main/java/acolyte/AbstractResultSet.java
@@ -29,7 +29,9 @@
  * Acolyte base resultset.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.AbstractResultSet}
  */
+@Deprecated
 public abstract class AbstractResultSet implements java.sql.ResultSet {
 
     // --- Properties ---

diff --git a/jdbc-driver/src/main/java/acolyte/AbstractStatement.java b/jdbc-driver/src/main/java/acolyte/AbstractStatement.java
@@ -20,7 +20,9 @@
  * Acolyte base statement.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.AbstractStatement}
  */
+@Deprecated
 abstract class AbstractStatement implements java.sql.Statement {
     // --- Shared ---
 

diff --git a/jdbc-driver/src/main/java/acolyte/CallableStatement.java b/jdbc-driver/src/main/java/acolyte/CallableStatement.java
@@ -32,7 +32,9 @@
  * Acolyte callable statement.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.CallableStatement}
  */
+@Deprecated
 public final class CallableStatement 
     extends PreparedStatement implements java.sql.CallableStatement {
 

diff --git a/jdbc-driver/src/main/java/acolyte/Column.java b/jdbc-driver/src/main/java/acolyte/Column.java
@@ -7,7 +7,9 @@
  * Column meta data.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@line acolyte.jdbc.Column}
  */
+@Deprecated
 public final class Column<T> {
     // --- Properties ---
 

diff --git a/jdbc-driver/src/main/java/acolyte/CompositeHandler.java b/jdbc-driver/src/main/java/acolyte/CompositeHandler.java
@@ -13,7 +13,9 @@
  * Default implementation for composite handler.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.CompositeHandler}
  */
+@Deprecated
 public class CompositeHandler 
     extends AbstractCompositeHandler<CompositeHandler> {
 

diff --git a/jdbc-driver/src/main/java/acolyte/Connection.java b/jdbc-driver/src/main/java/acolyte/Connection.java
@@ -27,7 +27,9 @@
  * Acolyte connection.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.Connection}
  */
+@Deprecated
 public final class Connection implements java.sql.Connection {
     // --- Properties ---
 

diff --git a/jdbc-driver/src/main/java/acolyte/ConnectionHandler.java b/jdbc-driver/src/main/java/acolyte/ConnectionHandler.java
@@ -5,7 +5,9 @@
  *
  * @author Cedric Chantepie
  * @see StatementHandler
+ * @deprecated Use {@link acolyte.jdbc.ConnectionHandler}
  */
+@Deprecated
 public interface ConnectionHandler {
 
     /**

diff --git a/jdbc-driver/src/main/java/acolyte/DatabaseMetaData.java b/jdbc-driver/src/main/java/acolyte/DatabaseMetaData.java
@@ -9,7 +9,9 @@
  * Acolyte meta-data.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.DatabaseMetaData}
  */
+@Deprecated
 public final class DatabaseMetaData implements java.sql.DatabaseMetaData {
     // --- Properties ---
 

diff --git a/jdbc-driver/src/main/java/acolyte/Defaults.java b/jdbc-driver/src/main/java/acolyte/Defaults.java
@@ -15,7 +15,9 @@
  * Acolyte defaults.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.Defaults}
  */
+@Deprecated
 final class Defaults {
 
     /**

diff --git a/jdbc-driver/src/main/java/acolyte/Driver.java b/jdbc-driver/src/main/java/acolyte/Driver.java
@@ -14,7 +14,9 @@
  * Acolyte driver.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.Driver}
  */
+@Deprecated
 public final class Driver implements java.sql.Driver {
     // --- Constants ---
 
@@ -34,16 +36,6 @@ public final class Driver implements java.sql.Driver {
     public static final HashMap<String,ConnectionHandler> handlers =
         new HashMap<String,ConnectionHandler>();
 
-    // --- Shared ---
-
-    static {
-        try {
-            java.sql.DriverManager.registerDriver(new Driver());
-        } catch (Exception e) {
-            throw new RuntimeException(e.getMessage());
-        } // end of catch
-    } // end of <cinit>
-
     // --- Driver impl ---
 
     /**

diff --git a/jdbc-driver/src/main/java/acolyte/ImmutableArray.java b/jdbc-driver/src/main/java/acolyte/ImmutableArray.java
@@ -18,7 +18,9 @@
  * Immutable Array implementation.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.ImmutableArray}
  */
+@Deprecated
 public final class ImmutableArray<T> implements Array {
     // --- Properties ---
 

diff --git a/jdbc-driver/src/main/java/acolyte/ParameterMetaData.java b/jdbc-driver/src/main/java/acolyte/ParameterMetaData.java
@@ -17,7 +17,9 @@
  * Acolyte parameter meta-data.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.ParameterMetaData}
  */
+@Deprecated
 public final class ParameterMetaData implements java.sql.ParameterMetaData {
     // --- Properties ---
 

diff --git a/jdbc-driver/src/main/java/acolyte/PreparedStatement.java b/jdbc-driver/src/main/java/acolyte/PreparedStatement.java
@@ -64,7 +64,9 @@
  * Acolyte prepared statement.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.PreparedStatement}
  */
+@Deprecated
 public class PreparedStatement 
     extends AbstractStatement implements java.sql.PreparedStatement {
 

diff --git a/jdbc-driver/src/main/java/acolyte/QueryResult.java b/jdbc-driver/src/main/java/acolyte/QueryResult.java
@@ -6,7 +6,9 @@
  * Query result.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.QueryResult}
  */
+@Deprecated
 public interface QueryResult extends Result<QueryResult> {
 
     /**

diff --git a/jdbc-driver/src/main/java/acolyte/Result.java b/jdbc-driver/src/main/java/acolyte/Result.java
@@ -6,7 +6,9 @@
  * Row list result.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.Result}
  */
+@Deprecated
 public interface Result<SELF extends Result> {
 
     /**

diff --git a/jdbc-driver/src/main/java/acolyte/Row.java b/jdbc-driver/src/main/java/acolyte/Row.java
@@ -4,7 +4,9 @@
 
 /**
  * Row marker interface
+ * @deprecated use {@line acolyte.jdbc.Row}
  */
+@Deprecated
 public interface Row {
     /**
      * Returns information for cell(s) of row.

diff --git a/jdbc-driver/src/main/java/acolyte/Row1.java b/jdbc-driver/src/main/java/acolyte/Row1.java
@@ -9,7 +9,9 @@
 
 /**
  * Row with 1 cell.
+ * @deprecated Use {@line acolyte.jdbc.Row1}
  */
+@Deprecated
 public final class Row1<A> implements Row {
     // --- Properties ---
 

diff --git a/jdbc-driver/src/main/java/acolyte/RowList.java b/jdbc-driver/src/main/java/acolyte/RowList.java
@@ -25,7 +25,9 @@
  * Type-safe list of row.
  *
  * @author Cedric Chantepie
+ * @deprecated use {@link acolyte.jdbc.RowList}
  */
+@Deprecated
 public abstract class RowList<R extends Row> {
 
     /**

diff --git a/jdbc-driver/src/main/java/acolyte/Savepoint.java b/jdbc-driver/src/main/java/acolyte/Savepoint.java
@@ -7,7 +7,9 @@
  * Acolyte savepoint.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.Savepoint}
  */
+@Deprecated
 public final class Savepoint implements java.sql.Savepoint {
     // --- Properties ---
 

diff --git a/jdbc-driver/src/main/java/acolyte/StatementHandler.java b/jdbc-driver/src/main/java/acolyte/StatementHandler.java
@@ -13,7 +13,9 @@
  * Statement handler: allow to process statement by 'hand' and return.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.StatementHandler}
  */
+@Deprecated
 public interface StatementHandler {
     /**
      * When given |sql| query is executed against Acolyte connection ...

diff --git a/jdbc-driver/src/main/java/acolyte/UpdateResult.java b/jdbc-driver/src/main/java/acolyte/UpdateResult.java
@@ -6,7 +6,9 @@
  * Update result.
  *
  * @author Cedric Chantepie
+ * @deprecated Use {@link acolyte.jdbc.UpdateResult}
  */
+@Deprecated
 public final class UpdateResult implements Result<UpdateResult> {
     // --- Shared ---