diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java index 80b8d1051..ba92a996a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/FlatFileItemWriter.java @@ -30,6 +30,7 @@ import java.util.Properties; import org.springframework.batch.io.exception.BatchCriticalException; import org.springframework.batch.io.exception.BatchEnvironmentException; +import org.springframework.batch.io.file.transform.Converter; import org.springframework.batch.io.support.AbstractTransactionalIoSource; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.item.ResourceLifecycle; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/Converter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Converter.java similarity index 91% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/Converter.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Converter.java index 3ef305fac..71c7eea03 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/Converter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/file/transform/Converter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.io.file; +package org.springframework.batch.io.file.transform; /** * Generic converter interface for transforming an object into another form for diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/FragmentDeserializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/EventReaderDeserializer.java similarity index 84% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/FragmentDeserializer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/EventReaderDeserializer.java index b7d849886..b4bfea8eb 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/FragmentDeserializer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/EventReaderDeserializer.java @@ -8,7 +8,7 @@ import javax.xml.stream.XMLEventReader; * * @author Robert Kasanicky */ -public interface FragmentDeserializer { +public interface EventReaderDeserializer { Object deserializeFragment(XMLEventReader eventReader); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/ObjectToXmlSerializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/EventWriterSerializer.java similarity index 59% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/ObjectToXmlSerializer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/EventWriterSerializer.java index 1dce19163..0f665ce5b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/ObjectToXmlSerializer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/EventWriterSerializer.java @@ -10,19 +10,12 @@ import javax.xml.stream.XMLEventWriter; * @author Lucas Ward * */ -public interface ObjectToXmlSerializer { - - /** - * Set event writer objects should be serialized to. - * - * @param writer - */ - void setEventWriter(XMLEventWriter writer); +public interface EventWriterSerializer { /** * Serialize an Object. * * @param output */ - void serializeObject(Object output); + void serializeObject(XMLEventWriter writer, Object output); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java index c5dda4ce4..1e5228337 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemReader.java @@ -54,7 +54,7 @@ public class StaxEventItemReader extends AbstractItemReader implements ItemReade private TransactionalEventReader txReader; - private FragmentDeserializer fragmentDeserializer; + private EventReaderDeserializer eventReaderDeserializer; private Resource resource; @@ -88,7 +88,7 @@ public class StaxEventItemReader extends AbstractItemReader implements ItemReade currentRecordCount++; if (moveCursorToNextFragment(fragmentReader)) { fragmentReader.markStartFragment(); - item = fragmentDeserializer.deserializeFragment(fragmentReader); + item = eventReaderDeserializer.deserializeFragment(fragmentReader); fragmentReader.markFragmentProcessed(); } } while (skipRecords.contains(new Long(currentRecordCount))); @@ -139,11 +139,11 @@ public class StaxEventItemReader extends AbstractItemReader implements ItemReade } /** - * @param fragmentDeserializer maps xml fragments corresponding to records + * @param eventReaderDeserializer maps xml fragments corresponding to records * to objects */ - public void setFragmentDeserializer(FragmentDeserializer fragmentDeserializer) { - this.fragmentDeserializer = fragmentDeserializer; + public void setFragmentDeserializer(EventReaderDeserializer eventReaderDeserializer) { + this.eventReaderDeserializer = eventReaderDeserializer; } /** @@ -185,7 +185,7 @@ public class StaxEventItemReader extends AbstractItemReader implements ItemReade public void afterPropertiesSet() throws Exception { Assert.notNull(resource, "The Resource must not be null."); Assert.state(resource.exists(), "Input resource does not exist: [" + resource + "]"); - Assert.notNull(fragmentDeserializer, "The FragmentDeserializer must not be null."); + Assert.notNull(eventReaderDeserializer, "The FragmentDeserializer must not be null."); Assert.hasLength(fragmentRootElementName, "The FragmentRootElementName must not be null"); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java index 06e3ff4fa..799b47b27 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/StaxEventItemWriter.java @@ -34,7 +34,7 @@ import org.springframework.util.CollectionUtils; /** * An implementation of {@link ItemWriter} which uses - * StAX and {@link ObjectToXmlSerializer} for serializing object to XML. + * StAX and {@link EventWriterSerializer} for serializing object to XML. * * This output source also provides restart, statistics and transaction * features by implementing corresponding interfaces. @@ -64,7 +64,7 @@ public class StaxEventItemWriter implements ItemWriter, ResourceLifecycle, Resta private Resource resource; // xml serializer - private ObjectToXmlSerializer serializer; + private EventWriterSerializer serializer; // encoding to be used while reading from the resource private String encoding = DEFAULT_ENCODING; @@ -123,7 +123,7 @@ public class StaxEventItemWriter implements ItemWriter, ResourceLifecycle, Resta * * @param serializer the Object to XML serializer */ - public void setSerializer(ObjectToXmlSerializer serializer) { + public void setSerializer(EventWriterSerializer serializer) { this.serializer = serializer; } @@ -271,7 +271,6 @@ public class StaxEventItemWriter implements ItemWriter, ResourceLifecycle, Resta try { delegateEventWriter = outputFactory.createXMLEventWriter(os, encoding); eventWriter = new NoStartEndDocumentStreamWriter(delegateEventWriter); - serializer.setEventWriter(eventWriter); if (!restarted) { startDocument(delegateEventWriter); } @@ -375,7 +374,7 @@ public class StaxEventItemWriter implements ItemWriter, ResourceLifecycle, Resta } currentRecordCount++; - serializer.serializeObject(output); + serializer.serializeObject(eventWriter, output); } /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingEventWriterSerializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingEventWriterSerializer.java new file mode 100644 index 000000000..5057916b7 --- /dev/null +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingEventWriterSerializer.java @@ -0,0 +1,37 @@ +package org.springframework.batch.io.xml.oxm; + +import java.io.IOException; + +import javax.xml.stream.XMLEventWriter; +import javax.xml.transform.Result; + +import org.springframework.batch.io.xml.EventWriterSerializer; +import org.springframework.dao.DataAccessResourceFailureException; +import org.springframework.oxm.Marshaller; +import org.springframework.xml.transform.StaxResult; + +/** + * Object to xml serializer that wraps a Spring OXM {@link Marshaller} object. + * + * @author Lucas Ward + * + */ +public class MarshallingEventWriterSerializer implements EventWriterSerializer { + + private Marshaller marshaller; + + public MarshallingEventWriterSerializer(Marshaller marshaller) { + this.marshaller = marshaller; + } + + public void serializeObject(XMLEventWriter writer, Object output) { + Result result = new StaxResult(writer); + try { + marshaller.marshal(output, result); + } + catch (IOException xse) { + throw new DataAccessResourceFailureException("Unable to write to file resource: [" + result.getSystemId() + + "]", xse); + } + } +} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializer.java deleted file mode 100644 index 2ad6a2e67..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializer.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.springframework.batch.io.xml.oxm; - -import java.io.IOException; - -import javax.xml.stream.XMLEventWriter; -import javax.xml.transform.Result; - -import org.springframework.batch.io.xml.ObjectToXmlSerializer; -import org.springframework.dao.DataAccessResourceFailureException; -import org.springframework.oxm.Marshaller; -import org.springframework.xml.transform.StaxResult; - -/** - * Object to xml serializer that wraps a Spring-OXM - * Marshaller object. - * - * @author Lucas Ward - * - */ -public class MarshallingObjectToXmlSerializer implements ObjectToXmlSerializer{ - - private Marshaller marshaller; - - private Result result; - - public MarshallingObjectToXmlSerializer(Marshaller marshaller){ - this.marshaller = marshaller; - } - - public void setEventWriter(XMLEventWriter writer) { - result = new StaxResult(writer); - } - - public void serializeObject(Object output) { - - try { - marshaller.marshal(output, result); - } catch (IOException xse) { - throw new DataAccessResourceFailureException( - "Unable to write to file resource: [" + result.getSystemId() + "]", xse); - } - } -} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingEventReaderDeserializer.java similarity index 70% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializer.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingEventReaderDeserializer.java index 49f63aef3..d337c49aa 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/io/xml/oxm/UnmarshallingEventReaderDeserializer.java @@ -4,23 +4,23 @@ import java.io.IOException; import javax.xml.stream.XMLEventReader; -import org.springframework.batch.io.xml.FragmentDeserializer; +import org.springframework.batch.io.xml.EventReaderDeserializer; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.oxm.Unmarshaller; import org.springframework.util.Assert; import org.springframework.xml.transform.StaxSource; /** - * Delegates deserializing to Spring-WS {@link Unmarshaller}. + * Delegates deserializing to Spring OXM {@link Unmarshaller}. * * @author Robert Kasanicky * @author Lucas Ward */ -public class UnmarshallingFragmentDeserializer implements FragmentDeserializer { +public class UnmarshallingEventReaderDeserializer implements EventReaderDeserializer { private Unmarshaller unmarshaller; - public UnmarshallingFragmentDeserializer(Unmarshaller unmarshaller){ + public UnmarshallingEventReaderDeserializer(Unmarshaller unmarshaller){ Assert.notNull(unmarshaller); this.unmarshaller = unmarshaller; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java index e0e3ab690..5018eaf68 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/file/FlatFileItemWriterTests.java @@ -25,6 +25,7 @@ import java.util.Collections; import junit.framework.TestCase; import org.springframework.batch.io.file.FlatFileItemWriter; +import org.springframework.batch.io.file.transform.Converter; import org.springframework.batch.restart.RestartData; import org.springframework.core.io.FileSystemResource; import org.springframework.transaction.support.TransactionSynchronization; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventReaderItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventReaderItemReaderTests.java index 60747f69f..e147a9daa 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventReaderItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventReaderItemReaderTests.java @@ -37,7 +37,7 @@ public class StaxEventReaderItemReaderTests extends TestCase { // test xml input private String xml = " testString "; - private FragmentDeserializer deserializer = new MockFragmentDeserializer(); + private EventReaderDeserializer deserializer = new MockFragmentDeserializer(); private static final String FRAGMENT_ROOT_ELEMENT = "fragment"; @@ -277,7 +277,7 @@ public class StaxEventReaderItemReaderTests extends TestCase { * document events for the fragment root & end tags + skips the fragment * contents. */ - private static class MockFragmentDeserializer implements FragmentDeserializer { + private static class MockFragmentDeserializer implements EventReaderDeserializer { /** * A simple mapFragment implementation checking the @@ -339,7 +339,7 @@ public class StaxEventReaderItemReaderTests extends TestCase { /** * Moves cursor inside the fragment body and causes rollback. */ - private static class ExceptionFragmentDeserializer implements FragmentDeserializer { + private static class ExceptionFragmentDeserializer implements EventReaderDeserializer { public Object deserializeFragment(XMLEventReader eventReader) { eventReader.next(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventWriterItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventWriterItemWriterTests.java index 900262e6a..2fd0638ba 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventWriterItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/StaxEventWriterItemWriterTests.java @@ -12,7 +12,7 @@ import junit.framework.TestCase; import org.apache.commons.io.FileUtils; import org.springframework.batch.io.xml.StaxEventItemWriter; -import org.springframework.batch.io.xml.oxm.MarshallingObjectToXmlSerializer; +import org.springframework.batch.io.xml.oxm.MarshallingEventWriterSerializer; import org.springframework.batch.restart.RestartData; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; @@ -55,7 +55,7 @@ public class StaxEventWriterItemWriterTests extends TestCase { */ public void testWrite() throws Exception { Marshaller marshaller = new InputCheckMarshaller(); - MarshallingObjectToXmlSerializer serializer = new MarshallingObjectToXmlSerializer(marshaller); + MarshallingEventWriterSerializer serializer = new MarshallingEventWriterSerializer(marshaller); writer.setSerializer(serializer); // see asserts in the marshaller @@ -193,7 +193,7 @@ public class StaxEventWriterItemWriterTests extends TestCase { source.setResource(resource); Marshaller marshaller = new SimpleMarshaller(); - MarshallingObjectToXmlSerializer serializer = new MarshallingObjectToXmlSerializer(marshaller); + MarshallingEventWriterSerializer serializer = new MarshallingEventWriterSerializer(marshaller); source.setSerializer(serializer); source.setEncoding("UTF-8"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java index af6a91fc1..6d75e901e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/MarshallingObjectToXmlSerializerTests.java @@ -26,7 +26,7 @@ import javax.xml.transform.Result; import junit.framework.TestCase; -import org.springframework.batch.io.xml.oxm.MarshallingObjectToXmlSerializer; +import org.springframework.batch.io.xml.oxm.MarshallingEventWriterSerializer; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.oxm.Marshaller; import org.springframework.oxm.XmlMappingException; @@ -39,21 +39,23 @@ import org.springframework.oxm.XmlMappingException; */ public class MarshallingObjectToXmlSerializerTests extends TestCase { - MarshallingObjectToXmlSerializer xmlSerializer; + MarshallingEventWriterSerializer xmlSerializer; MockMarshaller mockMarshaller = new MockMarshaller(); + private StubXmlEventWriter writer; + protected void setUp() throws Exception { super.setUp(); - xmlSerializer = new MarshallingObjectToXmlSerializer(mockMarshaller); - xmlSerializer.setEventWriter(new StubXmlEventWriter()); + xmlSerializer = new MarshallingEventWriterSerializer(mockMarshaller); + writer = new StubXmlEventWriter(); } public void testSuccessfulWrite(){ Object objectToOutput = new Object(); - xmlSerializer.serializeObject(objectToOutput); + xmlSerializer.serializeObject(writer, objectToOutput); assertEquals(objectToOutput, mockMarshaller.getMarshalledObject()); } @@ -61,7 +63,7 @@ public class MarshallingObjectToXmlSerializerTests extends TestCase { mockMarshaller.setThrowException(true); try{ - xmlSerializer.serializeObject(new Object()); + xmlSerializer.serializeObject(writer, new Object()); fail("Exception expected"); }catch(DataAccessResourceFailureException ex){ //expected diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java index 83becaf6d..119d35678 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/io/xml/oxm/UnmarshallingFragmentDeserializerTests.java @@ -8,21 +8,21 @@ import javax.xml.stream.XMLInputFactory; import junit.framework.TestCase; import org.easymock.MockControl; -import org.springframework.batch.io.xml.oxm.UnmarshallingFragmentDeserializer; +import org.springframework.batch.io.xml.oxm.UnmarshallingEventReaderDeserializer; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.springframework.dao.DataAccessException; import org.springframework.oxm.Unmarshaller; /** - * Tests for {@link UnmarshallingFragmentDeserializer} + * Tests for {@link UnmarshallingEventReaderDeserializer} * * @author Robert Kasanicky */ public class UnmarshallingFragmentDeserializerTests extends TestCase { // object under test - private UnmarshallingFragmentDeserializer deserializer; + private UnmarshallingEventReaderDeserializer deserializer; private XMLEventReader eventReader; private String xml = " "; @@ -37,7 +37,7 @@ public class UnmarshallingFragmentDeserializerTests extends TestCase { eventReader = XMLInputFactory.newInstance().createXMLEventReader(input.getInputStream()); unmarshaller = (Unmarshaller) unmarshallerControl.getMock(); unmarshallerControl.setDefaultMatcher(MockControl.ALWAYS_MATCHER); - deserializer = new UnmarshallingFragmentDeserializer(unmarshaller); + deserializer = new UnmarshallingEventReaderDeserializer(unmarshaller); } /** @@ -81,7 +81,7 @@ public class UnmarshallingFragmentDeserializerTests extends TestCase { */ public void testExceptionOnNullUnmarshaller() { try { - deserializer = new UnmarshallingFragmentDeserializer(null); + deserializer = new UnmarshallingEventReaderDeserializer(null); fail("Exception expected"); } catch (IllegalArgumentException e) { diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java index f685c31e8..a110a8733 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventReaderItemReaderTests.java @@ -8,7 +8,7 @@ import junit.framework.TestCase; import org.springframework.batch.io.oxm.domain.Trade; import org.springframework.batch.io.xml.StaxEventItemReader; -import org.springframework.batch.io.xml.oxm.UnmarshallingFragmentDeserializer; +import org.springframework.batch.io.xml.oxm.UnmarshallingEventReaderDeserializer; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.oxm.Unmarshaller; @@ -26,7 +26,7 @@ public abstract class AbstractStaxEventReaderItemReaderTests extends TestCase { source.setResource(resource); source.setFragmentRootElementName("trade"); - UnmarshallingFragmentDeserializer deserializer = new UnmarshallingFragmentDeserializer(getUnmarshaller()); + UnmarshallingEventReaderDeserializer deserializer = new UnmarshallingEventReaderDeserializer(getUnmarshaller()); source.setFragmentDeserializer(deserializer); } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java index bc77425ea..6c7465118 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/io/oxm/AbstractStaxEventWriterItemWriterTests.java @@ -13,7 +13,7 @@ import org.custommonkey.xmlunit.XMLAssert; import org.custommonkey.xmlunit.XMLUnit; import org.springframework.batch.io.oxm.domain.Trade; import org.springframework.batch.io.xml.StaxEventItemWriter; -import org.springframework.batch.io.xml.oxm.MarshallingObjectToXmlSerializer; +import org.springframework.batch.io.xml.oxm.MarshallingEventWriterSerializer; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; @@ -56,7 +56,7 @@ public abstract class AbstractStaxEventWriterItemWriterTests extends TestCase { resource = new FileSystemResource(outputFile); writer.setResource(resource); - MarshallingObjectToXmlSerializer mapper = new MarshallingObjectToXmlSerializer(getMarshaller()); + MarshallingEventWriterSerializer mapper = new MarshallingEventWriterSerializer(getMarshaller()); writer.setSerializer(mapper); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java index 8036129b8..69e361a0d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/FlatFileOrderWriter.java @@ -16,7 +16,7 @@ package org.springframework.batch.sample.dao; -import org.springframework.batch.io.file.Converter; +import org.springframework.batch.io.file.transform.Converter; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.sample.domain.Order; diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java index 929f83935..ab74f7f57 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/dao/OrderConverter.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.springframework.batch.io.file.Converter; +import org.springframework.batch.io.file.transform.Converter; import org.springframework.batch.io.file.transform.LineAggregator; import org.springframework.batch.sample.domain.Address; import org.springframework.batch.sample.domain.BillingInfo; diff --git a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml index 3c769192d..089f8de15 100644 --- a/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml +++ b/spring-batch-samples/src/main/resources/jobs/xmlStaxJob.xml @@ -31,7 +31,7 @@ value="data/staxJob/input/20070918.testStream.xmlFileStep.xml" /> + class="org.springframework.batch.io.xml.oxm.UnmarshallingEventReaderDeserializer"> @@ -66,7 +66,7 @@