Moved transaction handling classes to org.dalesbred.transaction.

EvidentSolutions · Apr 29, 2015 · 878d12e · 878d12e
1 parent 5b569cd
commit 878d12e
Show file tree

Hide file tree

Showing 38 changed files with 59 additions and 47 deletions.
diff --git a/dalesbred-junit/src/main/java/org/dalesbred/junit/TestDatabaseProvider.java b/dalesbred-junit/src/main/java/org/dalesbred/junit/TestDatabaseProvider.java
@@ -23,9 +23,9 @@
 package org.dalesbred.junit;
 
 import org.dalesbred.Database;
-import org.dalesbred.TransactionCallback;
 import org.dalesbred.connection.DriverManagerDataSourceProvider;
 import org.dalesbred.dialects.Dialect;
+import org.dalesbred.transaction.TransactionCallback;
 import org.jetbrains.annotations.NotNull;
 import org.junit.internal.AssumptionViolatedException;
 

diff --git a/dalesbred-junit/src/test/java/org/dalesbred/junit/TransactionalTestsTest.java b/dalesbred-junit/src/test/java/org/dalesbred/junit/TransactionalTestsTest.java
@@ -23,7 +23,7 @@
 package org.dalesbred.junit;
 
 import org.dalesbred.Database;
-import org.dalesbred.Propagation;
+import org.dalesbred.transaction.Propagation;
 import org.junit.Rule;
 import org.junit.Test;
 

diff --git a/dalesbred-junit/src/test/java/org/dalesbred/junit/TransactionalTestsWithProviderTest.java b/dalesbred-junit/src/test/java/org/dalesbred/junit/TransactionalTestsWithProviderTest.java
@@ -23,7 +23,7 @@
 package org.dalesbred.junit;
 
 import org.dalesbred.Database;
-import org.dalesbred.Propagation;
+import org.dalesbred.transaction.Propagation;
 import org.junit.Rule;
 import org.junit.Test;
 

diff --git a/dalesbred/src/main/java/org/dalesbred/Database.java b/dalesbred/src/main/java/org/dalesbred/Database.java
@@ -31,8 +31,7 @@
 import org.dalesbred.instantiation.TypeConversionRegistry;
 import org.dalesbred.results.*;
 import org.dalesbred.support.proxy.TransactionalProxyFactory;
-import org.dalesbred.transaction.DefaultTransactionManager;
-import org.dalesbred.transaction.TransactionManager;
+import org.dalesbred.transaction.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/dalesbred/src/main/java/org/dalesbred/dialects/Dialect.java b/dalesbred/src/main/java/org/dalesbred/dialects/Dialect.java
@@ -22,12 +22,17 @@
 
 package org.dalesbred.dialects;
 
-import org.dalesbred.*;
+import org.dalesbred.DatabaseException;
+import org.dalesbred.DatabaseSQLException;
+import org.dalesbred.EnumMode;
 import org.dalesbred.connection.ConnectionProvider;
 import org.dalesbred.connection.DataSourceConnectionProvider;
 import org.dalesbred.instantiation.TypeConversion;
 import org.dalesbred.instantiation.TypeConversionRegistry;
 import org.dalesbred.transaction.TransactionManager;
+import org.dalesbred.transaction.TransactionRollbackException;
+import org.dalesbred.transaction.TransactionSerializationException;
+import org.dalesbred.transaction.TransactionSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/...ain/java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptor.java b/...ain/java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptor.java
@@ -25,10 +25,10 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.dalesbred.Database;
-import org.dalesbred.TransactionSettings;
-import org.dalesbred.Transactional;
 import org.dalesbred.internal.utils.Require;
 import org.dalesbred.support.guice.GuiceSupport;
+import org.dalesbred.transaction.TransactionSettings;
+import org.dalesbred.transaction.Transactional;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/dalesbred/src/main/java/org/dalesbred/support/guice/GuiceSupport.java b/dalesbred/src/main/java/org/dalesbred/support/guice/GuiceSupport.java
@@ -27,8 +27,8 @@
 import com.google.inject.Provider;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.dalesbred.Database;
