Remove usage of DataAccessResourceFailureException in xml reader and writer

lcmarvin · lcmarvin · commit fbf15a416c3f · 2022-07-07T14:13:41.000+08:00
Resolves spring-projects#4132
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java
@@ -52,7 +52,6 @@
 import org.springframework.batch.support.transaction.TransactionAwareBufferedWriter;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.io.WritableResource;
-import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.oxm.Marshaller;
 import org.springframework.oxm.XmlMappingException;
 import org.springframework.util.Assert;
@@ -458,7 +457,7 @@ private void open(long position) {
 			setPosition(position);
 		}
 		catch (IOException ioe) {
-			throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", ioe);
+			throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", ioe);
 		}
 
 		XMLOutputFactory outputFactory = createXmlOutputFactory();
@@ -506,14 +505,14 @@ public void run() {
 			}
 		}
 		catch (XMLStreamException xse) {
-			throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", xse);
+			throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", xse);
 		}
 		catch (UnsupportedEncodingException e) {
-			throw new DataAccessResourceFailureException(
+			throw new ItemStreamException(
 					"Unable to write to file resource: [" + resource + "] with encoding=[" + encoding + "]", e);
 		}
 		catch (IOException e) {
-			throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", e);
+			throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", e);
 		}
 	}
 
@@ -673,7 +672,7 @@ protected void endDocument(XMLEventWriter writer) throws XMLStreamException {
 			bufferedWriter.write("</" + nsPrefix + getRootTagName() + ">");
 		}
 		catch (IOException ioe) {
-			throw new DataAccessResourceFailureException("Unable to close file resource: [" + resource + "]", ioe);
+			throw new XMLStreamException("Unable to close file resource: [" + resource + "]", ioe);
 		}
 	}
 
@@ -825,7 +824,7 @@ private long getPosition() {
 			}
 		}
 		catch (Exception e) {
-			throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", e);
+			throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", e);
 		}
 
 		return position;
