Commit Graph

4228 Commits

Author SHA1 Message Date
Dave Syer
e2bbd398fd Defensively clear step context to prevent test failure 2013-01-15 10:27:32 +00:00
Michael Minella
0aa78d8f79 Merge pull request #106 from dsyer/BATCH-1948
* BATCH-1948:
  BATCH-1948: Formatting and javadoc fixes
  BATCH-1948: Add @StepScope and associated tests
2013-01-11 16:03:36 -06:00
Michael Minella
014e5bf523 BATCH-1948: Formatting and javadoc fixes 2013-01-11 16:02:01 -06:00
Dave Syer
43bfc0769e BATCH-1948: Add @StepScope and associated tests 2013-01-11 15:34:05 -06:00
Michael Minella
aadc5ee39e BATCH-1949: Updated for autoproxy check 2013-01-11 15:01:51 -06:00
Michael Minella
fcede7245e Merge pull request #107 from mminella/BATCH-1949
BATCH-1949: Removed Spring 3 checks and updated documentation
2013-01-11 12:13:29 -08:00
Michael Minella
2e0cba57f7 BATCH-1949: Removed Spring 3 checks and updated documentation accordingly 2013-01-11 14:09:20 -06:00
Dave Syer
5a427ca5f1 Merge pull request #104 from mminella/BATCH-1667
* BATCH-1667:
  BATCH-1667: Update to update the StepExecution as the listener is being processed
2013-01-10 16:39:00 +00:00
Michael Minella
f88e8b6ff1 BATCH-1667: Update to update the StepExecution as the listener is being processed 2013-01-10 16:39:00 +00:00
Michael Minella
e0667121f5 Removing unnecessiceary @Depricated degisgnation 2013-01-10 08:21:55 -06:00
Dave Syer
d0f8772a60 Fix some javadoc errors 2013-01-10 10:37:02 +00:00
Michael Minella
c097055288 Removing redundant dependency on JPA 1.0 jar to fix integration test 2013-01-09 11:00:14 -06:00
Michael Minella
057cb32219 Merge pull request #105 from mminella/BATCH-1943
BATCH-1943: Added ChunkContext to all ChunkListener calls
2013-01-09 07:35:45 -08:00
Michael Minella
5205c43e7d BATCH-1943: Added ChunkContext to all ChunkListener calls 2013-01-09 09:29:05 -06:00
Michael Minella
8fdc94c948 Merge pull request #103 from mminella/BATCH-1714
Merged.  I like the idea of adding the ChunkContext to the other methods and will do that as part of a separate Jira item/pull request.
2013-01-09 06:26:15 -08:00
Michael Minella
e8bde07a73 BATCH-1714: Added ChunkListener#afterFailedChunk(ChunkContext context) 2013-01-04 13:02:58 -06:00
Michael Minella
4b20665aa5 Merge pull request #99 from mminella/BATCH-1904
* BATCH-1904:
  BATCH-1904: Removed System.out
  BATCH-1904: Fixed integration pom comment.
  BATCH-1904: Updated to support Hibernate 4
2012-12-31 09:12:47 -06:00
Michael Minella
24e662bb69 BATCH-1904: Removed System.out 2012-12-31 09:08:57 -06:00
Michael Minella
6b35a73c2a BATCH-1904: Fixed integration pom comment. 2012-12-31 09:08:57 -06:00
Michael Minella
6955ab1d6b BATCH-1904: Updated to support Hibernate 4 2012-12-31 09:08:57 -06:00
Michael Minella
1824fff441 Merge pull request 101 from chrisjs/BATCH-1940
* BATCH-1940:
  BATCH-1940: Replace org.springframework.batch.support.JdbcTestUtils with org.springframework.test.jdbc.JdbcTestUtils
2012-12-31 08:41:14 -06:00
Chris Schaefer
a6ab68bbbb BATCH-1940: Replace org.springframework.batch.support.JdbcTestUtils with org.springframework.test.jdbc.JdbcTestUtils 2012-12-31 08:35:06 -06:00
Michael Minella
e9680c7f61 Merge pull request 100 from chrisjs/BATCH-1915
* BATCH-1915:
  BATCH-1915: Reformatting
  BATCH-1915: Change minimum compiler level to 1.6 and use @Override everywhere
