1 files changed, 48 insertions, 36 deletions

diff --git a/calamus-engine/src/main/java/io/trygvis/engine/NexusNewArtifactMessageListener.java b/calamus-engine/src/main/java/io/trygvis/engine/NexusNewArtifactMessageListener.java
index 22b2c4c..0813c27 100644
--- a/calamus-engine/src/main/java/io/trygvis/engine/NexusNewArtifactMessageListener.java
+++ b/calamus-engine/src/main/java/io/trygvis/engine/NexusNewArtifactMessageListener.java
@@ -3,10 +3,11 @@ package io.trygvis.engine;
 import io.trygvis.engine.domain.Artifact;
 import io.trygvis.engine.domain.Process;
 import io.trygvis.engine.domain.ProcessTrigger;
-import org.kie.api.runtime.Environment;
-import org.kie.api.runtime.EnvironmentName;
 import org.kie.internal.runtime.StatefulKnowledgeSession;
 import org.slf4j.Logger;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -14,7 +15,6 @@ import javax.jms.MessageListener;
 import javax.jms.TextMessage;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
 import javax.persistence.NoResultException;
 import javax.persistence.TypedQuery;
 import java.io.IOException;
@@ -26,10 +26,12 @@ import static org.slf4j.LoggerFactory.getLogger;
 public class NexusNewArtifactMessageListener implements MessageListener {
     private final Logger log = getLogger(getClass());
 
+    private final TransactionTemplate transactionTemplate;
     private final EntityManagerFactory entityManagerFactory;
     private final StatefulKnowledgeSession session;
 
-    public NexusNewArtifactMessageListener(EntityManagerFactory entityManagerFactory, StatefulKnowledgeSession session) {
+    public NexusNewArtifactMessageListener(TransactionTemplate transactionTemplate, EntityManagerFactory entityManagerFactory, StatefulKnowledgeSession session) {
+        this.transactionTemplate = transactionTemplate;
         this.entityManagerFactory = entityManagerFactory;
         this.session = session;
     }
@@ -54,41 +56,51 @@ public class NexusNewArtifactMessageListener implements MessageListener {
 
             log.info("Artifact event: groupId={}, artifactId={}, version={}, classifier={}, extension={}", groupId, artifactId, version, classifier, extension);
 
-            // Check for any processes that will be started because of this
-            EntityManager entityManager = entityManagerFactory.createEntityManager();
-
-            TypedQuery<Artifact> query = entityManager.createQuery("FROM Artifact WHERE groupId=:groupId AND artifactId=:artifactId AND version=:version AND extension=:extension", Artifact.class);
-            query.setParameter("groupId", groupId);
-            query.setParameter("artifactId", artifactId);
-            query.setParameter("version", version);
-            query.setParameter("extension", extension);
-            Artifact artifact;
-            try {
-                artifact = query.getSingleResult();
-            } catch (NoResultException e) {
-                log.info("New artifact!");
-                artifact = new Artifact(groupId, artifactId, version, classifier, extension);
-                entityManager.persist(artifact);
-            }
-
-            for (Process process : entityManager.createQuery("FROM Process", Process.class).getResultList()) {
-                System.out.println("process.name = " + process.getName());
-
-                for (ProcessTrigger trigger : process.getProcessTriggers()) {
-                    System.out.println("trigger.getMvel() = " + trigger.getMvel());
-                    boolean match = trigger.matches(artifact);
-                    System.out.println("match = " + match);
+            transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+                @Override
+                protected void doInTransactionWithoutResult(TransactionStatus status) {
+                    processMessage(groupId, artifactId, version, classifier, extension);
                 }
-            }
-
-            /*
-            String type;
-            Object event;
-            long processInstanceId;
-            jbpm.signalEvent(type, event, processInstanceId);
-            */
+            });
         } catch (JMSException | IOException e) {
             e.printStackTrace();
         }
     }
+
+    private void processMessage(String groupId, String artifactId, String version, String classifier, String extension) {
+        // Check for any processes that will be started because of this
+        EntityManager entityManager = entityManagerFactory.createEntityManager();
+
+        TypedQuery<Artifact> query = entityManager.createQuery("FROM Artifact WHERE groupId=:groupId AND artifactId=:artifactId AND version=:version AND extension=:extension", Artifact.class);
+        query.setParameter("groupId", groupId);
+        query.setParameter("artifactId", artifactId);
+        query.setParameter("version", version);
+        query.setParameter("extension", extension);
+        Artifact artifact;
+        try {
+            artifact = query.getSingleResult();
+            log.info("Existing artifact: {}", artifact);
+        } catch (NoResultException e) {
+            artifact = new Artifact(groupId, artifactId, version, classifier, extension);
+            log.info("New artifact: {}", artifact);
+            entityManager.persist(artifact);
+        }
+
+        for (Process process : entityManager.createQuery("FROM Process", Process.class).getResultList()) {
+            System.out.println("process.name = " + process.getName());
+
+            for (ProcessTrigger trigger : process.getProcessTriggers()) {
+                System.out.println("trigger.getMvel() = " + trigger.getMvel());
+                boolean match = trigger.matches(artifact);
+                System.out.println("match = " + match);
+            }
+        }
+
+        /*
+        String type;
+        Object event;
+        long processInstanceId;
+        jbpm.signalEvent(type, event, processInstanceId);
+        */
+    }
 }