Makes transaction provider produced with test scope

Author: bartoszmajsak

impl-base/src/main/java/org/jboss/arquillian/transaction/impl/client/ClientSideTransactionHandler.java

@@ -23,11 +23,11 @@
 import org.jboss.arquillian.core.api.annotation.Inject;
 import org.jboss.arquillian.core.spi.context.ApplicationContext;
 import org.jboss.arquillian.test.spi.event.suite.TestEvent;
+import org.jboss.arquillian.transaction.impl.lifecycle.ModeChecker;
 import org.jboss.arquillian.transaction.impl.lifecycle.TransactionHandler;
 
 public class ClientSideTransactionHandler extends TransactionHandler
 {
-
    @Inject
    private Instance<Deployment> deploymentInstance;
 
@@ -40,11 +40,7 @@ public class ClientSideTransactionHandler extends TransactionHandler
    @Override
    public boolean isTransactionSupported(TestEvent testEvent)
    {
-
-      boolean runAsClient = RunModeUtils.isRunAsClient(deploymentInstance.get(), testEvent.getTestClass().getJavaClass(), testEvent.getTestMethod());
-      boolean isLocal = RunModeUtils.isLocalContainer(containerInstance.get());
-
-      return runAsClient || isLocal;
+      return new ModeChecker(deploymentInstance.get(), containerInstance.get()).isClientMode(testEvent);
    }
 
 }

impl-base/src/main/java/org/jboss/arquillian/transaction/impl/client/TransactionExtension.java

@@ -19,7 +19,9 @@
 
 import org.jboss.arquillian.container.test.spi.client.deployment.AuxiliaryArchiveAppender;
 import org.jboss.arquillian.core.spi.LoadableExtension;
+import org.jboss.arquillian.transaction.impl.configuration.TransactionConfigurationProducer;
 import org.jboss.arquillian.transaction.impl.context.TransactionContextImpl;
+import org.jboss.arquillian.transaction.impl.lifecycle.TransactionProviderProducer;
 
 /**
  * Registers the extension.
@@ -34,6 +36,7 @@ public void register(ExtensionBuilder builder)
    {
       builder.context(TransactionContextImpl.class);
       builder.observer(TransactionConfigurationProducer.class);
+      builder.observer(TransactionProviderProducer.class);
       builder.observer(ClientSideTransactionHandler.class);
       builder.service(AuxiliaryArchiveAppender.class, TransactionArchiveAppender.class);
    }

…nt/TransactionConfigurationProducer.java …on/TransactionConfigurationProducer.javaimpl-base/src/main/java/org/jboss/arquillian/transaction/impl/client/TransactionConfigurationProducer.java renamed to impl-base/src/main/java/org/jboss/arquillian/transaction/impl/configuration/TransactionConfigurationProducer.java impl-base/src/main/java/org/jboss/arquillian/transaction/impl/client/TransactionConfigurationProducer.java renamed to impl-base/src/main/java/org/jboss/arquillian/transaction/impl/configuration/TransactionConfigurationProducer.java

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.jboss.arquillian.transaction.impl.client;
+package org.jboss.arquillian.transaction.impl.configuration;
 
 import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor;
 import org.jboss.arquillian.config.descriptor.api.ExtensionDef;
@@ -25,7 +25,6 @@
 import org.jboss.arquillian.core.api.annotation.Inject;
 import org.jboss.arquillian.core.api.annotation.Observes;
 import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
-import org.jboss.arquillian.transaction.impl.configuration.TransactionConfiguration;
 
 import java.util.Collections;
 import java.util.Map;

impl-base/src/main/java/org/jboss/arquillian/transaction/impl/container/TransactionRemoteExtension.java

@@ -19,6 +19,7 @@
 
 import org.jboss.arquillian.container.test.spi.RemoteLoadableExtension;
 import org.jboss.arquillian.transaction.impl.context.TransactionContextImpl;
+import org.jboss.arquillian.transaction.impl.lifecycle.TransactionProviderProducer;
 
 /**
  * Registers the extension in the remote container.
@@ -37,5 +38,6 @@ public void register(ExtensionBuilder builder)
       builder.context(TransactionContextImpl.class);
       builder.observer(TransactionConfigurationRemoteProducer.class);
       builder.observer(InContainerTransactionHandler.class);
+      builder.observer(TransactionProviderProducer.class);
    }
 }

impl-base/src/main/java/org/jboss/arquillian/transaction/impl/lifecycle/ModeChecker.java

@@ -0,0 +1,21 @@
+package org.jboss.arquillian.transaction.impl.lifecycle;
+
+import org.jboss.arquillian.container.spi.Container;
+import org.jboss.arquillian.container.spi.client.deployment.Deployment;
+import org.jboss.arquillian.test.spi.event.suite.TestEvent;
+
+public class ModeChecker {
+    private final Deployment deployment;
+    private final Container container;
+
+    public ModeChecker(Deployment deployment, Container container) {
+        this.deployment = deployment;
+        this.container = container;
+    }
+
+    public boolean isClientMode(TestEvent testEvent) {
+        boolean runAsClient = RunModeUtils.isRunAsClient(deployment, testEvent.getTestClass().getJavaClass(), testEvent.getTestMethod());
+        boolean isLocal = RunModeUtils.isLocalContainer(container);
+        return runAsClient || isLocal;
+    }
+}

…ransaction/impl/client/RunModeUtils.java …saction/impl/lifecycle/RunModeUtils.javaimpl-base/src/main/java/org/jboss/arquillian/transaction/impl/client/RunModeUtils.java renamed to impl-base/src/main/java/org/jboss/arquillian/transaction/impl/lifecycle/RunModeUtils.java impl-base/src/main/java/org/jboss/arquillian/transaction/impl/client/RunModeUtils.java renamed to impl-base/src/main/java/org/jboss/arquillian/transaction/impl/lifecycle/RunModeUtils.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.arquillian.transaction.impl.client;
+package org.jboss.arquillian.transaction.impl.lifecycle;
 
 import org.jboss.arquillian.container.spi.Container;
 import org.jboss.arquillian.container.spi.client.deployment.Deployment;

impl-base/src/main/java/org/jboss/arquillian/transaction/impl/lifecycle/TransactionHandler.java

@@ -76,6 +76,9 @@ public abstract class TransactionHandler
    @Inject
    private Instance<TestResult> testResultInstance;
 
+   @Inject
+   private Instance<TransactionProvider> transactionProviderInstance;
+
    public abstract boolean isTransactionSupported(TestEvent testEvent);
 
    public void startTransactionBeforeTest(@Observes(precedence = 10) Before beforeTest)
@@ -89,7 +92,7 @@ public void startTransactionBeforeTest(@Observes(precedence = 10) Before beforeT
 
          lifecycleEvent.fire(new BeforeTransactionStarted());
 
-         getTransactionProvider().beginTransaction(new DefaultTransactionalTest(getTransactionManager(beforeTest)));
+         transactionProviderInstance.get().beginTransaction(new DefaultTransactionalTest(getTransactionManager(beforeTest)));
 
          lifecycleEvent.fire(new AfterTransactionStarted());
       }
@@ -117,7 +120,7 @@ private void endTransaction(After afterTest)
          {
             lifecycleEvent.fire(new BeforeTransactionEnded());
 
-            final TransactionProvider transactionProvider = getTransactionProvider();
+            final TransactionProvider transactionProvider = transactionProviderInstance.get();
             final TransactionalTest transactionalTest = new DefaultTransactionalTest(getTransactionManager(afterTest));
 
             if (rollbackRequired(afterTest))
@@ -266,28 +269,4 @@ private String obtainTranscationManagerFromConfiguration(String transactionManag
       return transactionManager;
    }
 
-   /**
-    * Retrieves the {@link TransactionProvider} registered in current context.
-    *
-    * @return the transaction provider
-    * @throws TransactionProviderNotFoundException
-    *          if no provider could be found or there are multiple providers registered.
-    */
-   private TransactionProvider getTransactionProvider()
-   {
-      try
-      {
-         final TransactionProvider transactionProvider = serviceLoaderInstance.get().onlyOne(TransactionProvider.class);
-         if (transactionProvider == null)
-         {
-            throw new TransactionProviderNotFoundException("Transaction provider for given test case has not been found.");
-         }
-         return transactionProvider;
-      }
-      catch (IllegalStateException e)
-      {
-         throw new TransactionProviderNotFoundException("More then one transaction provider has been specified.", e);
-      }
-   }
-
 }