-import org.dalesbred.Transactional;
 import org.dalesbred.support.aopalliance.AopAllianceTransactionalMethodInterceptor;
+import org.dalesbred.transaction.Transactional;
 import org.jetbrains.annotations.NotNull;
 
 import static com.google.inject.matcher.Matchers.annotatedWith;

diff --git a/dalesbred/src/main/java/org/dalesbred/support/proxy/TransactionalProxyFactory.java b/dalesbred/src/main/java/org/dalesbred/support/proxy/TransactionalProxyFactory.java
@@ -23,9 +23,9 @@
 package org.dalesbred.support.proxy;
 
 import org.dalesbred.Database;
-import org.dalesbred.TransactionSettings;
-import org.dalesbred.Transactional;
 import org.dalesbred.internal.utils.Require;
+import org.dalesbred.transaction.TransactionSettings;
+import org.dalesbred.transaction.Transactional;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/dalesbred/src/main/java/org/dalesbred/support/spring/DalesbredSpringAnnotationParser.java b/dalesbred/src/main/java/org/dalesbred/support/spring/DalesbredSpringAnnotationParser.java
@@ -22,7 +22,7 @@
 
 package org.dalesbred.support.spring;
 
-import org.dalesbred.Transactional;
+import org.dalesbred.transaction.Transactional;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.transaction.annotation.TransactionAnnotationParser;

diff --git a/dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionContext.java b/dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionContext.java
@@ -22,7 +22,7 @@
 
 package org.dalesbred.support.spring;
 
-import org.dalesbred.TransactionContext;
+import org.dalesbred.transaction.TransactionContext;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.transaction.TransactionStatus;
 

diff --git a/dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionManager.java b/dalesbred/src/main/java/org/dalesbred/support/spring/SpringTransactionManager.java
@@ -22,11 +22,11 @@
 
 package org.dalesbred.support.spring;
 
-import org.dalesbred.*;
+import org.dalesbred.DatabaseException;
 import org.dalesbred.connection.ConnectionProvider;
 import org.dalesbred.dialects.Dialect;
 import org.dalesbred.internal.utils.Require;
-import org.dalesbred.transaction.TransactionManager;
+import org.dalesbred.transaction.*;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.jdbc.datasource.ConnectionHolder;
 import org.springframework.jdbc.datasource.DataSourceUtils;

diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/AbstractTransactionManager.java b/dalesbred/src/main/java/org/dalesbred/transaction/AbstractTransactionManager.java
@@ -22,7 +22,6 @@
 
 package org.dalesbred.transaction;
 
-import org.dalesbred.*;
 import org.dalesbred.dialects.Dialect;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransaction.java b/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransaction.java
@@ -22,9 +22,6 @@
 
 package org.dalesbred.transaction;
 
-import org.dalesbred.TransactionCallback;
-import org.dalesbred.TransactionContext;
-import org.dalesbred.TransactionSerializationException;
 import org.dalesbred.dialects.Dialect;
 import org.dalesbred.internal.utils.Throwables;
 import org.jetbrains.annotations.NotNull;

diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransactionContext.java b/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransactionContext.java
@@ -22,7 +22,6 @@
 
 package org.dalesbred.transaction;
 
-import org.dalesbred.TransactionContext;
 import org.jetbrains.annotations.NotNull;
 
 import java.sql.Connection;

diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransactionManager.java b/dalesbred/src/main/java/org/dalesbred/transaction/DefaultTransactionManager.java
@@ -22,10 +22,6 @@
 
 package org.dalesbred.transaction;
 
-import org.dalesbred.Isolation;
-import org.dalesbred.Propagation;
-import org.dalesbred.TransactionCallback;
-import org.dalesbred.TransactionSettings;
 import org.dalesbred.connection.ConnectionProvider;
 import org.dalesbred.dialects.Dialect;
 import org.jetbrains.annotations.NotNull;

