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 cf762ff1309facefc29e006147fdadd4e8b1c846 Author: Slawomir Jaranowski <[email protected]> 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 | 35 +++++++++++++++------- .../metadata/io/xpp3/MetadataXpp3Writer.java | 21 +++++++++---- 3 files changed, 40 insertions(+), 18 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..1b9fe02449 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,23 @@ import java.io.InputStream; import java.io.Reader; import org.apache.maven.artifact.repository.metadata.Metadata; +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 org.apache.maven.artifact.repository.metadata.io.MetadataStaxReader} * * @deprecated Maven 3 compatability */ @Deprecated public class MetadataXpp3Reader { - private final org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader delegate; + private final org.apache.maven.artifact.repository.metadata.io.MetadataStaxReader delegate; /** * Default constructor */ public MetadataXpp3Reader() { - delegate = new org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader(); + delegate = new org.apache.maven.artifact.repository.metadata.io.MetadataStaxReader(); } /** @@ -51,7 +52,7 @@ public class MetadataXpp3Reader { */ public MetadataXpp3Reader(ContentTransformer contentTransformer) { delegate = - new org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Reader(contentTransformer::transform); + new org.apache.maven.artifact.repository.metadata.io.MetadataStaxReader(contentTransformer::transform); } /** @@ -109,8 +110,12 @@ public class MetadataXpp3Reader { * @throws XMLStreamException 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); + } } /** @@ -122,8 +127,12 @@ public class MetadataXpp3Reader { * @throws XMLStreamException 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); + } } /** @@ -136,12 +145,16 @@ public class MetadataXpp3Reader { * @throws XMLStreamException 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 org.apache.maven.artifact.repository.metadata.io.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..626cfc808e 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,29 @@ */ 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; /** - * Provide public methods from {@link org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer} + * Provide public methods from {@link org.apache.maven.artifact.repository.metadata.io.MetadataStaxWriter} * * @deprecated Maven 3 compatability */ @Deprecated public class MetadataXpp3Writer { - private final org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer delegate; + private final org.apache.maven.artifact.repository.metadata.io.MetadataStaxWriter delegate; /** * Default constructor */ public MetadataXpp3Writer() { - delegate = new org.apache.maven.artifact.repository.metadata.io.MetadataXpp3Writer(); + delegate = new org.apache.maven.artifact.repository.metadata.io.MetadataStaxWriter(); } /** @@ -57,7 +60,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 +75,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); + } } }
