Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RESOLVED - issue BATCH-1137: Move classifier to separate package?

Browse Source
This commit is contained in:
dsyer
2009-03-14 16:04:07 +00:00
parent 5244ef07ca
commit 726e37ed1a
32 changed files with 58 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchRetryTemplate.java
View File

@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.retry.ExhaustedRetryException;
import org.springframework.batch.retry.RecoveryCallback;
import org.springframework.batch.retry.RetryCallback;
@@ -35,7 +36,6 @@ import org.springframework.batch.retry.policy.RetryContextCache;
import org.springframework.batch.retry.support.DefaultRetryState;
import org.springframework.batch.retry.support.RetrySynchronizationManager;
import org.springframework.batch.retry.support.RetryTemplate;
import org.springframework.batch.support.Classifier;
/**
* A special purpose retry template that deals specifically with multi-valued

4
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java
View File

@@ -20,6 +20,8 @@ import java.util.Collections;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.classify.BinaryExceptionClassifier;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.core.StepContribution;
import org.springframework.batch.core.step.skip.LimitCheckingItemSkipPolicy;
import org.springframework.batch.core.step.skip.NonSkippableProcessException;
@@ -31,8 +33,6 @@ import org.springframework.batch.retry.RetryCallback;
import org.springframework.batch.retry.RetryContext;
import org.springframework.batch.retry.RetryException;
import org.springframework.batch.retry.support.DefaultRetryState;
import org.springframework.batch.support.BinaryExceptionClassifier;
import org.springframework.batch.support.Classifier;
public class FaultTolerantChunkProcessor<I, O> extends SimpleChunkProcessor<I, O> {

2
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
View File

@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.core.JobInterruptedException;
import org.springframework.batch.core.step.skip.LimitCheckingItemSkipPolicy;
import org.springframework.batch.core.step.skip.NonSkippableReadException;
@@ -39,7 +40,6 @@ import org.springframework.batch.retry.policy.MapRetryContextCache;
import org.springframework.batch.retry.policy.NeverRetryPolicy;
import org.springframework.batch.retry.policy.RetryContextCache;
import org.springframework.batch.retry.policy.SimpleRetryPolicy;
import org.springframework.batch.support.Classifier;
/**
* Factory bean for step that provides options for configuring skip behaviour.

2
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java
View File

@@ -19,6 +19,7 @@ import java.util.Collection;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.springframework.batch.classify.BinaryExceptionClassifier;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.exception.ExceptionHandler;
import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
@@ -26,7 +27,6 @@ import org.springframework.batch.retry.RetryCallback;
import org.springframework.batch.retry.RetryContext;
import org.springframework.batch.retry.RetryPolicy;
import org.springframework.batch.retry.listener.RetryListenerSupport;
import org.springframework.batch.support.BinaryExceptionClassifier;
/**
* An {@link ExceptionHandler} that is aware of the retry context so that it can

5
spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java
View File

@@ -18,11 +18,12 @@ package org.springframework.batch.core.step.skip;
import java.io.FileNotFoundException;
import java.util.Collection;
import java.util.Collections;
import org.springframework.batch.classify.BinaryExceptionClassifier;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.core.Step;
import org.springframework.batch.core.StepExecution;
import org.springframework.batch.item.file.FlatFileParseException;
import org.springframework.batch.support.BinaryExceptionClassifier;
import org.springframework.batch.support.Classifier;
/**
* <p>

2
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java
View File

@@ -10,6 +10,7 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.classify.BinaryExceptionClassifier;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.StepContribution;
import org.springframework.batch.core.StepExecution;
@@ -19,7 +20,6 @@ import org.springframework.batch.item.ItemProcessor;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.item.support.PassThroughItemProcessor;
import org.springframework.batch.retry.policy.NeverRetryPolicy;
import org.springframework.batch.support.BinaryExceptionClassifier;
import org.springframework.dao.DataIntegrityViolationException;
public class FaultTolerantChunkProcessorTests {

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/BackToBackPatternClassifier.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/BackToBackPatternClassifier.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import java.util.Map;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/BinaryExceptionClassifier.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/BinaryExceptionClassifier.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import java.util.Collection;
import java.util.HashMap;

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/Classifier.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/Classifier.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
/**
* Interface for a classifier. At its simplest a {@link Classifier} is just a

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ClassifierAdapter.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/ClassifierAdapter.java
View File

@@ -13,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import org.springframework.batch.support.MethodInvoker;
import org.springframework.batch.support.MethodInvokerUtils;
import org.springframework.util.Assert;
/**

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/ClassifierSupport.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/ClassifierSupport.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
/**
* Base class for {@link Classifier} implementations. Provides default behaviour
@@ -39,7 +39,7 @@ public class ClassifierSupport<C, T> implements Classifier<C, T> {
* Always returns the default value. This is the main extension point for
* subclasses, so it must be able to classify null.
*
* @see org.springframework.batch.support.Classifier#classify(Object)
* @see org.springframework.batch.classify.Classifier#classify(Object)
*/
public T classify(C throwable) {
return defaultValue;

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatchingClassifier.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/PatternMatchingClassifier.java
View File

@@ -13,11 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import java.util.HashMap;
import java.util.Map;
import org.springframework.batch.support.PatternMatcher;
/**
* A {@link Classifier} that maps from String patterns with wildcards to a set
* of values of a given type. An input String is matched with the most specific

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SubclassClassifier.java → spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/SubclassClassifier.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import java.io.Serializable;
import java.util.Comparator;

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java
View File

@@ -21,9 +21,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.classify.ClassifierSupport;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.support.Classifier;
import org.springframework.batch.support.ClassifierSupport;
/**
* Calls one of a collection of ItemWriters for each item, based on a router

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java
View File

@@ -18,10 +18,10 @@ package org.springframework.batch.repeat.exception;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.classify.ClassifierSupport;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.RepeatException;
import org.springframework.batch.support.Classifier;
import org.springframework.batch.support.ClassifierSupport;
/**
* Implementation of {@link ExceptionHandler} based on an {@link Classifier}.

4
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java
View File

@@ -22,10 +22,10 @@ import java.util.Map.Entry;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.classify.SubclassClassifier;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.context.RepeatContextCounter;
import org.springframework.batch.support.Classifier;
import org.springframework.batch.support.SubclassClassifier;
import org.springframework.util.ObjectUtils;
/**

6
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java
View File

@@ -19,12 +19,12 @@ package org.springframework.batch.retry.policy;
import java.util.HashMap;
import java.util.Map;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.classify.ClassifierSupport;
import org.springframework.batch.classify.SubclassClassifier;
import org.springframework.batch.retry.RetryContext;
import org.springframework.batch.retry.RetryPolicy;
import org.springframework.batch.retry.context.RetryContextSupport;
import org.springframework.batch.support.Classifier;
import org.springframework.batch.support.ClassifierSupport;
import org.springframework.batch.support.SubclassClassifier;
import org.springframework.util.Assert;
/**

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java
View File

@@ -19,10 +19,10 @@ package org.springframework.batch.retry.policy;
import java.util.Collection;
import java.util.HashSet;
import org.springframework.batch.classify.BinaryExceptionClassifier;
import org.springframework.batch.retry.RetryContext;
import org.springframework.batch.retry.RetryPolicy;
import org.springframework.batch.retry.context.RetryContextSupport;
import org.springframework.batch.support.BinaryExceptionClassifier;
/**
*

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/DefaultRetryState.java
View File

@@ -15,11 +15,11 @@
*/
package org.springframework.batch.retry.support;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.retry.RecoveryCallback;
import org.springframework.batch.retry.RetryCallback;
import org.springframework.batch.retry.RetryOperations;
import org.springframework.batch.retry.RetryState;
import org.springframework.batch.support.Classifier;
/**
*

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/BackToBackPatternClassifierTests.java → spring-batch-infrastructure/src/test/java/org/springframework/batch/classify/BackToBackPatternClassifierTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import static org.junit.Assert.assertEquals;
@@ -23,6 +23,8 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.classify.BackToBackPatternClassifier;
import org.springframework.batch.classify.PatternMatchingClassifier;
import org.springframework.batch.support.annotation.Classifier;
/**

5
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/BinaryExceptionClassifierTests.java → spring-batch-infrastructure/src/test/java/org/springframework/batch/classify/BinaryExceptionClassifierTests.java
View File

@@ -14,9 +14,12 @@
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import java.util.Collections;
import org.springframework.batch.classify.BinaryExceptionClassifier;
import junit.framework.TestCase;
public class BinaryExceptionClassifierTests extends TestCase {

7
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/ClassifierAdapterTests.java → spring-batch-infrastructure/src/test/java/org/springframework/batch/classify/ClassifierAdapterTests.java
View File

@@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.springframework.batch.classify.ClassifierAdapter;
import org.springframework.batch.support.annotation.Classifier;
/**
@@ -82,7 +83,7 @@ public class ClassifierAdapterTests {
@Test
public void testClassifierAdapterClassifier() {
adapter = new ClassifierAdapter<String, Integer>(
new org.springframework.batch.support.Classifier<String, Integer>() {
new org.springframework.batch.classify.Classifier<String, Integer>() {
public Integer classify(String classifiable) {
return Integer.valueOf(classifiable);
}
@@ -116,7 +117,7 @@ public class ClassifierAdapterTests {
@Test
public void testClassifyWithClassifier() {
adapter.setDelegate(new org.springframework.batch.support.Classifier<String, Integer>() {
adapter.setDelegate(new org.springframework.batch.classify.Classifier<String, Integer>() {
public Integer classify(String classifiable) {
return Integer.valueOf(classifiable);
}

4
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/ClassifierSupportTests.java → spring-batch-infrastructure/src/test/java/org/springframework/batch/classify/ClassifierSupportTests.java
View File

@@ -14,7 +14,9 @@
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import org.springframework.batch.classify.ClassifierSupport;
import junit.framework.TestCase;

3
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/PatternMatchingClassifierTests.java → spring-batch-infrastructure/src/test/java/org/springframework/batch/classify/PatternMatchingClassifierTests.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import static org.junit.Assert.*;
@@ -22,6 +22,7 @@ import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.classify.PatternMatchingClassifier;
/**
* @author Dave Syer

3
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/SubclassExceptionClassifierTests.java → spring-batch-infrastructure/src/test/java/org/springframework/batch/classify/SubclassExceptionClassifierTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.batch.support;
package org.springframework.batch.classify;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.HashMap;
import org.junit.Test;
import org.springframework.batch.classify.SubclassClassifier;
public class SubclassExceptionClassifierTests {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java
View File

@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.springframework.batch.classify.PatternMatchingClassifier;
import org.springframework.batch.item.ItemWriter;
import org.springframework.batch.support.PatternMatchingClassifier;
/**
* @author Dave Syer

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java
View File

@@ -23,9 +23,9 @@ import junit.framework.TestCase;
import org.apache.log4j.Logger;
import org.apache.log4j.SimpleLayout;
import org.apache.log4j.WriterAppender;
import org.springframework.batch.classify.ClassifierSupport;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.exception.LogOrRethrowExceptionHandler.Level;
import org.springframework.batch.support.ClassifierSupport;
public class LogOrRethrowExceptionHandlerTests extends TestCase {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java
View File

@@ -20,9 +20,9 @@ import java.util.Collections;
import java.util.HashMap;
import junit.framework.TestCase;
import org.springframework.batch.classify.Classifier;
import org.springframework.batch.retry.RetryContext;
import org.springframework.batch.retry.RetryPolicy;
import org.springframework.batch.support.Classifier;
public class ExceptionClassifierRetryPolicyTests extends TestCase {

6
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/DefaultRetryStateTests.java
View File

@@ -20,7 +20,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.springframework.batch.support.Classifier;
import org.springframework.batch.classify.Classifier;
/**
* @author Dave Syer
@@ -30,7 +30,7 @@ public class DefaultRetryStateTests {
/**
* Test method for
* {@link org.springframework.batch.retry.support.DefaultRetryState#DefaultRetryState(java.lang.Object, boolean, org.springframework.batch.support.Classifier)}.
* {@link org.springframework.batch.retry.support.DefaultRetryState#DefaultRetryState(java.lang.Object, boolean, org.springframework.batch.classify.Classifier)}.
*/
@Test
public void testDefaultRetryStateObjectBooleanClassifierOfQsuperThrowableBoolean() {
@@ -46,7 +46,7 @@ public class DefaultRetryStateTests {
/**
* Test method for
* {@link org.springframework.batch.retry.support.DefaultRetryState#DefaultRetryState(java.lang.Object, org.springframework.batch.support.Classifier)}.
* {@link org.springframework.batch.retry.support.DefaultRetryState#DefaultRetryState(java.lang.Object, org.springframework.batch.classify.Classifier)}.
*/
@Test
public void testDefaultRetryStateObjectClassifierOfQsuperThrowableBoolean() {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java
View File

@@ -27,6 +27,7 @@ import static org.easymock.EasyMock.*;
import java.util.Collections;
import org.junit.Test;
import org.springframework.batch.classify.BinaryExceptionClassifier;
import org.springframework.batch.retry.ExhaustedRetryException;
import org.springframework.batch.retry.RecoveryCallback;
import org.springframework.batch.retry.RetryCallback;
@@ -37,7 +38,6 @@ import org.springframework.batch.retry.backoff.BackOffPolicy;
import org.springframework.batch.retry.backoff.StatelessBackOffPolicy;
import org.springframework.batch.retry.policy.NeverRetryPolicy;
import org.springframework.batch.retry.policy.SimpleRetryPolicy;
import org.springframework.batch.support.BinaryExceptionClassifier;
/**
* @author Rob Harrop

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/StatefulRecoveryRetryTests.java
View File

@@ -27,6 +27,7 @@ import java.util.Collections;
import java.util.List;
import org.junit.Test;
import org.springframework.batch.classify.BinaryExceptionClassifier;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.context.RepeatContextSupport;
import org.springframework.batch.repeat.support.RepeatSynchronizationManager;
@@ -40,7 +41,6 @@ import org.springframework.batch.retry.RetryPolicy;
import org.springframework.batch.retry.policy.MapRetryContextCache;
import org.springframework.batch.retry.policy.NeverRetryPolicy;
import org.springframework.batch.retry.policy.SimpleRetryPolicy;
import org.springframework.batch.support.BinaryExceptionClassifier;
import org.springframework.dao.DataAccessException;
public class StatefulRecoveryRetryTests {

4
spring-batch-parent/pom.xml
View File

@@ -117,10 +117,6 @@
<artifactId>com.springsource.bundlor.maven</artifactId>
<version>${bundlor.version}</version>
<inherited>true</inherited>
<configuration>
<manifestTemplatePath>${project.basedir}/template.mf</manifestTemplatePath>
<outputFile>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</outputFile>
</configuration>
<executions>
<execution>
<id>bundlor-transform</id>