Merge remote-tracking branch 'origin/main' into live-publish

leeturner · leeturner · commit 80316b257beb · 2025-02-12T12:34:30.000Z
diff --git a/_docs/request-matching.md b/_docs/request-matching.md
@@ -1108,6 +1108,7 @@ The full list of comparison types used by default is as follows:
 `SCHEMA_LOCATION`
 `NO_NAMESPACE_SCHEMA_LOCATION`
 `NODE_TYPE`
+`NAMESPACE_PREFIX`
 `NAMESPACE_URI`
 `TEXT_VALUE`
 `PROCESSING_INSTRUCTION_TARGET`
@@ -1166,6 +1167,56 @@ and
 </body>
 ```
 If third argument is passed as `false` then first xml will not match the stub
+
+#### Namespace awareness
+
+To configure how [XML namespaces](https://www.w3schools.com/xml/xml_namespaces.asp) are handled, the
+`namespaceAwareness` property can be set.
+
+{% codetabs %}
+
+{% codetab Java %}
+```java
+    .withRequestBody(equalToXml("<body>" +
+            "   <entry>1</entry>" +
+            "   <entry>2</entry>" +
+            "</body>").withNamespaceAwareness(EqualToXmlPattern.NamespaceAwareness.STRICT))
+```
+{% endcodetab %}
+
+{% codetab JSON %}
+```json
+{
+  "request": {
+    ...
+    "bodyPatterns" : [ {
+      "equalToXml" : "<body><entry>1</entry><entry>2</entry></body>",
+      "namespaceAwareness": "STRICT"
+    } ]
+    ...
+  },
+  ...
+}
+```
+{% endcodetab %}
+
+{% endcodetabs %}
+
+The available options for namespace awareness behaviour are `STRICT`, `NONE` and `LEGACY`.
+
+`STRICT` adheres to strict XML namespace comparison.
+Namespace prefixes must be bound to a namespace URI.
+Namespace prefixes as well as namespace URIs must match (for both elements and attributes), unless explicitly excluded
+by the `exemptedComparisons` parameter.
+
+`NONE` does not consider XML namespaces when reading and comparing XML documents.
+Namespace prefixes do not need to be bound to a namespace URI and are not considered a separate part of an
+element/attribute name (i.e. the entire element/attribute name must match, not just the local name, regardless of
+the `exemptedComparisons` parameter).
+`xmlns` namespaced attributes are treated no differently to any other attribute.
+
+`LEGACY` is not recommended and is only kept as an option for backwards compatibility.
+
 ### XPath
 
 Deems a match if the attribute value is valid XML and matches the XPath expression supplied. An XML document will be considered to match if any elements are returned by the XPath evaluation. WireMock delegates to Java's in-built XPath engine (via XMLUnit), therefore up to (at least) Java 8 it supports XPath version 1.0.
diff --git a/_docs/response-templating.md b/_docs/response-templating.md
@@ -1082,6 +1082,43 @@ Like the `jsonArrayAdd` helper, the second object can be provided as a block:
 
 {% endraw %}
 
+### Removing attributes
+The `jsonMerge` helper has an optional `removeNulls` parameter which, when set to true will remove any attributes from the resulting JSON that
+have null values in the second JSON document.
+
+So for instance, given the following template:
+
+{% raw %}
+
+```handlebars
+{{#assign 'object1'}}
+{
+    "keepMe": 1,
+    "removeMe": 2
+}
+{{/assign}}
+
+{{#jsonMerge object1 removeNulls=true}}
+{
+    "removeMe": null
+}
+{{/jsonMerge}}
+```
+
+{% endraw %}
+
+The resulting JSON would be:
+
+{% raw %}
+
+```json
+{
+    "keepMe": 1
+}
+```
+
+{% endraw %}
+
 ## Removing from a JSON Array or Object
 
 The `jsonRemove` helper was introduced in WireMock `3.10.0` and allows you to remove an element from an existing json 
