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

BATCH-2046: Updated copyright dates and added @since

Browse Source
This commit is contained in:
Michael Minella
2014-02-05 15:54:51 -06:00
parent c8bcdf3c62
commit f5a31a99a2
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnclosedElementCollectingEventWriter.java
View File

@@ -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<QName> unclosedElements = new LinkedList<QName>();
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<QName> getUnclosedElements() {
return unclosedElements;
}
}

46
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriter.java
View File

@@ -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<QName> unopenedElements;
private Writer ioWriter;
public UnopenedElementClosingEventWriter(XMLEventWriter wrappedEventWriter, Writer ioWriter, List<QName> unopenedElements) {
super(wrappedEventWriter);
super(wrappedEventWriter);
this.unopenedElements = new LinkedList<QName>(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("</" + nsPrefix + element.getLocalPart() + ">");
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("</" + nsPrefix + element.getLocalPart() + ">");
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());
}
}
}
}
}