iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BAEL-3646] Addressing PR comments

This commit is contained in:
mike b 2020-03-17 10:06:34 -04:00
parent 2c0cf3e2e0
commit e58683f48b
16 changed files with 208 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
spring-batch/repository.sqlite
View File

Binary file not shown.

5
spring-batch/src/main/java/org/baeldung/conditionalflow/ConditionalFlowApplication.java
View File

@ -1,11 +1,14 @@
package org.baeldung.conditionalflow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class ConditionalFlowApplication implements CommandLineRunner {
private static Logger logger = LoggerFactory.getLogger(ConditionalFlowApplication.class);
public static void main(String[] args) {
SpringApplication.run(ConditionalFlowApplication.class, args);
@ -13,6 +16,6 @@ public class ConditionalFlowApplication implements CommandLineRunner {
@Override
public void run(String... args) throws Exception {
System.out.println("Running and exiting");
logger.info("Running conditional flow application...");
}
}

18
spring-batch/src/main/java/org/baeldung/conditionalflow/NumberInfoDecider.java
View File

@ -1,6 +1,5 @@
package org.baeldung.conditionalflow;
import org.springframework.batch.core.ExitStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
@ -8,12 +7,23 @@ import org.springframework.batch.core.job.flow.JobExecutionDecider;
public class NumberInfoDecider implements JobExecutionDecider {
public static final String NOTIFY = "NOTIFY";
public static final String QUIET = "QUIET";
/**
* Method that determines notification status of job
* @return true if notifications should be sent.
*/
private boolean shouldNotify() {
return true;
}
@Override
public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) {
if(jobExecution.getExitStatus().equals("UNKNOWN")) {
return new FlowExecutionStatus("NOTIFY");
if (shouldNotify()) {
return new FlowExecutionStatus(NOTIFY);
} else {
return null;
return new FlowExecutionStatus(QUIET);
}
}
}

86
spring-batch/src/main/java/org/baeldung/conditionalflow/config/NumberInfoConfig.java
View File

@ -11,6 +11,9 @@ import org.springframework.batch.core.configuration.annotation.StepBuilderFactor
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import static org.baeldung.conditionalflow.NumberInfoDecider.NOTIFY;
@Configuration
@EnableBatchProcessing
@ -19,67 +22,70 @@ public class NumberInfoConfig {
@Bean
@Qualifier("NotificationStep")
public Step notificationStep(StepBuilderFactory sbf) {
return sbf.get("Billing step").tasklet(new NotifierTasklet()).build();
return sbf.get("Notify step")
.tasklet(new NotifierTasklet())
.build();
}
public Step numberGeneratorStep(StepBuilderFactory sbf, int[] values, String prepend) {
return sbf.get("Number generator")
.<NumberInfo, Integer>chunk(1)
.reader(new NumberInfoGenerator(values))
.processor(new NumberInfoClassifier())
.writer(new PrependingStdoutWriter<>(prepend))
.build();
.<NumberInfo, Integer> chunk(1)
.reader(new NumberInfoGenerator(values))
.processor(new NumberInfoClassifier())
.writer(new PrependingStdoutWriter<>(prepend))
.build();
}
public Step numberGeneratorStepDecider(StepBuilderFactory sbf, int[] values, String prepend) {
return sbf.get("Number generator")
.<NumberInfo, Integer>chunk(1)
.reader(new NumberInfoGenerator(values))
.processor(new NumberInfoClassifierWithDecider())
.writer(new PrependingStdoutWriter<>(prepend))
.build();
return sbf.get("Number generator decider")
.<NumberInfo, Integer> chunk(1)
.reader(new NumberInfoGenerator(values))
.processor(new NumberInfoClassifierWithDecider())
.writer(new PrependingStdoutWriter<>(prepend))
.build();
}
@Bean
public Job numberGeneratorNonNotifierJob(JobBuilderFactory jobBuilderFactory,
StepBuilderFactory stepBuilderFactory,
@Qualifier("NotificationStep") Step notificationStep
) {
int[] nonNotifierData = {-1, -2, -3};
@Qualifier("first_job")
public Job numberGeneratorNonNotifierJob(JobBuilderFactory jobBuilderFactory, StepBuilderFactory stepBuilderFactory, @Qualifier("NotificationStep") Step notificationStep) {
int[] nonNotifierData = { -1, -2, -3 };
Step step = numberGeneratorStep(stepBuilderFactory, nonNotifierData, "First Dataset Processor");
return jobBuilderFactory.get("Number generator - first dataset")
.start(step)
.on("NOTIFY").to(notificationStep)
.from(step).on("*").stop()
.end()
.build();
.start(step)
.on(NOTIFY)
.to(notificationStep)
.from(step)
.on("*")
.stop()
.end()
.build();
}
@Bean
public Job numberGeneratorNotifierJob(JobBuilderFactory jobBuilderFactory,
StepBuilderFactory stepBuilderFactory,
@Qualifier("NotificationStep") Step notificationStep
) {
int[] billableData = {11, -2, -3};
@Qualifier("second_job")
public Job numberGeneratorNotifierJob(JobBuilderFactory jobBuilderFactory, StepBuilderFactory stepBuilderFactory, @Qualifier("NotificationStep") Step notificationStep) {
int[] billableData = { 11, -2, -3 };
Step dataProviderStep = numberGeneratorStep(stepBuilderFactory, billableData, "Second Dataset Processor");
return jobBuilderFactory.get("Number generator - second dataset")
.start(dataProviderStep)
.on("NOTIFY").to(notificationStep)
.end()
.build();
.start(dataProviderStep)
.on(NOTIFY)
.to(notificationStep)
.end()
.build();
}
@Bean
public Job numberGeneratorNotifierJobWithDecider(JobBuilderFactory jobBuilderFactory,
StepBuilderFactory stepBuilderFactory,
@Qualifier("NotificationStep") Step notificationStep
) {
int[] billableData = {11, -2, -3};
@Qualifier("third_job")
@Primary
public Job numberGeneratorNotifierJobWithDecider(JobBuilderFactory jobBuilderFactory, StepBuilderFactory stepBuilderFactory, @Qualifier("NotificationStep") Step notificationStep) {
int[] billableData = { 11, -2, -3 };
Step dataProviderStep = numberGeneratorStepDecider(stepBuilderFactory, billableData, "Third Dataset Processor");
return jobBuilderFactory.get("Number generator - third dataset")
.start(dataProviderStep)
.next(new NumberInfoDecider()).on("NOTIFY").to(notificationStep)
.end()
.build();
.start(dataProviderStep)
.next(new NumberInfoDecider())
.on(NOTIFY)
.to(notificationStep)
.end()
.build();
}
}

18
spring-batch/src/main/java/org/baeldung/conditionalflow/model/NumberInfo.java
View File

@ -5,14 +5,14 @@ import java.util.Objects;
public class NumberInfo {
private int number;
public static NumberInfo from(int number){
return new NumberInfo(number);
}
public NumberInfo(int number) {
this.number = number;
}
public static NumberInfo from(int number) {
return new NumberInfo(number);
}
public boolean isPositive() {
return number > 0;
}
@ -27,8 +27,10 @@ public class NumberInfo {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (this == o)
return true;
if (o == null || getClass() != o.getClass())
return false;
NumberInfo that = (NumberInfo) o;
return number == that.number;
}
@ -40,8 +42,6 @@ public class NumberInfo {
@Override
public String toString() {
return "NumberInfo{" +
"number=" + number +
'}';
return "NumberInfo{" + "number=" + number + '}';
}
}

3
spring-batch/src/main/java/org/baeldung/conditionalflow/step/NotifierTasklet.java
View File

@ -8,7 +8,8 @@ import org.springframework.batch.repeat.RepeatStatus;
public class NotifierTasklet implements Tasklet {
@Override
public RepeatStatus execute(StepContribution stepContribution, ChunkContext chunkContext) throws Exception {
System.err.println("[" + chunkContext.getStepContext().getJobName() + "] contains interesting data!!");
System.err.println("[" + chunkContext.getStepContext()
.getJobName() + "] contains interesting data!!");
return RepeatStatus.FINISHED;
}
}

9
spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifier.java
View File

@ -7,20 +7,23 @@ import org.springframework.batch.core.annotation.BeforeStep;
import org.springframework.batch.core.listener.ItemListenerSupport;
import org.springframework.batch.item.ItemProcessor;
public class NumberInfoClassifier extends ItemListenerSupport<NumberInfo, Integer>
implements ItemProcessor<NumberInfo, Integer> {
import static org.baeldung.conditionalflow.NumberInfoDecider.NOTIFY;
import static org.baeldung.conditionalflow.NumberInfoDecider.QUIET;
public class NumberInfoClassifier extends ItemListenerSupport<NumberInfo, Integer> implements ItemProcessor<NumberInfo, Integer> {
private StepExecution stepExecution;
@BeforeStep
public void beforeStep(StepExecution stepExecution) {
this.stepExecution = stepExecution;
this.stepExecution.setExitStatus(new ExitStatus(QUIET));
}
@Override
public void afterProcess(NumberInfo item, Integer result) {
super.afterProcess(item, result);
if (item.isPositive()) {
stepExecution.setExitStatus(new ExitStatus("NOTIFY"));
stepExecution.setExitStatus(new ExitStatus(NOTIFY));
}
}

8
spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoClassifierWithDecider.java
View File

@ -1,15 +1,17 @@
package org.baeldung.conditionalflow.step;
import org.baeldung.conditionalflow.model.NumberInfo;
import org.springframework.batch.core.ExitStatus;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.annotation.BeforeStep;
import org.springframework.batch.core.listener.ItemListenerSupport;
import org.springframework.batch.item.ItemProcessor;
public class NumberInfoClassifierWithDecider
implements ItemProcessor<NumberInfo, Integer> {
private StepExecution stepExecution;
public class NumberInfoClassifierWithDecider extends ItemListenerSupport<NumberInfo, Integer> implements ItemProcessor<NumberInfo, Integer> {
@Override
public Integer process(NumberInfo numberInfo) throws Exception {
return Integer.valueOf(numberInfo.getNumber());
}
}

4
spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoGenerator.java
View File

@ -7,14 +7,14 @@ public class NumberInfoGenerator implements ItemReader<NumberInfo> {
private int[] values;
private int counter;
public NumberInfoGenerator(int[] values){
public NumberInfoGenerator(int[] values) {
this.values = values;
counter = 0;
}
@Override
public NumberInfo read() {
if(counter == values.length){
if (counter == values.length) {
return null;
} else {
return new NumberInfo(values[counter++]);

17
spring-batch/src/main/java/org/baeldung/conditionalflow/step/NumberInfoProcessor.java
View File

@ -1,17 +0,0 @@
package org.baeldung.conditionalflow.step;
import org.baeldung.conditionalflow.model.NumberInfo;
import org.springframework.batch.core.ExitStatus;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.core.annotation.BeforeStep;
import org.springframework.batch.core.listener.ItemListenerSupport;
import org.springframework.batch.item.ItemProcessor;
public class NumberInfoProcessor implements ItemProcessor<NumberInfo, Integer> {
private StepExecution stepExecution;
@Override
public Integer process(NumberInfo numberInfo) throws Exception {
return Integer.valueOf(numberInfo.getNumber());
}
}

9
spring-batch/src/main/java/org/baeldung/conditionalflow/step/PrependingStdoutWriter.java
View File

@ -1,18 +1,15 @@
package org.baeldung.conditionalflow.step;
import org.springframework.batch.item.ItemWriter;
import java.io.OutputStream;
import java.util.List;
import org.springframework.batch.item.ItemWriter;
public class PrependingStdoutWriter<T> implements ItemWriter<T> {
private String prependText;
private OutputStream writeTo;
private PrependingStdoutWriter() {
}
public PrependingStdoutWriter(String prependText, OutputStream os){
public PrependingStdoutWriter(String prependText, OutputStream os) {
this.prependText = prependText;
this.writeTo = os;
}

56
spring-batch/src/test/java/org/baeldung/conditionalflow/DeciderJobIntegrationTest.java Normal file
View File

@ -0,0 +1,56 @@
package org.baeldung.conditionalflow;
import org.baeldung.conditionalflow.config.NumberInfoConfig;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.batch.core.ExitStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.test.AssertFile;
import org.springframework.batch.test.JobLauncherTestUtils;
import org.springframework.batch.test.JobRepositoryTestUtils;
import org.springframework.batch.test.context.SpringBatchTest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestExecutionListeners;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
import java.util.Collection;
import java.util.Iterator;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@RunWith(SpringRunner.class)
@SpringBatchTest
@EnableAutoConfiguration
@ContextConfiguration(classes = { NumberInfoConfig.class })
@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
public class DeciderJobIntegrationTest {
@Autowired
private JobLauncherTestUtils jobLauncherTestUtils;
@Test
public void whenNumberGeneratorDecider_thenNotifyStepRuns() throws Exception {
JobExecution jobExecution = jobLauncherTestUtils.launchJob();
Collection<StepExecution> actualStepExecutions = jobExecution.getStepExecutions();
ExitStatus actualJobExitStatus = jobExecution.getExitStatus();
assertEquals(actualJobExitStatus.getExitCode().toString(), "COMPLETED");
assertEquals(actualStepExecutions.size(), 2);
boolean notifyStepDidRun = false;
Iterator<StepExecution> iterator = actualStepExecutions.iterator();
while(iterator.hasNext() && !notifyStepDidRun){
if(iterator.next().getStepName().equals("Notify step")){
notifyStepDidRun = true;
}
}
assertTrue(notifyStepDidRun);
}
}

77
spring-batch/src/test/java/org/baeldung/conditionalflow/model/NumberInfoUnitTest.java
View File

@ -1,44 +1,71 @@
package org.baeldung.conditionalflow.model;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import static org.junit.jupiter.api.Assertions.*;
@RunWith(SpringJUnit4ClassRunner.class)
class NumberInfoUnitTest {
@Test
void isPositive() {
assertTrue(NumberInfo.from(1).isPositive());
assertTrue(NumberInfo.from(11).isPositive());
assertFalse(NumberInfo.from(0).isPositive());
assertFalse(NumberInfo.from(-1).isPositive());
assertFalse(NumberInfo.from(-10).isPositive());
void whenPositive_isPositive() {
assertTrue(NumberInfo.from(1)
.isPositive());
assertTrue(NumberInfo.from(11)
.isPositive());
assertFalse(NumberInfo.from(0)
.isPositive());
}
@Test
void isEven() {
assertTrue(NumberInfo.from(0).isEven());
assertTrue(NumberInfo.from(-2).isEven());
assertTrue(NumberInfo.from(2).isEven());
assertTrue(NumberInfo.from(-22).isEven());
assertTrue(NumberInfo.from(22).isEven());
assertFalse(NumberInfo.from(1).isEven());
assertFalse(NumberInfo.from(-1).isEven());
assertFalse(NumberInfo.from(13).isEven());
assertFalse(NumberInfo.from(-13).isEven());
assertFalse(NumberInfo.from(31).isEven());
assertFalse(NumberInfo.from(-51).isEven());
void whenNegative_isPositive_isFalse() {
assertFalse(NumberInfo.from(-1)
.isPositive());
assertFalse(NumberInfo.from(-10)
.isPositive());
}
@Test
void getNumber() {
for(int i = -100 ; i < 100 ; i++){
assertEquals(i, NumberInfo.from(i).getNumber());
void whenEven_isEven() {
assertTrue(NumberInfo.from(0)
.isEven());
assertTrue(NumberInfo.from(-2)
.isEven());
assertTrue(NumberInfo.from(2)
.isEven());
assertTrue(NumberInfo.from(-22)
.isEven());
assertTrue(NumberInfo.from(22)
.isEven());
}
@Test
void whenOdd_isEven_isFalse() {
assertFalse(NumberInfo.from(1)
.isEven());
assertFalse(NumberInfo.from(-1)
.isEven());
assertFalse(NumberInfo.from(13)
.isEven());
assertFalse(NumberInfo.from(-13)
.isEven());
assertFalse(NumberInfo.from(31)
.isEven());
assertFalse(NumberInfo.from(-51)
.isEven());
}
@Test
void testStatic_fromMethod_equals_getNumber() {
for (int i = -100; i < 100; i++) {
assertEquals(i, NumberInfo.from(i)
.getNumber());
}
}
}

9
spring-batch/src/test/java/org/baeldung/conditionalflow/step/NumberInfoClassifierUnitTest.java
View File

@ -1,15 +1,14 @@
package org.baeldung.conditionalflow.step;
import org.baeldung.conditionalflow.model.NumberInfo;
import org.baeldung.conditionalflow.step.NumberInfoClassifier;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.*;
import org.baeldung.conditionalflow.model.NumberInfo;
import org.junit.jupiter.api.Test;
class NumberInfoClassifierUnitTest {
@Test
void process() throws Exception {
void process_convertsToInteger() throws Exception {
NumberInfoClassifier nic = new NumberInfoClassifier();
assertEquals(Integer.valueOf(4), nic.process(NumberInfo.from(4)));
assertEquals(Integer.valueOf(-4), nic.process(NumberInfo.from(-4)));

8
spring-batch/src/test/java/org/baeldung/conditionalflow/step/NumberInfoGeneratorUnitTest.java
View File

@ -1,14 +1,14 @@
package org.baeldung.conditionalflow.step;
import org.baeldung.conditionalflow.model.NumberInfo;
import org.junit.jupiter.api.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.baeldung.conditionalflow.model.NumberInfo;
import org.junit.jupiter.api.Test;
public class NumberInfoGeneratorUnitTest {
@Test
public void testGenerateNumbers() {
public void testGenerateNumbers_correctOrderAndValue() {
int[] numbers = new int[]{1, -2, 4, -10};
NumberInfoGenerator numberGenerator = new NumberInfoGenerator(numbers);
assertEquals(new NumberInfo(numbers[0]), numberGenerator.read());

2
spring-batch/xml/retryOutput.xml
View File

@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><transactionRecord><transactionRecord><age>10</age><amount>10000.0</amount><postCode>430222</postCode><transactionDate>2015-10-31 00:00:00</transactionDate><userId>1234</userId><username>sammy</username></transactionRecord><transactionRecord><age>10</age><amount>12321.0</amount><postCode>430222</postCode><transactionDate>2015-12-03 00:00:00</transactionDate><userId>9999</userId><username>john</username></transactionRecord></transactionRecord>
<?xml version="1.0" encoding="UTF-8"?><transactionRecord></transactionRecord>