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

spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/BackToBackPatternClassifier.java

@@ -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;
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/BinaryExceptionClassifier.java

@@ -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;

spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/Classifier.java

@@ -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

spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/ClassifierAdapter.java

@@ -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;
 
 /**

spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/ClassifierSupport.java

@@ -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;

spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/PatternMatchingClassifier.java

@@ -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

spring-batch-infrastructure/src/main/java/org/springframework/batch/classify/SubclassClassifier.java

@@ -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;

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

@@ -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

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

@@ -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}.

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

@@ -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;
 
 /**

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

@@ -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;
 
 /**

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

@@ -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;
 
 /**
  * 

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

@@ -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;
 
 /**
  *