Commit Graph

1630 Commits

Author SHA1 Message Date
Michael Minella
1c42d8807c BATCH-2169: Added warning message for when users use java config with @StepScope 2014-02-21 16:59:53 -06:00
jpraet
ad5c7b29d2 add and fix unit tests related to BATCH-1980 2014-02-21 16:59:53 -06:00
jpraet
4340276337 possible fix for BATCH-1980 2014-02-21 16:59:53 -06:00
Michael Minella
3510285c8b BATCH-2179: Updated to add unidentifying flag to properties as they are returned if applicable 2014-02-20 16:18:51 -06:00
Michael Minella
cc3c7593c8 BATCH-2126: Added synchronization around formatters in DefaultJobParametersConverter 2014-02-20 15:54:11 -06:00
Chris Schaefer
ef0823938c BATCH-2111: Java 8 / Upgrade to Spring 4
* Upgrade Spring framework to 4.0.2.RELEASE
* Upgrade maven compiler plugin to 3.1
* Use LinkedHashMap to preseve ordering in AbstractFlowParser (found when upgrading to JDK 8)
* Match on EnhancerBySpringCGLIB in StepScopeProxyTargetClassOverrideIntegrationTests (SPR-11398)
2014-02-20 12:53:32 -06:00
Michael Minella
f53ef655e4 BATCH-2175: Added the ability to inject lobType 2014-02-20 11:22:23 -06:00
Chris Schaefer
5bf53d6a93 BATCH-2080: Clean up "Invalid JavaBean property 'itemWriter' being accessed" warnings
Disambiguate tasklet/item(reader,processor,writer)/chunkCompletionPolicy properties in subclass
2014-02-18 23:01:44 -05:00
Chris Schaefer
f87bf69dcf PartitionParserTests fixes
testFullPartitionConfigurationWithMapperSuppliedProperties
* remove assert on PartitionMapper.name as PropertyPartitionMapper is used and
  PartitionMapper.name does not get populated.

testFullPartitionConfigurationWithHardcodedProperties
* when run as part of the suite, the static fields name was populated by another test case.
  add explicit reference and hardcoded property to job def
2014-02-18 12:46:53 -05:00
Michael Minella
6211c95d42 Fixed the way default java.util.Properteis are handled on restarts 2014-02-13 10:55:58 -06:00
Chris Schaefer
a1ee097dd4 * During pre-parsing of XML look for references to the same bean and if multiple
matches found, create new bean definitions and update the reference in the preprocessed
XML to allow for unique instances.

* Use job scope for job level listeners

* Remove call to application context close in JsrJobOperator.restart

Fixes TCK tests:
--
testTransitionElementOnAttrValuesWithRestartJobParamOverrides
testChunkArtifactInstanceUniqueness
testOneArtifactIsJobAndStepListener
2014-02-12 17:11:06 -05:00
Michael Minella
1a6ba98fc4 Created a JSR-352 specific StepState to maintain in the Job's
ExecutionContext what the last step executed was.  This is needed for
restarts when the step to restart at is a DecisionStep.
2014-02-12 12:21:44 -06:00
Michael Minella
9317ab2565 BATCH-2112: Removed Spring Batch's SerializationUtils in favor of the Spring Core version 2014-02-12 11:23:03 -06:00
Michael Minella
0b5bad920b Updated per code review 2014-02-11 11:36:05 -06:00
Michael Minella
9a5f59f749 Updated to handle the transition between splits and decisions 2014-02-10 17:18:32 -06:00
Michael Minella
ac974c8d5e Per JSR-352, Decision steps are always executed on restart. This changes the configuration of those steps to enforce that. 2014-02-06 17:12:39 -06:00
Michael Minella
70875e946a Changed FlowParser to always include a transition for COMPLETED unless a next attribute is present 2014-02-06 13:03:45 -06:00
Michael Minella
b278239751 BATCH-2110: Updated batch to support Spring 4
* Refactored iBatis based readers and writers to not utilize
 SqlMapClientTemplate.
* Depricated all iBatis based readers and writers in favor of MyBatis's
 native Spring support.
* Updated XStream support to 1.4.4 and Jettison to 1.2 to be in
 alignment with Spring 4.
* Added the PooledEmbeddedDataSource to address the issue outlined in
 SPR-11372.
2014-02-06 11:34:33 -06:00
Michael Minella
ed310069fe BATCH-2163: Updated documentation and copyright dates 2014-02-05 16:35:38 -06:00
Luke Taylor
2c007deaf6 BATCH-2163: Add support for SQLite.
Adds a DatabaseType, scripts, a DataFieldMaxValueIncrementer and
a PagingQueryProvider for SQLite.
2014-02-05 16:16:07 -06:00
Michael Minella
cde60fe938 Per JSR-352, restart is a two step process, establishing where to begin
evaluation and then evaluating each state.  This update addresses the
flagging of the point the current job restarted from so that the
evaluation of restart can occur in subsequent states.
2014-01-28 15:04:53 -06:00
Michael Minella
3853088394 Updated to correctly handle state management on restarts per JSR-352
* Added a JSR-352 specific StepHandler implementation
(DefaultStepHandler)
* Added logic to DefaultFlow to correctly lookup where to restart a job
that was previously stopped.
2014-01-17 14:45:47 -06:00
Michael Minella
8f9783f0d4 Created JSR-352 specific SplitState to address resetting the JobExecution's ExitStatus after a split executes 2014-01-16 16:24:19 -06:00
Chris Schaefer
ea7a704299 Add failed transition if none exists when next attribute is used.
Fixes TCK test testStartLimitVariation1
2014-01-13 16:13:44 -05:00
Michael Minella
b0c9af5e8e Fixes for stopping a partitioned step
* StepState now implements StepLocator so that the step it wraps can return slave steps in the case of a partitioned step
* FlowJob and SimpleJob now look for a StepLocator as they look for steps
* The JSR-352 version of PartitionStep implements StepLocator
2014-01-08 13:51:49 -06:00
Michael Minella
589ffdc9b7 Consolidated the calculation for non default ExitStatuses and applied that logic on job stops 2014-01-03 15:11:22 -06:00
Michael Minella
62c541ee42 Implemented the restart functionality for a partitioned step
* Updated parsers to address the allowStartIfComplete flag on
 partitioned steps
