-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2717 from wiremock/xpath-helper-single-item-bug
Fixes #2696 - xPath helper returns error when result is primitive value
- Loading branch information
Showing
5 changed files
with
229 additions
and
122 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
131 changes: 131 additions & 0 deletions
131
src/main/java/com/github/tomakehurst/wiremock/common/xml/XmlDomNode.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,131 @@ | ||
| /* | ||
| * Copyright (C) 2024 Thomas Akehurst | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.github.tomakehurst.wiremock.common.xml; | ||
|
|
||
| import static com.github.tomakehurst.wiremock.common.Exceptions.throwUnchecked; | ||
|
|
||
| import java.io.StringWriter; | ||
| import java.lang.reflect.Constructor; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.util.Collections; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import javax.xml.transform.Source; | ||
| import javax.xml.transform.Transformer; | ||
| import javax.xml.transform.dom.DOMSource; | ||
| import javax.xml.transform.sax.SAXSource; | ||
| import javax.xml.transform.stream.StreamResult; | ||
| import org.w3c.dom.NamedNodeMap; | ||
| import org.w3c.dom.Node; | ||
| import org.xml.sax.XMLReader; | ||
|
|
||
| public class XmlDomNode extends XmlNode { | ||
|
|
||
| private final Node domNode; | ||
| private final Map<String, String> attributes; | ||
|
|
||
| public XmlDomNode(Node domNode) { | ||
| this.domNode = domNode; | ||
| attributes = | ||
| domNode.hasAttributes() | ||
| ? convertAttributeMap(domNode.getAttributes()) | ||
| : Collections.emptyMap(); | ||
| } | ||
|
|
||
| private static Map<String, String> convertAttributeMap(NamedNodeMap namedNodeMap) { | ||
| Map<String, String> map = new HashMap<>(); | ||
| for (int i = 0; i < namedNodeMap.getLength(); i++) { | ||
| Node node = namedNodeMap.item(i); | ||
| map.put(node.getNodeName(), node.getNodeValue()); | ||
| } | ||
|
|
||
| return Collections.unmodifiableMap(map); | ||
| } | ||
|
|
||
| public Map<String, String> getAttributes() { | ||
| return attributes; | ||
| } | ||
|
|
||
| public String getName() { | ||
| return domNode.getNodeName(); | ||
| } | ||
|
|
||
| public String getText() { | ||
| return domNode.getTextContent(); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| switch (domNode.getNodeType()) { | ||
| case Node.TEXT_NODE: | ||
| case Node.ATTRIBUTE_NODE: | ||
| return domNode.getTextContent(); | ||
| case Node.DOCUMENT_NODE: | ||
| case Node.ELEMENT_NODE: | ||
| return render(); | ||
| default: | ||
| return domNode.toString(); | ||
| } | ||
| } | ||
|
|
||
| private String render() { | ||
| try { | ||
| Transformer transformer = TRANSFORMER_CACHE.get(); | ||
| StreamResult result = new StreamResult(new StringWriter()); | ||
| Source source = getSourceForTransform(domNode); | ||
| transformer.transform(source, result); | ||
| return result.getWriter().toString(); | ||
| } catch (Exception e) { | ||
| return throwUnchecked(e, String.class); | ||
| } | ||
| } | ||
|
|
||
| private static final Class<XMLReader> DOM2SAX_XMLREADER_CLASS = getDom2SaxAvailability(); | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private static Class<XMLReader> getDom2SaxAvailability() { | ||
| try { | ||
| return (Class<XMLReader>) | ||
| Class.forName("com.sun.org.apache.xalan.internal.xsltc.trax.DOM2SAX"); | ||
| } catch (ClassNotFoundException e) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| // This nasty little hack attempts to ensure no exception is thrown when attempting to print an | ||
| // XML node with | ||
| // unbound namespace prefixes (which can happen when you've selected an element via XPath whose | ||
| // namespaces are declared in a parent element). | ||
| // For some reason Transformer is happy to do this with a SAX source, but not a DOM source. | ||
| private static Source getSourceForTransform(Node node) { | ||
| if (DOM2SAX_XMLREADER_CLASS != null) { | ||
| try { | ||
| Constructor<XMLReader> constructor = DOM2SAX_XMLREADER_CLASS.getConstructor(Node.class); | ||
| XMLReader dom2SAX = constructor.newInstance(node); | ||
| SAXSource saxSource = new SAXSource(); | ||
| saxSource.setXMLReader(dom2SAX); | ||
| return saxSource; | ||
| } catch (NoSuchMethodException | ||
| | InstantiationException | ||
| | IllegalAccessException | ||
| | InvocationTargetException e) { | ||
| return new DOMSource(node); | ||
| } | ||
| } | ||
|
|
||
| return new DOMSource(node); | ||
| } | ||
| } |
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
39 changes: 39 additions & 0 deletions
39
src/main/java/com/github/tomakehurst/wiremock/common/xml/XmlPrimitiveNode.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,39 @@ | ||
| /* | ||
| * Copyright (C) 2024 Thomas Akehurst | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.github.tomakehurst.wiremock.common.xml; | ||
|
|
||
| import java.text.NumberFormat; | ||
| import java.util.Collections; | ||
| import java.util.Map; | ||
|
|
||
| public class XmlPrimitiveNode<T> extends XmlNode { | ||
|
|
||
| private final T value; | ||
|
|
||
| public XmlPrimitiveNode(T value) { | ||
| this.value = value; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return value instanceof Number ? NumberFormat.getInstance().format(value) : value.toString(); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<String, String> getAttributes() { | ||
| return Collections.emptyMap(); | ||
| } | ||
| } |
Oops, something went wrong.