[Blazebit#414] Handle non-Java EE JTA environments and skip updater r…

…elated entity view updater initialization for read-only views
beikov · Dec 12, 2017 · 14cc22c · 14cc22c
1 parent acf5194
commit 14cc22c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 13 deletions.
diff --git a/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/TransactionHelper.java b/entity-view/impl/src/main/java/com/blazebit/persistence/view/impl/tx/TransactionHelper.java
@@ -17,6 +17,7 @@
 package com.blazebit.persistence.view.impl.tx;
 
 import javax.naming.InitialContext;
+import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 import javax.naming.NoInitialContextException;
 import javax.persistence.EntityManager;
@@ -29,22 +30,37 @@
  */
 public class TransactionHelper {
 
+    private static final String[] NAMES = {
+        "java:comp/TransactionSynchronizationRegistry", // Java EE Standard name
+        "java:/TransactionSynchronizationRegistry", // Local providers
+        "java:comp/env/TransactionSynchronizationRegistry", // Tomcat
+    };
+
     private TransactionHelper() {
     }
 
     public static TransactionSynchronizationStrategy getSynchronizationStrategy(EntityManager em) {
-        TransactionSynchronizationRegistry synchronizationRegistry;
+        InitialContext context = null;
 
         try {
-            synchronizationRegistry = (TransactionSynchronizationRegistry) new InitialContext().lookup("java:comp/TransactionSynchronizationRegistry");
-            if (synchronizationRegistry != null) {
-                return new JtaTransactionSynchronizationStrategy(synchronizationRegistry);
-            }
-        } catch (NoInitialContextException e) {
-            // Maybe in Java SE environment
-            synchronizationRegistry = null;
+            context = new InitialContext();
         } catch (NamingException e) {
-            throw new IllegalArgumentException("Could not access transaction synchronization registry!", e);
+            // Maybe in Java SE environment
+        }
+
+        if (context != null) {
+            for (String name : NAMES) {
+                try {
+                    TransactionSynchronizationRegistry synchronizationRegistry = (TransactionSynchronizationRegistry) context.lookup(name);
+                    if (synchronizationRegistry != null) {
+                        return new JtaTransactionSynchronizationStrategy(synchronizationRegistry);
+                    }
+                } catch (NoInitialContextException | NameNotFoundException e) {
+                    // Maybe in Java SE environment
+                } catch (NamingException e) {
+                    throw new IllegalArgumentException("Could not access transaction synchronization registry!", e);
+                }
+            }
         }
 
         try {

diff --git a/...w/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java b/...w/impl/src/main/java/com/blazebit/persistence/view/impl/update/EntityViewUpdaterImpl.java
@@ -149,7 +149,12 @@ public EntityViewUpdaterImpl(EntityViewManagerImpl evm, ManagedViewTypeImplement
             idViewBuilder = null;
             this.idFlusher = null;
         }
-        this.fullEntityLoader = new FullEntityLoader(evm, viewType);
+        boolean mutable = viewType.isCreatable() || viewType.isUpdatable();
+        if (mutable) {
+            this.fullEntityLoader = new FullEntityLoader(evm, viewType);
+        } else {
+            this.fullEntityLoader = null;
+        }
         Set<MethodAttribute<?, ?>> attributes = (Set<MethodAttribute<?, ?>>) (Set<?>) viewType.getAttributes();
         AbstractMethodAttribute<?, ?> idAttribute;
         AbstractMethodAttribute<?, ?> versionAttribute;
@@ -188,7 +193,7 @@ public EntityViewUpdaterImpl(EntityViewManagerImpl evm, ManagedViewTypeImplement
         StringBuilder sb = null;
         int clauseEndIndex = -1;
 
-        if (flushStrategy != FlushStrategy.ENTITY && jpaIdAttribute != null) {
+        if (mutable && flushStrategy != FlushStrategy.ENTITY && jpaIdAttribute != null) {
             this.updatePrefixString = "UPDATE " + entityType.getName() + " e SET ";
             if (versionAttribute != null) {
                 this.updatePostfixString = " WHERE e." + jpaIdAttribute.getName() + " = :" + ID_PARAM_NAME +
@@ -214,7 +219,7 @@ public EntityViewUpdaterImpl(EntityViewManagerImpl evm, ManagedViewTypeImplement
         }
 
         // Only construct attribute flushers for creatable or updatable entity views
-        if (viewType.isCreatable() || viewType.isUpdatable()) {
+        if (mutable) {
             for (MethodAttribute<?, ?> attribute : attributes) {
                 if (attribute == idAttribute || attribute == versionAttribute) {
                     continue;
@@ -267,7 +272,7 @@ public EntityViewUpdaterImpl(EntityViewManagerImpl evm, ManagedViewTypeImplement
                 viewType.getFlushMode(),
                 flushStrategy
         );
-        if (flushStrategy != FlushStrategy.ENTITY && jpaIdAttribute != null && clauseEndIndex != sb.length()) {
+        if (mutable && flushStrategy != FlushStrategy.ENTITY && jpaIdAttribute != null && clauseEndIndex != sb.length()) {
             if (clauseEndIndex + 2 == sb.length()) {
                 // Remove the last comma
                 sb.setLength(clauseEndIndex);