diff --git a/...rc/main/java/org/dalesbred/Isolation.java → .../org/dalesbred/transaction/Isolation.java b/...rc/main/java/org/dalesbred/Isolation.java → .../org/dalesbred/transaction/Isolation.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
 import org.intellij.lang.annotations.MagicConstant;
 import org.jetbrains.annotations.NotNull;

diff --git a/...lesbred/NoActiveTransactionException.java → ...saction/NoActiveTransactionException.java b/...lesbred/NoActiveTransactionException.java → ...saction/NoActiveTransactionException.java
@@ -20,8 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
+import org.dalesbred.DatabaseException;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/.../main/java/org/dalesbred/Propagation.java → ...rg/dalesbred/transaction/Propagation.java b/.../main/java/org/dalesbred/Propagation.java → ...rg/dalesbred/transaction/Propagation.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/SingleConnectionTransactionManager.java b/dalesbred/src/main/java/org/dalesbred/transaction/SingleConnectionTransactionManager.java
@@ -24,8 +24,6 @@
 
 import org.dalesbred.Database;
 import org.dalesbred.DatabaseException;
-import org.dalesbred.Isolation;
-import org.dalesbred.TransactionCallback;
 import org.dalesbred.dialects.Dialect;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/...va/org/dalesbred/TransactionCallback.java → ...bred/transaction/TransactionCallback.java b/...va/org/dalesbred/TransactionCallback.java → ...bred/transaction/TransactionCallback.java
@@ -20,8 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
+import org.dalesbred.Database;
 import org.jetbrains.annotations.NotNull;
 
 import java.sql.SQLException;

diff --git a/...ava/org/dalesbred/TransactionContext.java → ...sbred/transaction/TransactionContext.java b/...ava/org/dalesbred/TransactionContext.java → ...sbred/transaction/TransactionContext.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/dalesbred/src/main/java/org/dalesbred/transaction/TransactionManager.java b/dalesbred/src/main/java/org/dalesbred/transaction/TransactionManager.java
@@ -22,10 +22,6 @@
 
 package org.dalesbred.transaction;
 
-import org.dalesbred.Isolation;
-import org.dalesbred.Propagation;
-import org.dalesbred.TransactionCallback;
-import org.dalesbred.TransactionSettings;
 import org.dalesbred.dialects.Dialect;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...lesbred/TransactionRollbackException.java → ...saction/TransactionRollbackException.java b/...lesbred/TransactionRollbackException.java → ...saction/TransactionRollbackException.java
@@ -20,8 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
+import org.dalesbred.DatabaseSQLException;
 import org.jetbrains.annotations.NotNull;
 
 import java.sql.SQLException;

diff --git a/...ed/TransactionSerializationException.java → ...on/TransactionSerializationException.java b/...ed/TransactionSerializationException.java → ...on/TransactionSerializationException.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...va/org/dalesbred/TransactionSettings.java → ...bred/transaction/TransactionSettings.java b/...va/org/dalesbred/TransactionSettings.java → ...bred/transaction/TransactionSettings.java
@@ -20,8 +20,9 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
+import org.dalesbred.Database;
 import org.dalesbred.internal.utils.Require;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...ain/java/org/dalesbred/Transactional.java → .../dalesbred/transaction/Transactional.java b/...ain/java/org/dalesbred/Transactional.java → .../dalesbred/transaction/Transactional.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...rg/dalesbred/VoidTransactionCallback.java → .../transaction/VoidTransactionCallback.java b/...rg/dalesbred/VoidTransactionCallback.java → .../transaction/VoidTransactionCallback.java
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.dalesbred;
+package org.dalesbred.transaction;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseTest.java
@@ -25,6 +25,8 @@
 import org.dalesbred.dialects.HsqldbDialect;
 import org.dalesbred.results.ResultSetProcessor;
 import org.dalesbred.results.RowMapper;
+import org.dalesbred.transaction.Isolation;
+import org.dalesbred.transaction.Propagation;
 import org.junit.Rule;
 import org.junit.Test;
 

diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseTransactionIsolationTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseTransactionIsolationTest.java
@@ -24,10 +24,11 @@
 
 import org.dalesbred.testutils.LoggingController;
 import org.dalesbred.testutils.SuppressLogging;