@@ -842,7 +841,7 @@ private void setPosition(long newPosition) {
 			channel.position(newPosition);
 		}
 		catch (IOException e) {
-			throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", e);
+			throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", e);
 		}
 
 	}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2022 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,7 +28,7 @@
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 
-import org.springframework.dao.DataAccessResourceFailureException;
+import org.springframework.batch.item.ItemStreamException;
 
 /**
  * Default implementation of {@link FragmentEventReader}
@@ -71,7 +71,7 @@ public DefaultFragmentEventReader(XMLEventReader wrappedEventReader) {
 			startDocumentEvent = (StartDocument) wrappedEventReader.peek();
 		}
 		catch (XMLStreamException e) {
-			throw new DataAccessResourceFailureException("Error reading start document from event reader", e);
+			throw new ItemStreamException("Error reading start document from event reader", e);
 		}
 
 		endDocumentEvent = XMLEventFactory.newInstance().createEndDocument();
@@ -91,7 +91,7 @@ public boolean hasNext() {
 			}
 		}
 		catch (XMLStreamException e) {
-			throw new DataAccessResourceFailureException("Error reading XML stream", e);
+			throw new ItemStreamException("Error reading XML stream", e);
 		}
 		return false;
 	}
@@ -102,7 +102,7 @@ public Object next() {
 			return nextEvent();
 		}
 		catch (XMLStreamException e) {
-			throw new DataAccessResourceFailureException("Error reading XML stream", e);
+			throw new ItemStreamException("Error reading XML stream", e);
 		}
 	}
 
@@ -185,7 +185,7 @@ public void markFragmentProcessed() {
 				}
 			}
 			catch (XMLStreamException e) {
-				throw new DataAccessResourceFailureException("Error reading XML stream", e);
+				throw new ItemStreamException("Error reading XML stream", e);
 			}
 		}
 		fakeDocumentEnd = false;
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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -26,7 +26,6 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.XMLEvent;
 
-import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.util.StringUtils;
 
 /**
@@ -68,7 +67,7 @@ public void add(XMLEvent event) throws XMLStreamException {
 				ioWriter.flush();
 			}
 			catch (IOException ioe) {
-				throw new DataAccessResourceFailureException("Unable to close tag: " + element, ioe);
+				throw new XMLStreamException("Unable to close tag: " + element, ioe);
 			}
 		}
 		else {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/UnopenedElementClosingEventWriterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2022 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.
@@ -27,14 +27,14 @@
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLEventFactory;
 import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.EndElement;
 import javax.xml.stream.events.StartElement;
 import javax.xml.stream.events.XMLEvent;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.springframework.dao.DataAccessResourceFailureException;
 
 /**
  * Tests for {@link UnopenedElementClosingEventWriter}
@@ -122,7 +122,7 @@ public void testOtherEvent() throws Exception {
 		verify(wrappedWriter).add(event);
 	}
 
-	@Test(expected = DataAccessResourceFailureException.class)
+	@Test(expected = XMLStreamException.class)
 	public void testIOException() throws Exception {
 		EndElement endElementB = eventFactory.createEndElement(unopenedB, null);
 		Mockito.doThrow(new IOException("Simulated IOException")).when(ioWriter).write("</unopened-b>");

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@`
`52`	`52`	`import org.springframework.batch.support.transaction.TransactionAwareBufferedWriter;`
`53`	`53`	`import org.springframework.beans.factory.InitializingBean;`
`54`	`54`	`import org.springframework.core.io.WritableResource;`
`55`		`-import org.springframework.dao.DataAccessResourceFailureException;`
`56`	`55`	`import org.springframework.oxm.Marshaller;`
`57`	`56`	`import org.springframework.oxm.XmlMappingException;`
`58`	`57`	`import org.springframework.util.Assert;`
`@@ -458,7 +457,7 @@ private void open(long position) {`
`458`	`457`	`setPosition(position);`
`459`	`458`	`}`
`460`	`459`	`catch (IOException ioe) {`
`461`		`- throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", ioe);`
	`460`	`+ throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", ioe);`
`462`	`461`	`}`
`463`	`462`
`464`	`463`	`XMLOutputFactory outputFactory = createXmlOutputFactory();`
`@@ -506,14 +505,14 @@ public void run() {`
`506`	`505`	`}`
`507`	`506`	`}`
`508`	`507`	`catch (XMLStreamException xse) {`
`509`		`- throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", xse);`
	`508`	`+ throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", xse);`
`510`	`509`	`}`
`511`	`510`	`catch (UnsupportedEncodingException e) {`
`512`		`- throw new DataAccessResourceFailureException(`
	`511`	`+ throw new ItemStreamException(`
`513`	`512`	`"Unable to write to file resource: [" + resource + "] with encoding=[" + encoding + "]", e);`
`514`	`513`	`}`
`515`	`514`	`catch (IOException e) {`
`516`		`- throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", e);`
	`515`	`+ throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", e);`
`517`	`516`	`}`
`518`	`517`	`}`
`519`	`518`
`@@ -673,7 +672,7 @@ protected void endDocument(XMLEventWriter writer) throws XMLStreamException {`
`673`	`672`	`bufferedWriter.write("</" + nsPrefix + getRootTagName() + ">");`
`674`	`673`	`}`
`675`	`674`	`catch (IOException ioe) {`
`676`		`- throw new DataAccessResourceFailureException("Unable to close file resource: [" + resource + "]", ioe);`
	`675`	`+ throw new XMLStreamException("Unable to close file resource: [" + resource + "]", ioe);`
`677`	`676`	`}`
`678`	`677`	`}`
`679`	`678`
`@@ -825,7 +824,7 @@ private long getPosition() {`
`825`	`824`	`}`
`826`	`825`	`}`
`827`	`826`	`catch (Exception e) {`
`828`		`- throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", e);`
	`827`	`+ throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", e);`
`829`	`828`	`}`
`830`	`829`
`831`	`830`	`return position;`
`@@ -842,7 +841,7 @@ private void setPosition(long newPosition) {`
`842`	`841`	`channel.position(newPosition);`
`843`	`842`	`}`
`844`	`843`	`catch (IOException e) {`
`845`		`- throw new DataAccessResourceFailureException("Unable to write to file resource: [" + resource + "]", e);`
	`844`	`+ throw new ItemStreamException("Unable to write to file resource: [" + resource + "]", e);`
`846`	`845`	`}`
`847`	`846`
`848`	`847`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2006-2007 the original author or authors.`
	`2`	`+ * Copyright 2006-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -28,7 +28,7 @@`
`28`	`28`	`import javax.xml.stream.events.StartElement;`
`29`	`29`	`import javax.xml.stream.events.XMLEvent;`
`30`	`30`
`31`		`-import org.springframework.dao.DataAccessResourceFailureException;`
	`31`	`+import org.springframework.batch.item.ItemStreamException;`
`32`	`32`
`33`	`33`	`/**`
`34`	`34`	`* Default implementation of {@link FragmentEventReader}`
`@@ -71,7 +71,7 @@ public DefaultFragmentEventReader(XMLEventReader wrappedEventReader) {`
`71`	`71`	`startDocumentEvent = (StartDocument) wrappedEventReader.peek();`
`72`	`72`	`}`
`73`	`73`	`catch (XMLStreamException e) {`
`74`		`- throw new DataAccessResourceFailureException("Error reading start document from event reader", e);`
	`74`	`+ throw new ItemStreamException("Error reading start document from event reader", e);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`endDocumentEvent = XMLEventFactory.newInstance().createEndDocument();`
`@@ -91,7 +91,7 @@ public boolean hasNext() {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`catch (XMLStreamException e) {`
`94`		`- throw new DataAccessResourceFailureException("Error reading XML stream", e);`
	`94`	`+ throw new ItemStreamException("Error reading XML stream", e);`
`95`	`95`	`}`
`96`	`96`	`return false;`
`97`	`97`	`}`
`@@ -102,7 +102,7 @@ public Object next() {`
`102`	`102`	`return nextEvent();`
`103`	`103`	`}`
`104`	`104`	`catch (XMLStreamException e) {`
`105`		`- throw new DataAccessResourceFailureException("Error reading XML stream", e);`
	`105`	`+ throw new ItemStreamException("Error reading XML stream", e);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`@@ -185,7 +185,7 @@ public void markFragmentProcessed() {`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`	`catch (XMLStreamException e) {`
`188`		`- throw new DataAccessResourceFailureException("Error reading XML stream", e);`
	`188`	`+ throw new ItemStreamException("Error reading XML stream", e);`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`	`fakeDocumentEnd = false;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2014 the original author or authors.`
	`2`	`+ * Copyright 2014-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -26,7 +26,6 @@`
`26`	`26`	`import javax.xml.stream.XMLStreamException;`
`27`	`27`	`import javax.xml.stream.events.XMLEvent;`
`28`	`28`
`29`		`-import org.springframework.dao.DataAccessResourceFailureException;`
`30`	`29`	`import org.springframework.util.StringUtils;`
`31`	`30`
`32`	`31`	`/**`
`@@ -68,7 +67,7 @@ public void add(XMLEvent event) throws XMLStreamException {`
`68`	`67`	`ioWriter.flush();`
`69`	`68`	`}`
`70`	`69`	`catch (IOException ioe) {`
`71`		`- throw new DataAccessResourceFailureException("Unable to close tag: " + element, ioe);`
	`70`	`+ throw new XMLStreamException("Unable to close tag: " + element, ioe);`
`72`	`71`	`}`
`73`	`72`	`}`
`74`	`73`	`else {`