diff --git a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java index f2c0cdd2326..8e2244f3a84 100644 --- a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java +++ b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolver.java @@ -36,7 +36,9 @@ /** * {@link PrefixResolver} implementation that loads prefix configuration from jmeter property xpath.namespace.config + * @deprecated This Xalan-based class is scheduled for removal. */ +@Deprecated(since = "6.0", forRemoval = true) public class PropertiesBasedPrefixResolver extends PrefixResolverDefault { private static final Logger log = LoggerFactory.getLogger(PropertiesBasedPrefixResolver.class); private static final String XPATH_NAMESPACE_CONFIG = "xpath.namespace.config"; diff --git a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java index 7702c492344..f0185df7271 100644 --- a/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java +++ b/src/core/src/main/java/org/apache/jmeter/util/PropertiesBasedPrefixResolverForXpath2.java @@ -27,7 +27,9 @@ /** * {@link PrefixResolver} implementation that loads prefix configuration from * jmeter property xpath.namespace.config + * @deprecated This Xalan-based class is scheduled for removal. */ +@Deprecated(since = "6.0", forRemoval = true) public class PropertiesBasedPrefixResolverForXpath2 extends PrefixResolverDefault { private final Map namespaceMap = new HashMap<>(); diff --git a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java index bfcf4dd151f..997c9ad82c2 100644 --- a/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java +++ b/src/core/src/main/java/org/apache/jmeter/util/XPathUtil.java @@ -566,6 +566,7 @@ private static void addToList(XMLStreamReader reader, List res) { * @param document XML Document * @return {@link PrefixResolver} */ + @SuppressWarnings("removal") // Used until the Xalan implementation is replaced private static PrefixResolver getPrefixResolver(Document document) { return new PropertiesBasedPrefixResolver(document.getDocumentElement()); } @@ -592,6 +593,7 @@ public static void validateXPath(Document document, String xpathString) throws T * @param namespaces String series of prefix/namespace values separateur by line break * @return {@link PrefixResolver} */ + @SuppressWarnings("removal") // Used until the Xalan implementation is replaced private static PrefixResolver getPrefixResolverForXPath2(Document document,String namespaces) { return new PropertiesBasedPrefixResolverForXpath2(document.getDocumentElement(),namespaces); }