Skip to content

Commit 45d0a8b

Browse files
radcortezradcortez
committed
Code style issues.
1 parent f8806eb commit 45d0a8b

File tree

15 files changed

+55
-62
lines changed

15 files changed

+55
-62
lines changed

‎batch/batch-listeners/src/test/java/org.javaee7.batch.listeners/BatchListenersTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public class BatchListenersTest {
2828
@Deployment
2929
public static WebArchive createDeployment() {
3030
WebArchive war = ShrinkWrap.create(WebArchive.class)
31-
.addClass(BatchTestHelper.class)
32-
.addPackage("org.javaee7.batch.listeners")
33-
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
34-
.addAsResource("META-INF/batch-jobs/myJob.xml");
31+
.addClass(BatchTestHelper.class)
32+
.addPackage("org.javaee7.batch.listeners")
33+
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
34+
.addAsResource("META-INF/batch-jobs/myJob.xml");
3535
System.out.println(war.toString(true));
3636
return war;
3737
}
@@ -49,9 +49,9 @@ public void testBatchListeners() throws Exception {
4949
if (stepExecution.getStepName().equals("myStep")) {
5050
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
5151

52-
assertEquals(10L, (long) metricsMap.get(Metric.MetricType.READ_COUNT));
53-
assertEquals(10L / 2L, (long) metricsMap.get(Metric.MetricType.WRITE_COUNT));
54-
assertEquals(10L / 3 + 10 % 3, (long) metricsMap.get(Metric.MetricType.COMMIT_COUNT));
52+
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
53+
assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
54+
assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
5555
}
5656
}
5757

‎batch/batchlet-simple/src/test/java/org/javaee7/batch/batchlet/simple/MyBatchletTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public class MyBatchletTest {
2525
@Deployment
2626
public static WebArchive createDeployment() {
2727
WebArchive war = ShrinkWrap.create(WebArchive.class)
28-
.addClass(BatchTestHelper.class)
29-
.addClass(MyBatchlet.class)
30-
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
31-
.addAsResource("META-INF/batch-jobs/myJob.xml");
28+
.addClass(BatchTestHelper.class)
29+
.addClass(MyBatchlet.class)
30+
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
31+
.addAsResource("META-INF/batch-jobs/myJob.xml");
3232
System.out.println(war.toString(true));
3333
return war;
3434
}

‎batch/chunk-checkpoint/src/test/java/org/javaee7/batch/chunk/checkpoint/BatchChunkCheckpointTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public class BatchChunkCheckpointTest {
2828
@Deployment
2929
public static WebArchive createDeployment() {
3030
WebArchive war = ShrinkWrap.create(WebArchive.class)
31-
.addClass(BatchTestHelper.class)
32-
.addPackage("org.javaee7.batch.chunk.checkpoint")
33-
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
34-
.addAsResource("META-INF/batch-jobs/myJob.xml");
31+
.addClass(BatchTestHelper.class)
32+
.addPackage("org.javaee7.batch.chunk.checkpoint")
33+
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
34+
.addAsResource("META-INF/batch-jobs/myJob.xml");
3535
System.out.println(war.toString(true));
3636
return war;
3737
}
@@ -49,9 +49,9 @@ public void testBatchChunkCheckpoint() throws Exception {
4949
if (stepExecution.getStepName().equals("myStep")) {
5050
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
5151

52-
assertEquals(10L, (long) metricsMap.get(Metric.MetricType.READ_COUNT));
53-
assertEquals(10L / 2L, (long) metricsMap.get(Metric.MetricType.WRITE_COUNT));
54-
assertEquals(10L / 5L + 1, (long) metricsMap.get(Metric.MetricType.COMMIT_COUNT));
52+
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
53+
assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
54+
assertEquals(10L / 5L + 1, metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
5555
}
5656
}
5757

‎batch/chunk-csv-database/src/test/java/org/javaee7/batch/chunk/csv/database/BatchCSVDatabaseTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public void testBatchCSVDatabase() throws Exception {
5757
if (stepExecution.getStepName().equals("myStep")) {
5858
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
5959

60-
assertEquals(7L, (long) metricsMap.get(Metric.MetricType.READ_COUNT));
61-
assertEquals(7L, (long) metricsMap.get(Metric.MetricType.WRITE_COUNT));
62-
assertEquals(3L, (long) metricsMap.get(Metric.MetricType.COMMIT_COUNT));
60+
assertEquals(7L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
61+
assertEquals(7L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
62+
assertEquals(3L, metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
6363
}
6464
}
6565

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public void testBatchChunkException() throws Exception {
4949
if (stepExecution.getStepName().equals("myStep")) {
5050
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
5151

52-
assertEquals(1L, (long) metricsMap.get(Metric.MetricType.READ_SKIP_COUNT));
53-
assertEquals(1L, (long) metricsMap.get(Metric.MetricType.PROCESS_SKIP_COUNT));
54-
assertEquals(1L, (long) metricsMap.get(Metric.MetricType.WRITE_SKIP_COUNT));
52+
assertEquals(1L, metricsMap.get(Metric.MetricType.READ_SKIP_COUNT).longValue());
53+
assertEquals(1L, metricsMap.get(Metric.MetricType.PROCESS_SKIP_COUNT).longValue());
54+
assertEquals(1L, metricsMap.get(Metric.MetricType.WRITE_SKIP_COUNT).longValue());
5555
}
5656
}
5757

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<property name="end" value="#{partitionPlan['end']}" />
5050
</properties>
5151
</reader>
52-
<processor ref="myItemProcessor"></processor>
53-
<writer ref="myItemWriter"></writer>
52+
<processor ref="myItemProcessor"/>
53+
<writer ref="myItemWriter"/>
5454
</chunk>
5555
<partition>
5656
<mapper ref="myMapper"/>

‎batch/chunk-optional-processor/src/main/resources/META-INF/batch-jobs/myJob.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<job id="myJob" xmlns="http://xmlns.jcp.org/xml/ns/javaee" version="1.0">
4444
<step id="myStep" >
4545
<chunk item-count="3">
46-
<reader ref="myItemReader"></reader>
47-
<writer ref="myItemWriter"></writer>
46+
<reader ref="myItemReader"/>
47+
<writer ref="myItemWriter"/>
4848
</chunk>
4949
</step>
5050
</job>

‎batch/chunk-optional-processor/src/test/java/org/javaee7/batch/chunk/optional/processor/BatchChunkOptionalProcessorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void testBatchChunkOptionalProcessor() throws Exception {
4848
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
4949
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
5050
assertEquals(10L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
51-
assertEquals(10L / 3 + 10 % 3, metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
51+
assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
5252
}
5353
}
5454

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<property name="end" value="#{partitionPlan['end']}" />
5050
</properties>
5151
</reader>
52-
<processor ref="myItemProcessor"></processor>
53-
<writer ref="myItemWriter"></writer>
52+
<processor ref="myItemProcessor"/>
53+
<writer ref="myItemWriter"/>
5454
</chunk>
5555
<partition>
5656
<plan partitions="2">

‎batch/chunk-simple-nobeans/src/main/resources/META-INF/batch-jobs/myJob.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<job id="myJob" xmlns="http://xmlns.jcp.org/xml/ns/javaee" version="1.0">
4444
<step id="myStep" >
4545
<chunk item-count="3">
46-
<reader ref="myItemReader"></reader>
47-
<processor ref="myItemProcessor"></processor>
48-
<writer ref="myItemWriter"></writer>
46+
<reader ref="myItemReader"/>
47+
<processor ref="myItemProcessor"/>
48+
<writer ref="myItemWriter"/>
4949
</chunk>
5050
</step>
5151
</job>

‎batch/chunk-simple-nobeans/src/test/java/org/javaee7/batch/samples/chunk/simple/nobeans/BatchChunkSimpleNoBeansTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void testBatchChunkSimpleNoBeans() throws Exception {
4646

4747
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
4848
assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
49-
assertEquals(10L / 3 + 10 % 3, metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
49+
assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
5050
}
5151
}
5252

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<job id="myJob" xmlns="http://xmlns.jcp.org/xml/ns/javaee" version="1.0">
4444
<step id="myStep" >
4545
<chunk item-count="3">
46-
<reader ref="myItemReader"></reader>
47-
<processor ref="myItemProcessor"></processor>
48-
<writer ref="myItemWriter"></writer>
46+
<reader ref="myItemReader"/>
47+
<processor ref="myItemProcessor"/>
48+
<writer ref="myItemWriter"/>
4949
</chunk>
5050
</step>
5151
</job>

‎batch/chunk-simple/src/test/java/org/javaee7/batch/chunk/simple/ChunkSimpleTest.java

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,17 @@
77
import org.jboss.shrinkwrap.api.ShrinkWrap;
88
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
99
import org.jboss.shrinkwrap.api.spec.WebArchive;
10-
import org.junit.Assert;
1110
import org.junit.Test;
1211
import org.junit.runner.RunWith;
1312

1413
import javax.batch.operations.JobOperator;
15-
import javax.batch.runtime.BatchRuntime;
16-
import javax.batch.runtime.BatchStatus;
17-
import javax.batch.runtime.JobExecution;
18-
import javax.batch.runtime.Metric;
19-
import javax.batch.runtime.StepExecution;
14+
import javax.batch.runtime.*;
2015
import java.util.List;
2116
import java.util.Map;
2217
import java.util.Properties;
2318

19+
import static org.junit.Assert.assertEquals;
20+
2421
/**
2522
* @author Roberto Cortez
2623
*/
@@ -29,14 +26,10 @@ public class ChunkSimpleTest {
2926
@Deployment
3027
public static WebArchive createDeployment() {
3128
WebArchive war = ShrinkWrap.create(WebArchive.class)
32-
.addClass(BatchTestHelper.class)
33-
.addClass(MyInputRecord.class)
34-
.addClass(MyItemProcessor.class)
35-
.addClass(MyItemReader.class)
36-
.addClass(MyItemWriter.class)
37-
.addClass(MyOutputRecord.class)
38-
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
39-
.addAsResource("META-INF/batch-jobs/myJob.xml");
29+
.addClass(BatchTestHelper.class)
30+
.addPackage("org.javaee7.batch.chunk.simple")
31+
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
32+
.addAsResource("META-INF/batch-jobs/myJob.xml");
4033
System.out.println(war.toString(true));
4134
return war;
4235
}
@@ -52,13 +45,13 @@ public void testChunkSimple() throws Exception {
5245
List<StepExecution> stepExecutions = jobOperator.getStepExecutions(executionId);
5346
for (StepExecution stepExecution : stepExecutions) {
5447
if (stepExecution.getStepName().equals("myStep")) {
55-
Map<Metric.MetricType,Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
56-
Assert.assertEquals((long) metricsMap.get(Metric.MetricType.READ_COUNT), 10L);
57-
Assert.assertEquals((long) metricsMap.get(Metric.MetricType.WRITE_COUNT), 10L/2L);
58-
Assert.assertEquals((long) metricsMap.get(Metric.MetricType.COMMIT_COUNT), 10L/3 + 10%3);
48+
Map<Metric.MetricType, Long> metricsMap = BatchTestHelper.getMetricsMap(stepExecution.getMetrics());
49+
assertEquals(10L, metricsMap.get(Metric.MetricType.READ_COUNT).longValue());
50+
assertEquals(10L / 2L, metricsMap.get(Metric.MetricType.WRITE_COUNT).longValue());
51+
assertEquals(10L / 3 + (10L % 3 > 0 ? 1 : 0), metricsMap.get(Metric.MetricType.COMMIT_COUNT).longValue());
5952
}
6053
}
6154

62-
Assert.assertEquals(jobExecution.getBatchStatus(), BatchStatus.COMPLETED);
55+
assertEquals(jobExecution.getBatchStatus(), BatchStatus.COMPLETED);
6356
}
6457
}

‎batch/flow/src/main/resources/META-INF/batch-jobs/myJob.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
</step>
4848
<step id="step2" >
4949
<chunk item-count="3">
50-
<reader ref="myItemReader"></reader>
51-
<writer ref="myItemWriter"></writer>
50+
<reader ref="myItemReader"/>
51+
<writer ref="myItemWriter"/>
5252
</chunk>
5353
</step>
5454
</flow>

‎batch/multiple-steps/src/main/resources/META-INF/batch-jobs/myJob.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
<job id="myJob" xmlns="http://xmlns.jcp.org/xml/ns/javaee" version="1.0">
4444
<step id="step1" next="step2">
4545
<chunk item-count="3">
46-
<reader ref="myItemReader"></reader>
47-
<processor ref="myItemProcessor"></processor>
48-
<writer ref="myItemWriter"></writer>
46+
<reader ref="myItemReader"/>
47+
<processor ref="myItemProcessor"/>
48+
<writer ref="myItemWriter"/>
4949
</chunk>
5050
</step>
5151
<step id="step2" >

0 commit comments

Comments
 (0)