Merge branch 'develop' of ssh://github.com/oasp/oasp4j into develop

Author: Drophoff

oasp4j-modules/oasp4j-batch/src/main/java/io/oasp/module/batch/common/impl/ChunkLoggingListener.java

@@ -0,0 +1,94 @@
+package io.oasp.module.batch.common.impl;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.batch.core.ItemProcessListener;
+import org.springframework.batch.core.ItemReadListener;
+import org.springframework.batch.core.ItemWriteListener;
+import org.springframework.batch.core.SkipListener;
+
+/**
+ * Spring Batch listener that logs exceptions together with the item(s) being processed at the time the exceptions
+ * occurred.
+ *
+ * @author Ludger Overbeck
+ */
+public class ChunkLoggingListener<T, S> implements SkipListener<T, S>, ItemReadListener<T>, ItemProcessListener<T, S>,
+    ItemWriteListener<S> {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ChunkLoggingListener.class);
+
+  protected String itemToString(Object item) {
+
+    return item.toString();
+  }
+
+  @Override
+  public void onReadError(Exception e) {
+
+    LOG.error("Failed to read item.", e);
+  }
+
+  @Override
+  public void onProcessError(T item, Exception e) {
+
+    LOG.error("Failed to process item: " + itemToString(item), e);
+  }
+
+  @Override
+  public void onWriteError(Exception e, List<? extends S> items) {
+
+    LOG.error("Failed to write items: " + itemToString(items), e);
+  }
+
+  @Override
+  public void onSkipInRead(Throwable t) {
+
+    LOG.warn("Skipped item in read.", t);
+  }
+
+  @Override
+  public void onSkipInProcess(T item, Throwable t) {
+
+    LOG.warn("Skipped item in process: " + itemToString(item), t);
+  }
+
+  @Override
+  public void onSkipInWrite(S item, Throwable t) {
+
+    LOG.warn("Skipped item in write: " + itemToString(item), t);
+  }
+
+  @Override
+  public void beforeRead() {
+
+  }
+
+  @Override
+  public void afterRead(T item) {
+
+  }
+
+  @Override
+  public void beforeProcess(T item) {
+
+  }
+
+  @Override
+  public void afterProcess(T item, S result) {
+
+  }
+
+  @Override
+  public void beforeWrite(List<? extends S> items) {
+
+  }
+
+  @Override
+  public void afterWrite(List<? extends S> items) {
+
+  }
+
+}

oasp4j-modules/oasp4j-batch/src/main/java/io/oasp/module/batch/common/impl/JobLauncherWithAdditionalRestartCapabilities.java

@@ -0,0 +1,68 @@
+package io.oasp.module.batch.common.impl;
+
+import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.JobParametersIncrementer;
+import org.springframework.batch.core.JobParametersInvalidException;
+import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.core.launch.support.SimpleJobLauncher;
+import org.springframework.batch.core.repository.JobExecutionAlreadyRunningException;
+import org.springframework.batch.core.repository.JobInstanceAlreadyCompleteException;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.JobRestartException;
+
+/**
+ * {@link JobLauncher} that extends the functionality provided by the standard {@link SimpleJobLauncher}:
+ * <p>
+ * For batches, which always restart from scratch (i.e. those marked with restartable="false"), the parameter's are
+ * 'incremented' automatically using the {@link JobParametersIncrementer} from the job (usually by adding or modifying
+ * the 'run.id' parameter). It is actually just a convenience functionality so that the one starting batches does not
+ * have to change the parameters manually.
+ *
+ * @author Ludger Overbeck
+ */
+public class JobLauncherWithAdditionalRestartCapabilities extends SimpleJobLauncher {
+
+  private JobRepository jobRepository;
+
+  @Override
+  public JobExecution run(final Job job, JobParameters jobParameters) throws JobExecutionAlreadyRunningException,
+      JobRestartException, JobInstanceAlreadyCompleteException, JobParametersInvalidException {
+
+    if (!job.isRestartable()) {
+
+      JobParameters originalParameters = jobParameters;
+      while (this.jobRepository.isJobInstanceExists(job.getName(), jobParameters)) {
+
+        // check if batch job is still running or was completed already
+        // analogous to SimpleJobRepository#createJobExecution
+        JobExecution jobExecution = this.jobRepository.getLastJobExecution(job.getName(), jobParameters);
+        if (jobExecution.isRunning()) {
+          throw new JobExecutionAlreadyRunningException("A job execution for this job is already running: "
+              + jobExecution.getJobInstance());
+        }
+        BatchStatus status = jobExecution.getStatus();
+        if (status == BatchStatus.COMPLETED || status == BatchStatus.ABANDONED) {
+          throw new JobInstanceAlreadyCompleteException("A job instance already exists and is complete for parameters="
+              + originalParameters + ".  If you want to run this job again, change the parameters.");
+        }
+
+        // if there is a NullPointerException executing the following statement
+        // there has not been a JobParametersIncrementer set for the job
+        jobParameters = job.getJobParametersIncrementer().getNext(jobParameters);
+      }
+    }
+
+    return super.run(job, jobParameters);
+  }
+
+  @Override
+  public void setJobRepository(JobRepository jobRepository) {
+
+    super.setJobRepository(jobRepository);
+    this.jobRepository = jobRepository;
+  }
+
+}

pom.xml

@@ -178,6 +178,7 @@
           <version>2.9.1</version>
         </plugin>
         <plugin>
+
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>1.8</version>