2012-12-31 08:11:46 -06:00
Michael Minella
96c818e86f BATCH-1915: Reformatting 2012-12-31 08:10:08 -06:00
Chris Schaefer
a583c3a421 BATCH-1915: Change minimum compiler level to 1.6 and use @Override everywhere 2012-12-27 17:45:28 -05:00
Michael Minella
0c264c5771 Merge pull request #98 from chrisjs/BATCH-1939
BATCH-1939: Minor cleanups to AMQP sample
2012-12-24 08:01:14 -08:00
Chris Schaefer
dfe13ed07d BATCH-1939: Minor cleanups to AMQP sample 2012-12-21 18:53:20 -05:00
Michael Minella
a799f39266 Merge pull request #97 from mminella/BATCH-1916
BATCH-1916: Updated javadoc
2012-12-21 07:38:30 -08:00
Michael Minella
344c53e718 BATCH-1916: Updated javadoc to correctly reflect how RecordSeparatorPolicy#isEndOfRecord() works 2012-12-21 09:33:57 -06:00
Michael Minella
b6cbcd4b52 Merge pull request #96 from mminella/BATCH-1938
BATCH-1938: Updated 2.2 branch to support Spring 3.2.0.RELEASE
2012-12-20 14:00:56 -08:00
Michael Minella
c38a096fe0 BATCH-1938: Updated pom to reference Spring 3.2.0.RELEASE 2012-12-20 15:53:41 -06:00
Michael Minella
a193e1051f BATCH-1938: Upgraded to Spring 3.2.0.RELEASE 2012-12-20 15:40:02 -06:00
Michael Minella
de0bf2b5e1 Merge pull request #94 from wxlund/BATCH-1920
* BATCH-1920:
  BATCH-1920 - Corrected pom and removed unused reference to JdbcTemplate
  And now commit with the files that have been added for the sample.
  Provided a sample to support AmqpItemReader/Writer addition to spring-batch-2.2.
  Had to add back in the reference to sqlfire.
  Modified core to support drop and schema-sqlf.sql but leverages derby syntax outside of connection string. Modified *.properties file to add additional property "batch.isolationlevel=ISOLATION_SERIALIZABLE because batch-sqlf.properties needs batch.isolationlevel=ISOLATION_READ_COMMITTED. Added corresponding sqlf properties and sqlf files. Modified simple-job-launcher-context.xml to support the p:isolationLevelForCreate="${batch.isolationlevel}"
2012-12-18 13:47:21 -06:00
Michael Minella
95ccb1a229 BATCH-1920 - Corrected pom and removed unused reference to JdbcTemplate 2012-12-18 13:46:10 -06:00
wxlund
96f870af4f And now commit with the files that have been added for the sample. 2012-12-18 13:21:32 -06:00
wxlund
bfb406a1cf Provided a sample to support AmqpItemReader/Writer addition to spring-batch-2.2. 2012-12-18 13:21:32 -06:00
wxlund
9e840026e3 Had to add back in the reference to sqlfire. 2012-12-18 13:21:32 -06:00
wxlund
0d7bf2cd71 Modified core to support drop and schema-sqlf.sql but leverages derby syntax outside of connection string.
Modified *.properties file to add additional property "batch.isolationlevel=ISOLATION_SERIALIZABLE
because batch-sqlf.properties needs batch.isolationlevel=ISOLATION_READ_COMMITTED.
Added corresponding sqlf properties and sqlf files.
Modified simple-job-launcher-context.xml to support the p:isolationLevelForCreate="${batch.isolationlevel}"
2012-12-18 13:21:32 -06:00
Michael Minella
d3ff7c7a6e Merge pull request #74 from snicoll/BATCH-1911
* BATCH-1911:
  BATCH-1911 - Fixed merge conflicts and schema version issue
  StepRegistry is now a first-class (optional) component: - MapJobRegistry no longer implements StepRegistry - DefaultJobLoader updates the stepRegistry when it is available - Added more tests to cover the cases where the step registry is not available
  registering twice the same jobName on the step registry is not allowed (consistency with JobRegistry)
  delegating synchronization to ConcurrentHashMap instead of  dealing that ourselves.
  Added the concept of a StepRegistry that tracks the Step instance attached to a Job.
