|
1 | 1 | package org.fedoraproject.javapackages.validator.validators; |
2 | 2 |
|
3 | | -import java.io.ByteArrayInputStream; |
| 3 | +import java.nio.charset.StandardCharsets; |
4 | 4 | import java.nio.file.Path; |
5 | 5 | import java.util.ArrayList; |
6 | 6 | import java.util.Map; |
7 | 7 | import java.util.TreeSet; |
8 | 8 | import java.util.function.Predicate; |
9 | 9 | import java.util.stream.Collectors; |
10 | 10 |
|
11 | | -import javax.xml.stream.XMLStreamException; |
12 | | - |
13 | 11 | import org.apache.commons.compress.archivers.cpio.CpioArchiveEntry; |
14 | 12 | import org.apache.commons.io.IOUtils; |
15 | 13 | import org.fedoraproject.javapackages.validator.spi.Decorated; |
16 | 14 | import org.fedoraproject.javapackages.validator.util.Common; |
17 | 15 | import org.fedoraproject.javapackages.validator.util.ElementwiseValidator; |
18 | 16 | import org.fedoraproject.xmvn.metadata.PackageMetadata; |
19 | | -import org.fedoraproject.xmvn.metadata.io.stax.MetadataStaxReader; |
20 | 17 |
|
21 | 18 | import io.kojan.javadeptools.rpm.RpmArchiveInputStream; |
22 | 19 | import io.kojan.javadeptools.rpm.RpmInfo; |
23 | 20 | import io.kojan.javadeptools.rpm.RpmPackage; |
| 21 | +import io.kojan.xml.XMLException; |
24 | 22 |
|
25 | 23 | /// Validator which checks that Maven metadata XML stored in |
26 | 24 | /// `/usr/share/maven-metadata/`. |
@@ -75,9 +73,10 @@ public void validate(RpmPackage rpm) throws Exception { |
75 | 73 | for (var entry : metadataXmls) { |
76 | 74 | PackageMetadata packageMetadata = null; |
77 | 75 |
|
78 | | - try (var is = new ByteArrayInputStream(entry.getValue())) { |
79 | | - packageMetadata = new MetadataStaxReader().read(is, true); |
80 | | - } catch (XMLStreamException ex) { |
| 76 | + try { |
| 77 | + String xml = new String(entry.getValue(), StandardCharsets.UTF_8); |
| 78 | + packageMetadata = PackageMetadata.fromXML(xml); |
| 79 | + } catch (XMLException ex) { |
81 | 80 | fail("{0}: metadata validation failed: {1}", Decorated.rpm(rpm), Decorated.plain(ex.getMessage())); |
82 | 81 | continue; |
83 | 82 | } |
|
0 commit comments