This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 2d8f9c5af73 [CXF-8966] : fix validation of nil int in xsd (#3151)
2d8f9c5af73 is described below
commit 2d8f9c5af732e743225311b9f68289e949f28593
Author: Andriy Redko <[email protected]>
AuthorDate: Thu May 28 07:48:35 2026 -0400
[CXF-8966] : fix validation of nil int in xsd (#3151)
Co-authored-by: Francois de Parscau <[email protected]>
---
.../source/XMLStreamDataReaderTest.java | 98 ++++++++++++++++++++++
.../cxf/databinding/source/resources/schema.xsd | 11 +++
.../databinding/source/resources/test-invalid.xml | 5 ++
.../databinding/source/resources/test-valid.xml | 7 ++
4 files changed, 121 insertions(+)
diff --git
a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
index 8d6684fe66e..e0b5e0d7ab9 100755
---
a/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
+++
b/core/src/test/java/org/apache/cxf/databinding/source/XMLStreamDataReaderTest.java
@@ -22,19 +22,45 @@ package org.apache.cxf.databinding.source;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
+import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import org.w3c.dom.Document;
+
+import com.ctc.wstx.msv.W3CSchemaFactory;
+
+import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
+import org.apache.cxf.service.Service;
+import org.apache.cxf.service.ServiceImpl;
+import org.apache.cxf.service.model.MessageInfo;
+import org.apache.cxf.service.model.MessagePartInfo;
+import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.StaxUtils;
+import org.codehaus.stax2.XMLStreamReader2;
+import org.codehaus.stax2.validation.XMLValidationSchema;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
*
@@ -92,6 +118,78 @@ public class XMLStreamDataReaderTest {
((XMLStreamReader)obj).close();
}
+ @Test
+ public void testValid() throws Exception {
+ testValidate("resources/schema.xsd", "resources/test-valid.xml",
false);
+ }
+
+ @Test
+ public void testInValid() throws Exception {
+ testValidate("resources/schema.xsd", "resources/test-invalid.xml",
true);
+ }
+
+
+ private void testValidate(String schemaPath, String xmlPath, boolean
exceptionExpected) throws Exception {
+
+ //create schema
+ DocumentBuilderFactory documentBuilderFactory =
DocumentBuilderFactory.newInstance();
+ documentBuilderFactory.setNamespaceAware(true);
+ DocumentBuilder documentBuilder =
documentBuilderFactory.newDocumentBuilder();
+ URL schemaURI = getClass().getResource(schemaPath);
+ Document wsdl = documentBuilder.parse(schemaURI.openStream());
+ String wsdlSystemId = schemaURI.toExternalForm();
+ DOMSource source = new DOMSource(wsdl);
+ source.setSystemId(wsdlSystemId);
+ source.setSystemId(wsdlSystemId);
+
+ XMLValidationSchema schemaw3c =
+
W3CSchemaFactory.newInstance(XMLValidationSchema.SCHEMA_ID_W3C_SCHEMA).createSchema(schemaURI);
+ SchemaFactory schemaFactory =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+ Schema schema = schemaFactory.newSchema(schemaURI);
+
+ XMLStreamDataReader reader = new XMLStreamDataReader();
+ reader.setSchema(schema);
+
+
+ InputStream testIS = getClass().getResourceAsStream(xmlPath);
+ Message msg = new MessageImpl();
+ Exchange exchange = new ExchangeImpl();
+
+ ServiceInfo serviceInfo = new ServiceInfo();
+
+ Endpoint endpoint = mock(Endpoint.class);
+
when(endpoint.get(XMLValidationSchema.class.getName())).thenReturn(schemaw3c);
+
+ Service svc = new ServiceImpl(serviceInfo);
+
+ exchange.put(Service.class, svc);
+ exchange.put(Endpoint.class, endpoint);
+
+ msg.setExchange(exchange);
+ msg.setContent(InputStream.class, testIS);
+ reader.setProperty(Message.class.getName(), msg);
+
+ XMLInputFactory xmlFactory = XMLInputFactory.newInstance();
+ XMLStreamReader2 xmlStreamReader = (XMLStreamReader2)
xmlFactory.createXMLStreamReader(testIS, "utf-8");
+
+ MessageInfo messageInfo = new MessageInfo(null,
+ MessageInfo.Type.INPUT,
+ new QName("http://www.test.org/services";,
+ "NullTestOperationRequest"));
+ MessagePartInfo messagePartInfo = new MessagePartInfo(new QName(
+ "http://www.test.org/services";, "NullTestOperationRequest"),
messageInfo);
+ messagePartInfo.setElement(true);
+ boolean exceptionCaught = false;
+ try {
+ reader.read(messagePartInfo, xmlStreamReader);
+ } catch (Fault fault) {
+ exceptionCaught = true;
+ } catch (Exception exc) {
+ fail(exc.getMessage());
+ }
+ assertEquals(exceptionExpected, exceptionCaught);
+ }
+
private static class TestInputStream extends ByteArrayInputStream {
private boolean closed;
diff --git
a/core/src/test/java/org/apache/cxf/databinding/source/resources/schema.xsd
b/core/src/test/java/org/apache/cxf/databinding/source/resources/schema.xsd
new file mode 100644
index 00000000000..a69a05d55ca
--- /dev/null
+++ b/core/src/test/java/org/apache/cxf/databinding/source/resources/schema.xsd
@@ -0,0 +1,11 @@
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://www.test.org/service/";>
+ <xsd:element name="NullTestOperationRequest" nillable="true">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element nillable="true" name="inInt" type="xsd:int"
maxOccurs="1" minOccurs="0" ></xsd:element>
+ <xsd:element nillable="true" name="inInteger"
type="xsd:integer" maxOccurs="1" minOccurs="0" ></xsd:element>
+ <xsd:element nillable="true" name="inString" type="xsd:string"
maxOccurs="1" minOccurs="0" ></xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
\ No newline at end of file
diff --git
a/core/src/test/java/org/apache/cxf/databinding/source/resources/test-invalid.xml
b/core/src/test/java/org/apache/cxf/databinding/source/resources/test-invalid.xml
new file mode 100644
index 00000000000..74d88711633
--- /dev/null
+++
b/core/src/test/java/org/apache/cxf/databinding/source/resources/test-invalid.xml
@@ -0,0 +1,5 @@
+<ser:NullTestOperationRequest xmlns:ser="http://www.test.org/service/";>
+
+ <inInt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:nil="false"/>
+
+</ser:NullTestOperationRequest>
\ No newline at end of file
diff --git
a/core/src/test/java/org/apache/cxf/databinding/source/resources/test-valid.xml
b/core/src/test/java/org/apache/cxf/databinding/source/resources/test-valid.xml
new file mode 100644
index 00000000000..e96ff05fd6d
--- /dev/null
+++
b/core/src/test/java/org/apache/cxf/databinding/source/resources/test-valid.xml
@@ -0,0 +1,7 @@
+<ser:NullTestOperationRequest xmlns:ser="http://www.test.org/service/";>
+
+ <inInt xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:nil="true"/>
+ <inInteger xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:nil="true"/>
+ <inString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:nil="true"/>
+
+</ser:NullTestOperationRequest>
\ No newline at end of file
