This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MNG-7901
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 0684750a6747d17d985c2d1170cd888f59cd2e15
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Fri Oct 6 23:15:21 2023 +0200
[MNG-7901] Use MetadataStaxReader/Writer in MetadataXpp3Reader/Writer
---
maven-repository-metadata/pom.xml | 2 -
.../metadata/io/xpp3/MetadataXpp3Reader.java | 64 +++++++++++++++-------
.../metadata/io/xpp3/MetadataXpp3Writer.java | 24 ++++++--
3 files changed, 61 insertions(+), 29 deletions(-)
diff --git a/maven-repository-metadata/pom.xml
b/maven-repository-metadata/pom.xml
index 2baeebbc5f..7fe3083823 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -99,8 +99,6 @@ under the License.
</models>
<templates>
<template>model-v3.vm</template>
- <template>reader.vm</template>
- <template>writer.vm</template>
</templates>
</configuration>
</execution>
diff --git
a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java
b/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java
index e4e061d1e1..998fd02547 100644
---
a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java
+++
b/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Reader.java
@@ -26,22 +26,24 @@ import java.io.InputStream;
import java.io.Reader;
import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.artifact.repository.metadata.io.MetadataStaxReader;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
- * Provide public methods from {@link
org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader}
+ * Provide public methods from {@link MetadataStaxReader}
*
- * @deprecated Maven 3 compatability
+ * @deprecated Maven 3 compatability - please use {@link MetadataStaxReader}
*/
@Deprecated
public class MetadataXpp3Reader {
- private final
org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader delegate;
+ private final MetadataStaxReader delegate;
/**
* Default constructor
*/
public MetadataXpp3Reader() {
- delegate = new
org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader();
+ delegate = new MetadataStaxReader();
}
/**
@@ -51,7 +53,7 @@ public class MetadataXpp3Reader {
*/
public MetadataXpp3Reader(ContentTransformer contentTransformer) {
delegate =
- new
org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader(contentTransformer::transform);
+ new MetadataStaxReader(contentTransformer::transform);
}
/**
@@ -79,11 +81,15 @@ public class MetadataXpp3Reader {
* @param strict a strict object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(Reader reader, boolean strict) throws IOException,
XMLStreamException {
- return new Metadata(delegate.read(reader, strict));
+ public Metadata read(Reader reader, boolean strict) throws IOException,
XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(reader, strict));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
@@ -92,11 +98,15 @@ public class MetadataXpp3Reader {
* @param reader a reader object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(Reader reader) throws IOException, XMLStreamException
{
- return new Metadata(delegate.read(reader));
+ public Metadata read(Reader reader) throws IOException,
XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(reader));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
@@ -106,11 +116,15 @@ public class MetadataXpp3Reader {
* @param strict a strict object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(InputStream in, boolean strict) throws IOException,
XMLStreamException {
- return new Metadata(delegate.read(in, strict));
+ public Metadata read(InputStream in, boolean strict) throws IOException,
XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(in, strict));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
@@ -119,11 +133,15 @@ public class MetadataXpp3Reader {
* @param in a in object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(InputStream in) throws IOException,
XMLStreamException {
- return new Metadata(delegate.read(in));
+ public Metadata read(InputStream in) throws IOException,
XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(in));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
@@ -133,15 +151,19 @@ public class MetadataXpp3Reader {
* @param strict a strict object.
* @return Metadata
* @throws IOException IOException if any.
- * @throws XMLStreamException XmlPullParserException if
+ * @throws XmlPullParserException XmlPullParserException if
* any.
*/
- public Metadata read(XMLStreamReader parser, boolean strict) throws
IOException, XMLStreamException {
- return new Metadata(delegate.read(parser, strict));
+ public Metadata read(XMLStreamReader parser, boolean strict) throws
IOException, XmlPullParserException {
+ try {
+ return new Metadata(delegate.read(parser, strict));
+ } catch (XMLStreamException e) {
+ throw new XmlPullParserException(e.getMessage(), null, e);
+ }
}
/**
- * {@link
org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader.ContentTransformer}
+ * {@link MetadataStaxReader.ContentTransformer}
*/
public interface ContentTransformer {
/**
diff --git
a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java
b/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java
index a1658a046c..72dab05c7b 100644
---
a/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java
+++
b/maven-repository-metadata/src/main/java/org/apache/maven/artifact/repository/metadata/io/xpp3/MetadataXpp3Writer.java
@@ -18,26 +18,30 @@
*/
package org.apache.maven.artifact.repository.metadata.io.xpp3;
+import javax.xml.stream.XMLStreamException;
+
+import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.artifact.repository.metadata.io.MetadataStaxWriter;
/**
- * Provide public methods from {@link
org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer}
+ * Provide public methods from {@link MetadataStaxWriter}
*
- * @deprecated Maven 3 compatability
+ * @deprecated Maven 3 compatability - - please use {@link MetadataStaxWriter}
*/
@Deprecated
public class MetadataXpp3Writer {
- private final
org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer delegate;
+ private final MetadataStaxWriter delegate;
/**
* Default constructor
*/
public MetadataXpp3Writer() {
- delegate = new
org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer();
+ delegate = new MetadataStaxWriter();
}
/**
@@ -57,7 +61,11 @@ public class MetadataXpp3Writer {
* @throws java.io.IOException java.io.IOException if any
*/
public void write(Writer writer, Metadata metadata) throws
java.io.IOException {
- delegate.write(writer, metadata.getDelegate());
+ try {
+ delegate.write(writer, metadata.getDelegate());
+ } catch (XMLStreamException e) {
+ throw new IOException(e);
+ }
}
/**
@@ -68,6 +76,10 @@ public class MetadataXpp3Writer {
* @throws java.io.IOException java.io.IOException if any
*/
public void write(OutputStream stream, Metadata metadata) throws
java.io.IOException {
- delegate.write(stream, metadata.getDelegate());
+ try {
+ delegate.write(stream, metadata.getDelegate());
+ } catch (XMLStreamException e) {
+ throw new IOException(e);
+ }
}
}
