-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8323571: Regression in source resolution process
Reviewed-by: lancea, naoto
- Loading branch information
1 parent
49e6121
commit e4389d8
Showing
4 changed files
with
357 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
201 changes: 201 additions & 0 deletions
201
test/jaxp/javax/xml/jaxp/unittest/common/catalog/NullIdTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,201 @@ | ||
| /* | ||
| * Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
| package common.catalog; | ||
|
|
||
| import org.w3c.dom.ls.LSInput; | ||
| import org.w3c.dom.ls.LSResourceResolver; | ||
| import org.xml.sax.SAXException; | ||
|
|
||
| import javax.xml.catalog.CatalogFeatures; | ||
| import javax.xml.transform.Source; | ||
| import javax.xml.transform.stream.StreamSource; | ||
| import javax.xml.validation.SchemaFactory; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.InputStreamReader; | ||
| import java.io.Reader; | ||
| import java.io.StringReader; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import static java.util.Objects.requireNonNull; | ||
| import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; | ||
| import static javax.xml.catalog.CatalogManager.catalogResolver; | ||
| import javax.xml.catalog.CatalogResolver; | ||
| import javax.xml.validation.Validator; | ||
| import org.testng.annotations.Test; | ||
|
|
||
| /* | ||
| * @test | ||
| * @bug 8323571 | ||
| * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest | ||
| * @run testng common.catalog.NullIdTest | ||
| * @summary Verifies null values are handled properly in the source resolution | ||
| * process. | ||
| */ | ||
| public class NullIdTest { | ||
| private static final Map<String, String> SCHEMAS; | ||
| // Source Level JDK 8 | ||
| static { | ||
| Map<String, String> map = new HashMap<>(); | ||
| map.put("https://schemas.opentest4j.org/reporting/events/0.1.0", "events.xsd"); | ||
| map.put("https://schemas.opentest4j.org/reporting/core/0.1.0", "core.xsd"); | ||
| SCHEMAS = Collections.unmodifiableMap(map); | ||
| } | ||
|
|
||
| /* | ||
| * Verifies that the source resolution process recognizes the custom InputSource | ||
| * correctly even though the public and system IDs are null. | ||
| */ | ||
| @Test | ||
| public void test() throws Exception { | ||
| String xml = "<events xmlns=\"https://schemas.opentest4j.org/reporting/events/0.1.0\"/>"; | ||
| validate(new StreamSource(new StringReader(xml))); | ||
| System.out.println("Successfully validated"); | ||
| } | ||
|
|
||
| private static void validate(Source source) throws SAXException, IOException { | ||
| SchemaFactory schemaFactory = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI); | ||
| Validator validator = schemaFactory.newSchema().newValidator(); | ||
| validator.setResourceResolver(createResourceResolver()); | ||
| validator.validate(source); | ||
| } | ||
|
|
||
| private static LSResourceResolver createResourceResolver() { | ||
| return (type, namespaceURI, publicId, systemId, baseURI) -> { | ||
| if (namespaceURI != null) { | ||
| if (SCHEMAS.containsKey(namespaceURI)) { | ||
| CustomLSInputImpl input = new CustomLSInputImpl(); | ||
| input.setPublicId(publicId); | ||
| String schema = SCHEMAS.get(namespaceURI); | ||
| input.setSystemId(requireNonNull(NullIdTest.class.getResource(schema)).toExternalForm()); | ||
| input.setBaseURI(baseURI); | ||
| InputStream stream = NullIdTest.class.getResourceAsStream(schema); | ||
| input.setCharacterStream(new InputStreamReader(requireNonNull(stream))); | ||
| return input; | ||
| } | ||
| } | ||
| if (systemId != null) { | ||
| CatalogFeatures features = CatalogFeatures.builder() | ||
| .with(CatalogFeatures.Feature.RESOLVE, "continue") | ||
| .build(); | ||
| CatalogResolver catalogResolver = catalogResolver(features); | ||
| return catalogResolver.resolveResource(type, namespaceURI, publicId, systemId, baseURI); | ||
| } | ||
| return null; | ||
| }; | ||
| } | ||
|
|
||
| static class CustomLSInputImpl implements LSInput { | ||
|
|
||
| private Reader characterStream; | ||
| private InputStream byteStream; | ||
| private String stringData; | ||
| private String systemId; | ||
| private String publicId; | ||
| private String baseURI; | ||
| private String encoding; | ||
| private boolean certifiedText; | ||
|
|
||
| @Override | ||
| public Reader getCharacterStream() { | ||
| return characterStream; | ||
| } | ||
|
|
||
| @Override | ||
| public void setCharacterStream(Reader characterStream) { | ||
| this.characterStream = characterStream; | ||
| } | ||
|
|
||
| @Override | ||
| public InputStream getByteStream() { | ||
| return byteStream; | ||
| } | ||
|
|
||
| @Override | ||
| public void setByteStream(InputStream byteStream) { | ||
| this.byteStream = byteStream; | ||
| } | ||
|
|
||
| @Override | ||
| public String getStringData() { | ||
| return stringData; | ||
| } | ||
|
|
||
| @Override | ||
| public void setStringData(String stringData) { | ||
| this.stringData = stringData; | ||
| } | ||
|
|
||
| @Override | ||
| public String getSystemId() { | ||
| return systemId; | ||
| } | ||
|
|
||
| @Override | ||
| public void setSystemId(String systemId) { | ||
| this.systemId = systemId; | ||
| } | ||
|
|
||
| @Override | ||
| public String getPublicId() { | ||
| return publicId; | ||
| } | ||
|
|
||
| @Override | ||
| public void setPublicId(String publicId) { | ||
| this.publicId = publicId; | ||
| } | ||
|
|
||
| @Override | ||
| public String getBaseURI() { | ||
| return baseURI; | ||
| } | ||
|
|
||
| @Override | ||
| public void setBaseURI(String baseURI) { | ||
| this.baseURI = baseURI; | ||
| } | ||
|
|
||
| @Override | ||
| public String getEncoding() { | ||
| return encoding; | ||
| } | ||
|
|
||
| @Override | ||
| public void setEncoding(String encoding) { | ||
| this.encoding = encoding; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean getCertifiedText() { | ||
| return certifiedText; | ||
| } | ||
|
|
||
| @Override | ||
| public void setCertifiedText(boolean certifiedText) { | ||
| this.certifiedText = certifiedText; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" | ||
| xmlns:core="https://schemas.opentest4j.org/reporting/core/0.1.0" | ||
| targetNamespace="https://schemas.opentest4j.org/reporting/core/0.1.0" | ||
| elementFormDefault="qualified"> | ||
| <xs:element name="infrastructure" type="core:Infrastructure"/> | ||
| <xs:complexType name="Infrastructure"> | ||
| <xs:sequence> | ||
| <xs:element name="hostName" minOccurs="0" type="xs:string"/> | ||
| <xs:element name="userName" minOccurs="0" type="xs:string"/> | ||
| <xs:element name="operatingSystem" minOccurs="0" type="xs:string"/> | ||
| <xs:element name="cpuCores" minOccurs="0" type="xs:int"/> | ||
| <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/> | ||
| </xs:sequence> | ||
| </xs:complexType> | ||
| <xs:complexType name="TestInfo"> | ||
| <xs:sequence> | ||
| <xs:element name="metadata" minOccurs="0"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="tags" minOccurs="0"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="tag" type="xs:string" maxOccurs="unbounded"/> | ||
| </xs:sequence> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/> | ||
| </xs:sequence> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <xs:element name="sources" minOccurs="0"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="directorySource" minOccurs="0" maxOccurs="unbounded"> | ||
| <xs:complexType> | ||
| <xs:attribute name="path" type="xs:string" use="required"/> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <xs:element name="fileSource" minOccurs="0" maxOccurs="unbounded"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="filePosition" type="core:FilePosition" minOccurs="0"/> | ||
| </xs:sequence> | ||
| <xs:attribute name="path" type="xs:string" use="required"/> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/> | ||
| </xs:sequence> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <xs:element name="attachments" minOccurs="0"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="data" minOccurs="0" maxOccurs="unbounded"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="entry" minOccurs="0" maxOccurs="unbounded"> | ||
| <xs:complexType> | ||
| <xs:simpleContent> | ||
| <xs:extension base="xs:string"> | ||
| <xs:attribute name="key" type="xs:string" use="required"/> | ||
| </xs:extension> | ||
| </xs:simpleContent> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| </xs:sequence> | ||
| <xs:attribute name="time" type="xs:dateTime" use="required"/> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/> | ||
| </xs:sequence> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| <xs:element name="result" minOccurs="0"> | ||
| <xs:complexType> | ||
| <xs:sequence> | ||
| <xs:element name="reason" type="xs:string" minOccurs="0"/> | ||
| <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other"/> | ||
| </xs:sequence> | ||
| <xs:attribute name="status" type="core:Status"/> | ||
| </xs:complexType> | ||
| </xs:element> | ||
| </xs:sequence> | ||
| </xs:complexType> | ||
| <xs:simpleType name="Status"> | ||
| <xs:restriction base="xs:string"> | ||
| <xs:enumeration value="SUCCESSFUL"/> | ||
| <xs:enumeration value="SKIPPED"/> | ||
| <xs:enumeration value="ABORTED"/> | ||
| <xs:enumeration value="FAILED"/> | ||
| </xs:restriction> | ||
| </xs:simpleType> | ||
| <xs:complexType name="FilePosition"> | ||
| <xs:attribute name="line" type="xs:int" use="required"/> | ||
| <xs:attribute name="column" type="xs:int"/> | ||
| </xs:complexType> | ||
| </xs:schema> |
Oops, something went wrong.
e4389d8There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues
e4389d8There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk22
e4389d8There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JoeWang-Java the backport was successfully created on the branch backport-JoeWang-Java-e4389d8d in my personal fork of openjdk/jdk22. To create a pull request with this backport targeting openjdk/jdk22:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22: