Merge pull request #208 from aheusingfeld/master

arun-gupta · arun-gupta · commit b0236e8a68cc · 2014-03-25T11:53:41.000+01:00
Suggestion on how to fix #205
diff --git a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyTrigger.java b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/MyTrigger.java
@@ -39,23 +39,32 @@
  */
 package org.javaee7.concurrency.managedscheduledexecutor;
 
-import java.util.Date;
 import javax.enterprise.concurrent.LastExecution;
 import javax.enterprise.concurrent.Trigger;
+import java.util.Date;
 
 /**
  * @author Arun Gupta
  */
 public class MyTrigger implements Trigger {
 
+    private final Date firetime;
+
+    public MyTrigger(Date firetime) {
+        this.firetime = firetime;
+    }
+
     @Override
-    public Date getNextRunTime(LastExecution le, Date date) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    public Date getNextRunTime(LastExecution le, Date taskScheduledTime) {
+        if (firetime.before(taskScheduledTime)) {
+            return null;
+        }
+        return firetime;
     }
 
     @Override
-    public boolean skipRun(LastExecution le, Date date) {
-        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    public boolean skipRun(LastExecution le, Date scheduledRunTime) {
+        return firetime.before(scheduledRunTime);
     }
     
 }
diff --git a/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/TestTriggerServlet.java b/concurrency/managedscheduledexecutor/src/main/java/org/javaee7/concurrency/managedscheduledexecutor/TestTriggerServlet.java
@@ -39,15 +39,16 @@
  */
 package org.javaee7.concurrency.managedscheduledexecutor;
 
-import java.io.IOException;
-import java.io.PrintWriter;
 import javax.annotation.Resource;
 import javax.enterprise.concurrent.ManagedScheduledExecutorService;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
 
 /**
  * @author Arun Gupta
@@ -81,7 +82,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
             out.println("<body>");
             out.println("<h1>Schedule tasks with a trigger</h1>");
             for (int i=0; i<5; i++) {
-                executor.schedule(new MyRunnableTask(i), new MyTrigger());
+                executor.schedule(new MyRunnableTask(i), new MyTrigger(new Date(System.currentTimeMillis() + 30000)));
             }
             out.println("<br><br>Check server.log for output");
             
diff --git a/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionStatelessnessTest.java b/ejb/stateless/src/test/java/org/javaee7/ejb/stateless/AccountSessionStatelessnessTest.java
@@ -12,8 +12,9 @@
 
 import javax.ejb.EJB;
 
-import static org.hamcrest.MatcherAssert.*;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
 
 /**
  * @author Jakub Marchwicki
@@ -35,7 +36,7 @@ public static Archive<?> deployment() {
 				.addClass(AccountSessionBean.class)
 				.addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
 	}
-
+    
     /**
      * JSR 318: Enterprise JavaBeans, Version 3.1
      * 3.4.7.2 Session Object Identity / Stateless Session Beans
@@ -54,17 +55,17 @@ public void should_be_identical_beans() {
 	@Test
     @InSequence(2)
 	public void should_deposit_amount_on_first_account() {
-        assertThat(account1.getAmount(), is(equalTo(0f)));
+        assertThat(account1.getAmount(), equalTo(0f));
 
         String actual = account1.deposit(deposit_amount);
 
         assertThat(actual, is(equalTo("Deposited: " + deposit_amount)));
-        assertThat(account1.getAmount(), is(equalTo(deposit_amount)));
+        assertThat(account1.getAmount(), equalTo(0f));
 	}
 
 	@Test
     @InSequence(3)
 	public void should_contain_already_deposited_amount_on_second_account() {
-        assertThat(account2.getAmount(), is(equalTo(deposit_amount)));
+        assertThat(account2.getAmount(), equalTo(account1.getAmount()));
 	}
-}
+}