+import org.dalesbred.transaction.TransactionSerializationException;
 import org.junit.Rule;
 import org.junit.Test;
 
-import static org.dalesbred.Isolation.SERIALIZABLE;
+import static org.dalesbred.transaction.Isolation.SERIALIZABLE;
 
 public class DatabaseTransactionIsolationTest {
 

diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseTransactionPropagationTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseTransactionPropagationTest.java
@@ -27,7 +27,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import static org.dalesbred.Propagation.*;
+import static org.dalesbred.transaction.Propagation.*;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 

diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseTransactionRetryTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseTransactionRetryTest.java
@@ -24,6 +24,8 @@
 
 import org.dalesbred.testutils.LoggingController;
 import org.dalesbred.testutils.SuppressLogging;
+import org.dalesbred.transaction.TransactionSerializationException;
+import org.dalesbred.transaction.TransactionSettings;
 import org.junit.Rule;
 import org.junit.Test;
 

diff --git a/dalesbred/src/test/java/org/dalesbred/DatabaseTransactionalProxyTest.java b/dalesbred/src/test/java/org/dalesbred/DatabaseTransactionalProxyTest.java
@@ -24,6 +24,9 @@
 
 import org.dalesbred.testutils.LoggingController;
 import org.dalesbred.testutils.SuppressLogging;
+import org.dalesbred.transaction.NoActiveTransactionException;
+import org.dalesbred.transaction.Propagation;
+import org.dalesbred.transaction.Transactional;
 import org.junit.Rule;
 import org.junit.Test;
 

diff --git a/dalesbred/src/test/java/org/dalesbred/IsolationTest.java b/dalesbred/src/test/java/org/dalesbred/IsolationTest.java
@@ -22,14 +22,15 @@
 
 package org.dalesbred;
 
+import org.dalesbred.transaction.Isolation;
 import org.junit.Test;
 
 import java.sql.Connection;
 import java.util.Collections;
 import java.util.List;
 
 import static java.util.Arrays.asList;
-import static org.dalesbred.Isolation.*;
+import static org.dalesbred.transaction.Isolation.*;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;

diff --git a/dalesbred/src/test/java/org/dalesbred/TestDatabaseProvider.java b/dalesbred/src/test/java/org/dalesbred/TestDatabaseProvider.java
@@ -26,6 +26,7 @@
 import com.google.inject.Module;
 import com.google.inject.name.Names;
 import org.dalesbred.connection.DriverManagerDataSourceProvider;
+import org.dalesbred.transaction.TransactionCallback;
 import org.jetbrains.annotations.NotNull;
 
 import javax.sql.DataSource;

diff --git a/dalesbred/src/test/java/org/dalesbred/TransactionSettingsTest.java b/dalesbred/src/test/java/org/dalesbred/TransactionSettingsTest.java
@@ -22,6 +22,10 @@
 
 package org.dalesbred;
 
+import org.dalesbred.transaction.Isolation;
+import org.dalesbred.transaction.Propagation;
+import org.dalesbred.transaction.TransactionSettings;
+import org.dalesbred.transaction.Transactional;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 

diff --git a/...java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptorTest.java b/...java/org/dalesbred/support/aopalliance/AopAllianceTransactionalMethodInterceptorTest.java
@@ -25,8 +25,12 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import org.dalesbred.*;
+import org.dalesbred.Database;
+import org.dalesbred.TestDatabaseProvider;
 import org.dalesbred.support.guice.DriverManagerDatabaseModule;
+import org.dalesbred.transaction.Isolation;
+import org.dalesbred.transaction.Propagation;
+import org.dalesbred.transaction.Transactional;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Before;
 import org.junit.Test;
@@ -35,7 +39,7 @@
 import javax.inject.Named;
 
 import static com.google.inject.name.Names.named;
-import static org.dalesbred.Isolation.SERIALIZABLE;
+import static org.dalesbred.transaction.Isolation.SERIALIZABLE;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;