Misc. improvements to demo on CDI + JPA + JTA

Author: gunnarmorling

other/cdi-jpa-testing/pom.xml

@@ -43,7 +43,12 @@
             <version>2.0.SP1</version>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.jboss.spec.javax.transaction</groupId>
+            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
+            <version>${version.jboss-transaction-api}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -85,12 +90,6 @@
             </exclusions>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.spec.javax.transaction</groupId>
-            <artifactId>jboss-transaction-api_1.2_spec</artifactId>
-            <version>${version.jboss-transaction-api}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>

other/cdi-jpa-testing/src/main/java/org/hibernate/demos/jpacditesting/GreetingService.java

@@ -0,0 +1,15 @@
+/*
+ * License: Apache License, Version 2.0
+ * See the LICENSE file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.demos.jpacditesting;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class GreetingService {
+
+    public String greet(String name) {
+        return "Hello, " + name;
+    }
+}

other/cdi-jpa-testing/src/test/java/org/hibernate/demos/jpacditesting/ObserverTestBean.java other/cdi-jpa-testing/src/main/java/org/hibernate/demos/jpacditesting/ObserverTestBean.java

@@ -8,11 +8,19 @@
 import java.util.List;
 
 import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
 
 @ApplicationScoped
 public class TestService {
 
     private final List<String> names = new ArrayList<>();
+    private final EntityManager entityManager;
+
+    @Inject
+    public TestService(EntityManager entityManager) {
+        this.entityManager = entityManager;
+    }
 
     public List<String> getTestEntityNames() {
         return names;

other/cdi-jpa-testing/src/main/java/org/hibernate/demos/jpacditesting/TestService.java

@@ -0,0 +1,18 @@
+/*
+ * License: Apache License, Version 2.0
+ * See the LICENSE file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.demos.jpacditesting;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.transaction.Transactional;
+import javax.transaction.Transactional.TxType;
+
+@ApplicationScoped
+public class TransactionalTestService {
+
+    @Transactional(value=TxType.MANDATORY)
+    public String doSomething() {
+        return "Success";
+    }
+}

other/cdi-jpa-testing/src/main/java/org/hibernate/demos/jpacditesting/TransactionalTestService.java

@@ -5,17 +5,19 @@
 package org.hibernate.demos.jpacditesting;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
 
 import java.util.List;
 import java.util.UUID;
 
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
+import javax.transaction.TransactionalException;
 import javax.transaction.UserTransaction;
 
 import org.junit.Test;
 
-public class CdiJpaTest extends AbstractCdiTest {
+public class CdiJpaTest extends CdiJpaTestBase {
 
     @Inject
     private EntityManager entityManager;
@@ -29,6 +31,9 @@ public class CdiJpaTest extends AbstractCdiTest {
     @Inject
     private TestService testService;
 
+    @Inject
+    private TransactionalTestService transactionalTestService;
+
     @Test
     public void canInjectEntityManager() {
         assertThat(entityManager).isNotNull();
@@ -103,4 +108,19 @@ public void canUseDiInEntityListener() {
 
         assertThat(testService.getTestEntityNames()).contains("Test 1", "Test 2");
     }
+
+    @Test
+    public void canUseDeclarativeTxControl() throws Exception {
+        try {
+            transactionalTestService.doSomething();
+            fail("Exception raised due to missing yet required transaction wasn't raised");
+        }
+        catch(TransactionalException e) {
+            assertThat(e.getMessage().contains("ARJUNA016110"));
+        }
+
+        ut.begin();
+        assertThat(transactionalTestService.doSomething()).isEqualTo("Success");
+        ut.rollback();
+    }
 }

other/cdi-jpa-testing/src/test/java/org/hibernate/demos/jpacditesting/CdiJpaTest.java

@@ -5,24 +5,40 @@
 package org.hibernate.demos.jpacditesting;
 
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.se.SeContainerInitializer;
 
+import org.hibernate.demos.jpacditesting.support.EntityManagerFactoryProducer;
+import org.hibernate.demos.jpacditesting.support.EntityManagerProducer;
 import org.hibernate.demos.jpacditesting.support.TransactionalConnectionProvider;
-import org.jboss.weld.environment.se.Weld;
 import org.jboss.weld.junit4.WeldInitiator;
 import org.jnp.server.NamingBeanImpl;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 
+import com.arjuna.ats.jta.cdi.TransactionExtension;
 import com.arjuna.ats.jta.utils.JNDIManager;
 
-public abstract class AbstractCdiTest {
+public abstract class CdiJpaTestBase {
 
     private static NamingBeanImpl NAMING_BEAN;
 
+//    @Rule
+//    public WeldInitiator weld = WeldInitiator.from(new Weld())
+//        .activate(RequestScoped.class)
+//        .inject(this)
+//        .build();
+
+    // new Weld() above enables scanning of the classpath; alternatively, only the required beans can be listed explicitly:
+
     @Rule
-    public WeldInitiator weld = WeldInitiator.from(((Weld) SeContainerInitializer.newInstance()))
+    public WeldInitiator weld = WeldInitiator.from(
+            ObserverTestBean.class,
+            TransactionalTestService.class,
+            TestService.class,
+            EntityManagerProducer.class,
+            EntityManagerFactoryProducer.class,
+            TransactionExtension.class
+        )
         .activate(RequestScoped.class)
         .inject(this)
         .build();

other/cdi-jpa-testing/src/test/java/org/hibernate/demos/jpacditesting/AbstractCdiTest.java other/cdi-jpa-testing/src/test/java/org/hibernate/demos/jpacditesting/CdiJpaTestBase.java

@@ -0,0 +1,31 @@
+/*
+ * License: Apache License, Version 2.0
+ * See the LICENSE file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.demos.jpacditesting;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+
+import org.jboss.weld.junit4.WeldInitiator;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class SimpleCdiTest {
+
+    @Rule
+    public WeldInitiator weld = WeldInitiator.from(GreetingService.class)
+        .activate(RequestScoped.class)
+        .inject(this)
+        .build();
+
+    @Inject
+    private GreetingService greeter;
+
+    @Test
+    public void helloWorld() {
+        assertThat(greeter.greet("Java")).isEqualTo("Hello, Java");
+    }
+}

other/cdi-jpa-testing/src/test/java/org/hibernate/demos/jpacditesting/SimpleCdiTest.java

@@ -40,5 +40,4 @@ public boolean isTransactionActive() {
     public UserTransaction getUserTransaction() {
         return com.arjuna.ats.jta.UserTransaction.userTransaction();
     }
-
 }