Merge branch 'master' of github.com:javaee-samples/javaee7-samples

Author: arun-gupta

.gitignore

@@ -4,6 +4,7 @@ bin/
 target/
 libs/
 tmp/
+node_modules/
 
 # OS Files #
 .DS_Store

batch/chunk-exception/pom.xml

@@ -7,12 +7,16 @@
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    
-    <groupId>org.javaee7.batch</groupId>
+
     <artifactId>chunk-exception</artifactId>
-    <version>1.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>${project.artifactId}</name>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.javaee7</groupId>
+            <artifactId>util-samples</artifactId>
+        </dependency>
+    </dependencies>
 </project>

batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/ChunkExceptionRecorder.java

@@ -0,0 +1,10 @@
+package org.javaee7.batch.chunk.exception;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * @author Roberto Cortez
+ */
+public class ChunkExceptionRecorder {
+    public static CountDownLatch chunkExceptionsCountDownLatch = new CountDownLatch(3);
+}

batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyItemWriter.java

@@ -51,6 +51,10 @@ public class MyItemWriter extends AbstractItemWriter {
 
     @Override
     public void writeItems(List list) {
+        if (list.contains(new MyOutputRecord(2))) {
+            throw new IllegalArgumentException();
+        }
+
         System.out.println("MyItemWriter.writeItems: " + list);
     }
 }

batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MyOutputRecord.java

@@ -63,4 +63,19 @@ public void setId(int id) {
     public String toString() {
         return "MyOutputRecord: " + id;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        MyOutputRecord that = (MyOutputRecord) o;
+
+        return id == that.id;
+    }
+
+    @Override
+    public int hashCode() {
+        return id;
+    }
 }

batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MySkipProcessorListener.java

@@ -51,6 +51,7 @@ public class MySkipProcessorListener implements SkipProcessListener {
 
     @Override
     public void onSkipProcessItem(Object t, Exception e) throws Exception {
+        ChunkExceptionRecorder.chunkExceptionsCountDownLatch.countDown();
         System.err.println("MySkipProcessorListener.onSkipProcessItem: " + ((MyInputRecord)t).getId() + ", " + e.getMessage());
     }
 

batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MySkipReadListener.java

@@ -51,6 +51,7 @@ public class MySkipReadListener implements SkipReadListener {
 
     @Override
     public void onSkipReadItem(Exception e) throws Exception {
+        ChunkExceptionRecorder.chunkExceptionsCountDownLatch.countDown();
         System.err.println("MySkipReadListener.onSkipReadItem: " + e.getMessage());
     }
 

batch/chunk-exception/src/main/java/org/javaee7/batch/chunk/exception/MySkipWriteListener.java

@@ -52,7 +52,9 @@ public class MySkipWriteListener implements SkipWriteListener {
 
     @Override
     public void onSkipWriteItem(List list, Exception e) throws Exception {
+        ChunkExceptionRecorder.chunkExceptionsCountDownLatch.countDown();
         System.err.println("MySkipWriteListener.onSkipWriteItem: " + list.size() + ", " + e.getMessage());
+        list.remove(new MyOutputRecord(2));
     }
 
 }

batch/chunk-exception/src/main/resources/META-INF/batch-jobs/myJob.xml

@@ -48,17 +48,17 @@
             <listener ref="mySkipWriteListener"/>
         </listeners>
         <chunk item-count="5" skip-limit="5">
-            <reader ref="myItemReader"></reader> 
-            <processor ref="myItemProcessor"></processor>
-            <writer ref="myItemWriter"></writer> 
+            <reader ref="myItemReader"/>
+            <processor ref="myItemProcessor"/>
+            <writer ref="myItemWriter"/>
             <skippable-exception-classes>
                 <include class="java.lang.RuntimeException"/>
                 <exclude class="java.io.IOException"/>
             </skippable-exception-classes>
-<!--            <retryable-exception-classes>
+            <retryable-exception-classes>
                 <include class="java.lang.IllegalArgumentException"/>
-            </retryable-exception-classes>-->
-        </chunk>	
+            </retryable-exception-classes>
+        </chunk>
     </step>
 </job>
 

batch/chunk-exception/src/test/java/org/javaee7/batch/chunk/exception/BatchChunkExceptionTest.java

@@ -0,0 +1,61 @@
+package org.javaee7.batch.chunk.exception;
+
+import org.javaee7.util.BatchTestHelper;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.batch.operations.JobOperator;
+import javax.batch.runtime.*;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Roberto Cortez
+ */
+@RunWith(Arquillian.class)
+public class BatchChunkExceptionTest {
+    @Deployment
+    public static WebArchive createDeployment() {
+        WebArchive war = ShrinkWrap.create(WebArchive.class)
+                .addClass(BatchTestHelper.class)
+                .addPackage("org.javaee7.batch.chunk.exception")
+                .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+                .addAsResource("META-INF/batch-jobs/myJob.xml");
+        System.out.println(war.toString(true));
+        return war;
+    }
+
+    @Test
+    public void testBatchChunkException() throws Exception {
+        JobOperator jobOperator = BatchRuntime.getJobOperator();
+        Long executionId = jobOperator.start("myJob", new Properties());
+        JobExecution jobExecution = jobOperator.getJobExecution(executionId);
+
+        BatchTestHelper.keepTestAlive(jobExecution);
+
+        List<StepExecution> stepExecutions = jobOperator.getStepExecutions(executionId);
+        for (StepExecution stepExecution : stepExecutions) {
+            if (stepExecution.getStepName().equals("myStep")) {
+                Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
+
+                assertEquals(1L, (long) metricsMap.get(Metric.MetricType.READ_SKIP_COUNT));
+                assertEquals(1L, (long) metricsMap.get(Metric.MetricType.PROCESS_SKIP_COUNT));
+                assertEquals(1L, (long) metricsMap.get(Metric.MetricType.WRITE_SKIP_COUNT));
+            }
+        }
+
+        assertTrue(ChunkExceptionRecorder.chunkExceptionsCountDownLatch.await(0, TimeUnit.SECONDS));
+        assertEquals(BatchStatus.COMPLETED, jobExecution.getBatchStatus());
+    }
+}