2012-12-17 16:32:05 -06:00
Michael Minella
75ee3e0bb4 BATCH-1911 - Fixed merge conflicts and schema version issue 2012-12-17 16:31:06 -06:00
Stéphane Nicoll
8abd2ec69f StepRegistry is now a first-class (optional) component:
- MapJobRegistry no longer implements StepRegistry
- DefaultJobLoader updates the stepRegistry when it is available
- Added more tests to cover the cases where the step registry is not available
2012-12-17 16:13:57 -06:00
Stéphane Nicoll
2870628c85 registering twice the same jobName on the step registry is not allowed (consistency with JobRegistry) 2012-12-17 16:11:50 -06:00
Stéphane Nicoll
25f732e06b delegating synchronization to ConcurrentHashMap instead of dealing that ourselves. 2012-12-17 16:11:50 -06:00
Stéphane Nicoll
00ee45854e Added the concept of a StepRegistry that tracks the Step instance attached to a Job.
- Added a simple MapStepRegistry that keeps track of the step in a simple map per job
- MapJobRegistry implements StepRegistry as well using the delegate pattern
- DefaultJobLoader makes sure to initialize both registries now. Auto-detects that the JobRegistry implements StepRegistry
- JobSupport now implements StepLocator so that such job can be loaded by the DefaultJobLoader
- Also registering any "detached" step available for a particular job to that job if that wasn't done yet. Since a partition handler may link to any step by name, the step registry must be filled with any step that are available in the context of a job. If each job is located in its own application context, this is just fine. If more than one job is defined in the same context, the step registry may be able to return a step that is not related to that job but it shouldn't hurt as this happens only if a component is explicitly asking to execute a step by name for a particular job.
2012-12-17 16:11:50 -06:00
Michael Minella
b345e1c072 Merge pull request #80 from dsyer/BATCH-1918
* BATCH-1918:
  BATCH-1918: Fixed javadoc errors
  BATCH-1918: First effort at @EnableBatchProcessing
2012-12-17 15:33:27 -06:00
Michael Minella
f64a5deff9 BATCH-1918: Fixed javadoc errors 2012-12-17 15:32:16 -06:00
Dave Syer
25cd6d6826 BATCH-1918: First effort at @EnableBatchProcessing
Example:

    @Configuration
    @EnableBatchProcessing
    public class RetrySampleConfiguration {

      @Autowired
      private JobBuilderFactory jobs;

      @Autowired
      private StepBuilderFactory steps;

      @Bean
      public Job retrySample() throws Exception {
        return jobs.get("retrySample").start(step()).build();
      }

      @Bean
      protected Step step() throws Exception {
        return steps.get("step").<Trade, Object> chunk(1).reader(reader()).writer(writer()).faultTolerant()
          .retry(Exception.class).retryLimit(3).build();
      }

      @Bean
      protected ItemReader<Trade> reader() {
        GeneratingTradeItemReader reader = new GeneratingTradeItemReader();
        reader.setLimit(10);
        return reader;
      }

      @Bean
      protected ItemWriter<Object> writer() {
        return new RetrySampleItemWriter<Object>();
      }

    }
2012-12-17 14:17:48 -06:00
Michael Minella
96de2dc4e9 Merge pull request #92 from dsyer/BATCH-1923
* BATCH-1923:
  BATCH-1923: Fixed javadoc errors
  BATCH-1923: add stop() methods to FlowBuilder
2012-12-17 13:43:57 -06:00
Michael Minella
b2d1dcbfdb BATCH-1923: Fixed javadoc errors 2012-12-17 13:42:48 -06:00
Michael Minella
100467ba4e Merged pull request 84 from chrisjs/BATCH-1928
* BATCH-1928:
  BATCH-1928: Converted to using JdbcOperations over JdbcTemplate
  BATCH-1928: Convert deprecated classes from the org.springframework.jdbc.core.simple package in samples
2012-12-17 09:18:02 -06:00