From 2c2744ff886e02be26c0fa0bfd65d1b1b76e0a37 Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@gopivotal.com>
Date: Tue, 22 Apr 2014 10:33:43 -0500
Subject: [PATCH] BATCH-2202: Removed unnecessecary LdifAggregator and
 corrected javadoc on RecordCallbackHandler

---
 .../resources/applicationContext-test1.xml    |  2 +-
 .../resources/applicationContext-test2.xml    |  2 +-
 .../batch/item/ldif/LdifAggregator.java       | 40 -------------------
 .../item/ldif/RecordCallbackHandler.java      |  2 +-
 4 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifAggregator.java

diff --git a/spring-batch-core-tests/src/test/resources/applicationContext-test1.xml b/spring-batch-core-tests/src/test/resources/applicationContext-test1.xml
index 88f2fdedb..55d93790c 100644
--- a/spring-batch-core-tests/src/test/resources/applicationContext-test1.xml
+++ b/spring-batch-core-tests/src/test/resources/applicationContext-test1.xml
@@ -33,7 +33,7 @@
 	<bean id="itemWriter" class="org.springframework.batch.item.file.FlatFileItemWriter">
 		<property name="resource" value="file:target/test-outputs/output.ldif" />
 		<property name="lineAggregator">
-			<bean class="org.springframework.ldap.ldif.batch.LdifAggregator" />
+			<bean class="org.springframework.batch.item.file.transform.PassThroughLineAggregator" />
 		</property>
 	</bean>
 </beans>
\ No newline at end of file
diff --git a/spring-batch-core-tests/src/test/resources/applicationContext-test2.xml b/spring-batch-core-tests/src/test/resources/applicationContext-test2.xml
index d41f6995f..4faebde1d 100644
--- a/spring-batch-core-tests/src/test/resources/applicationContext-test2.xml
+++ b/spring-batch-core-tests/src/test/resources/applicationContext-test2.xml
@@ -39,7 +39,7 @@
 	<bean id="itemWriter" class="org.springframework.batch.item.file.FlatFileItemWriter">
 		<property name="resource" value="file:target/test-outputs/output.ldif" />
 		<property name="lineAggregator">
-			<bean class="org.springframework.batch.item.ldif.LdifAggregator" />
+			<bean class="org.springframework.batch.item.file.transform.PassThroughLineAggregator" />
 		</property>
 	</bean>
 
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifAggregator.java
deleted file mode 100644
index d6689d15d..000000000
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/LdifAggregator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2005-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.item.ldif;
-
-import org.springframework.batch.item.file.transform.LineAggregator;
-import org.springframework.ldap.core.LdapAttributes;
-
-/**
- * The {@link LdifAggregator LdifAggregator} object is an implementation of the {@link org.springframework.batch.item.file.transform.LineAggregator LineAggregator}
- * interface for use with a {@link org.springframework.batch.item.file.FlatFileItemWriter FlatFileItemWriter} to write LDIF records to a file.
- *
- * @author Keith Barlow
- *
- */
-public class LdifAggregator implements LineAggregator<LdapAttributes> {
-
-	/**
-	 * Returns a {@link java.lang.String String} containing a properly formated LDIF.
-	 *
-	 * @param item LdapAttributes object to convert to string.
-	 * @return string representation of the object LDIF format (in accordance with RFC 2849).
-	 */
-	public String aggregate(LdapAttributes item) {
-		return item.toString();
-	}
-
-}
\ No newline at end of file
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/RecordCallbackHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/RecordCallbackHandler.java
index b64aa3259..9e2a3af29 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/RecordCallbackHandler.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ldif/RecordCallbackHandler.java
@@ -18,7 +18,7 @@ package org.springframework.batch.item.ldif;
 import org.springframework.ldap.core.LdapAttributes;
 
 /**
- * This interface can be used to operate on skipped records in the {@link LdifReader LdifReader} and the
+ * This interface can be used to operate on skipped records during open in the {@link LdifReader LdifReader} and the
  * {@link MappingLdifReader MappingLdifReader}.
  *
  * @author Keith Barlow