* Updated factory beans to address the above flag and injecting a
 JobRepository reference where needed
* Updated how state is restored for a JSR-352 partitioned step
* Fixed the synchronization around the queue used for a
 PartitionCollecotr and PartitionAnalyzer works
2014-01-03 13:13:17 -06:00
Chris Schaefer
6d26e40cc8 Implement onSkipInWrite for delegate to handle
Fixes TCK tests: testChunkSkipWrite and testChunkSkipWriteExceedSkip
2014-01-02 17:07:29 -05:00
Michael Minella
681c1dccd9 Changed the exception being thrown in the ChunkListenerAdatper from BatchRuntimeExcpetion to UncheckedTransactionException so it will be unwrapped by TaskletStep 2014-01-02 14:53:53 -06:00
Chris Schaefer
c46a134539 * Update copyright year
* Move addition of state transition for elements with a next transition to be last
* Move restartable check into run method on restart to avoid NPE in factory bean due to null JobExecution.
* Add tests

Transition shuffle fixes TCK test testInvokeJobWithUncaughtExceptionFailAndRestart, NPE fix contributes to other tests but does not fix completely.
2014-01-02 14:32:24 -05:00
Michael Minella
874b92d4b2 BATCH-2151: Clean up ChunkMonitor offset on chunk boundries 2013-12-30 12:06:43 -06:00
Tobias Flohre
6edc91fcea BATCH-2149 2013-12-30 12:06:43 -06:00
Michael Minella
440e234c58 BATCH-2149: Updated unit tests to demonstrate functionality 2013-12-30 12:06:43 -06:00
Michael Minella
1730206d76 Renamed unit test so it will be executed in the build 2013-12-30 12:06:43 -06:00
Michael Minella
9ec3a4facb BATCH-2149: Updated test to validate both the simple and fault tolerant use cases 2013-12-30 12:06:43 -06:00
Michael Minella
3f0c0cd45d BATCH-2148: Fixed missing commas in schema-mysql.sql 2013-12-30 12:06:43 -06:00
Michael Minella
f75d7fa922 BATCH-2150: Added private constructor to StepExecution for use by Jackson deserialization 2013-12-30 12:06:43 -06:00
Michael Minella
755c75bedb Fixed merge issue from Job scope merge 2013-12-19 10:41:23 -06:00
Michael Minella
0e2edd295f Added new EndState to support JSR behavior for setting the JobExecution#exitStatus 2013-12-18 13:19:42 -06:00
Chris Schaefer
d76209df10 Prevent NPE when checking for a re-runnable continued flow, remove usage of
state transition comparator in FlowParser, ensure custom exit code is set at
job level.

Fixes TCK test testDeciderExitStatusIsSetOnJobContext, contributes but does
not fix decider transition tests that include restart.
2013-12-18 10:36:50 -05:00
Michael Minella
3e5597717e Refactored setting of completion policy to not overwrite JSR defaults 2013-12-17 14:30:36 -06:00
Michael Minella
2f63bd0664 Updated to call PartitionCollector regardless of if the partition completes successfully 2013-12-16 15:40:36 -06:00
Michael Minella
bfd6bccd72 Added synchronization to the setting of partition data 2013-12-16 14:33:24 -06:00
Michael Minella
b9b23e639d Updated the JsrStepExecutionSplitter to provide a copy of the JobExecution per partition 2013-12-16 14:07:44 -06:00
Michael Minella
874a171601 Fixed threading issue in JsrPartitionHandler 2013-12-16 13:10:47 -06:00
Michael Minella
ee30259612 Added double check that all partition data has been processed before ending 2013-12-16 12:59:30 -06:00
Michael Minella
b5d48df0cf Added cleanup code around tests so that StepScope registration was
cleaned up.
2013-12-16 12:09:08 -06:00
Michael Minella
241d9f101f BATCH-1701: Implementation of JobScope
* Updated Job and Step scopes to use common class introduced by jpraet
* Updated Job and Step Synchronization Managers to use common class
 introduced by jpraet
* Updated JobScope related code to not be concerned with Spring 2.5
 (which is what batch was on when the PR was opened).
2013-12-16 09:21:27 -06:00
jpraet
2436d84210 BATCH-1701: Introduce job scope 2013-12-13 16:44:15 -06:00
Chris Schaefer
e5fc0665cc Remove property resolution through the original bean factory post processor and move resolution to
occur during XML pre-processing. JSR-352 allows for property replacement and expressions to be present
on any element and the preprocessing provides the ability to load a well formed XML document into the
context with the intended values already present.
2013-12-13 17:02:19 -05:00