From f5a31a99a204730a17720ce5fff29bde034cb4bc Mon Sep 17 00:00:00 2001 From: Michael Minella Date: Wed, 5 Feb 2014 15:54:51 -0600 Subject: [PATCH] BATCH-2046: Updated copyright dates and added @since --- .../UnclosedElementCollectingEventWriter.java | 29 ++++++------ .../UnopenedElementClosingEventWriter.java | 46 ++++++++++--------- 2 files changed, 41 insertions(+), 34 deletions(-) diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java index 5230d5ffd..6e1ff3e32 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 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. @@ -28,27 +28,30 @@ import javax.xml.stream.events.XMLEvent; * Delegating XMLEventWriter, which collects the QNames of elements that were opened but not closed. * * @author Jimmy Praet + * @since 3.0 */ public class UnclosedElementCollectingEventWriter extends AbstractEventWriterWrapper { private LinkedList unclosedElements = new LinkedList(); public UnclosedElementCollectingEventWriter(XMLEventWriter wrappedEventWriter) { - super(wrappedEventWriter); + super(wrappedEventWriter); } - - @Override + + /* (non-Javadoc) + * @see org.springframework.batch.item.xml.stax.AbstractEventWriterWrapper#add(javax.xml.stream.events.XMLEvent) + */ + @Override public void add(XMLEvent event) throws XMLStreamException { - if (event.isStartElement()) { - unclosedElements.addLast(event.asStartElement().getName()); - } else if (event.isEndElement()) { - unclosedElements.removeLast(); - } - super.add(event); - } - + if (event.isStartElement()) { + unclosedElements.addLast(event.asStartElement().getName()); + } else if (event.isEndElement()) { + unclosedElements.removeLast(); + } + super.add(event); + } + public List getUnclosedElements() { return unclosedElements; } - } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java index 03ddbe1b6..384bbce1e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 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. @@ -34,35 +34,39 @@ import org.springframework.util.StringUtils; * to the underlying java.io.Writer instead of to the delegate XMLEventWriter. * * @author Jimmy Praet + * @since 3.0 */ public class UnopenedElementClosingEventWriter extends AbstractEventWriterWrapper { private LinkedList unopenedElements; - + private Writer ioWriter; public UnopenedElementClosingEventWriter(XMLEventWriter wrappedEventWriter, Writer ioWriter, List unopenedElements) { - super(wrappedEventWriter); + super(wrappedEventWriter); this.unopenedElements = new LinkedList(unopenedElements); this.ioWriter = ioWriter; } - - @Override + + /* (non-Javadoc) + * @see org.springframework.batch.item.xml.stax.AbstractEventWriterWrapper#add(javax.xml.stream.events.XMLEvent) + */ + @Override public void add(XMLEvent event) throws XMLStreamException { - if (isUnopenedElementCloseEvent(event)) { - QName element = unopenedElements.removeLast(); - String nsPrefix = !StringUtils.hasText(element.getPrefix()) ? "" : element.getPrefix() + ":"; - try { - super.flush(); - ioWriter.write(""); - ioWriter.flush(); - } - catch (IOException ioe) { - throw new DataAccessResourceFailureException("Unable to close tag: " + element, ioe); - } - } else { - super.add(event); - } + if (isUnopenedElementCloseEvent(event)) { + QName element = unopenedElements.removeLast(); + String nsPrefix = !StringUtils.hasText(element.getPrefix()) ? "" : element.getPrefix() + ":"; + try { + super.flush(); + ioWriter.write(""); + ioWriter.flush(); + } + catch (IOException ioe) { + throw new DataAccessResourceFailureException("Unable to close tag: " + element, ioe); + } + } else { + super.add(event); + } } private boolean isUnopenedElementCloseEvent(XMLEvent event) { @@ -73,6 +77,6 @@ public class UnopenedElementClosingEventWriter extends AbstractEventWriterWrappe } else { return unopenedElements.getLast().equals(event.asEndElement().getName()); } - } + } -} \ No newline at end of file +}