impl-base/src/main/java/org/jboss/arquillian/transaction/impl/lifecycle/TransactionProviderProducer.java

@@ -0,0 +1,55 @@
+package org.jboss.arquillian.transaction.impl.lifecycle;
+
+import org.jboss.arquillian.container.spi.Container;
+import org.jboss.arquillian.container.spi.client.deployment.Deployment;
+import org.jboss.arquillian.core.api.Instance;
+import org.jboss.arquillian.core.api.InstanceProducer;
+import org.jboss.arquillian.core.api.annotation.Inject;
+import org.jboss.arquillian.core.api.annotation.Observes;
+import org.jboss.arquillian.core.spi.ServiceLoader;
+import org.jboss.arquillian.test.spi.annotation.TestScoped;
+import org.jboss.arquillian.test.spi.event.suite.Before;
+import org.jboss.arquillian.test.spi.event.suite.TestEvent;
+import org.jboss.arquillian.transaction.spi.provider.TransactionProvider;
+
+public class TransactionProviderProducer {
+
+    @Inject
+    private Instance<ServiceLoader> serviceLoaderInstance;
+
+    @Inject
+    private Instance<Deployment> deploymentInstance;
+
+    @Inject
+    private Instance<Container> containerInstance;
+
+    @Inject
+    @TestScoped
+    private InstanceProducer<TransactionProvider> transactionProviderProducer;
+
+    /**
+     * Retrieves the {@link TransactionProvider} registered in current context.
+     *
+     * @return the transaction provider
+     * @throws TransactionProviderNotFoundException if no provider could be found or there are multiple providers registered.
+     */
+
+    public void registerTransactionProvider(@Observes(precedence = 100) Before beforeTest) {
+        if (!isTransactionSupported(beforeTest)) {
+            return;
+        }
+        try {
+            final TransactionProvider transactionProvider = serviceLoaderInstance.get().onlyOne(TransactionProvider.class);
+            if (transactionProvider == null) {
+                throw new TransactionProviderNotFoundException("Transaction provider for given test case has not been found.");
+            }
+            transactionProviderProducer.set(transactionProvider);
+        } catch (IllegalStateException e) {
+            throw new TransactionProviderNotFoundException("More then one transaction provider has been specified.", e);
+        }
+    }
+
+    private boolean isTransactionSupported(TestEvent testEvent) {
+        return new ModeChecker(deploymentInstance.get(), containerInstance.get()).isClientMode(testEvent);
+    }
+}

impl-base/src/test/java/org/jboss/arquillian/transaction/impl/client/TransactionConfigurationProducerTestCase.java

@@ -25,6 +25,7 @@
 import org.jboss.arquillian.test.test.AbstractTestTestBase;
 import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
 import org.jboss.arquillian.transaction.impl.configuration.TransactionConfiguration;
+import org.jboss.arquillian.transaction.impl.configuration.TransactionConfigurationProducer;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
 import org.junit.Before;
 import org.junit.Test;