[E4 XPath] Deprecate unsuitable XPathContextFactory methods for removal

Author: HannesWell

bundles/org.eclipse.e4.emf.xpath/src/org/eclipse/e4/emf/xpath/XPathContextFactory.java

@@ -14,6 +14,7 @@
 package org.eclipse.e4.emf.xpath;
 
 import org.eclipse.e4.emf.internal.xpath.JXPathContextFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
 
 /**
  * Factory responsible to create an XPath-Context
@@ -38,13 +39,20 @@ public abstract class XPathContextFactory<T> {
 	 * @param parentContext parent context
 	 * @param contextBean   Object
 	 * @return XPathContext
+	 * @deprecated The parent-context does not provide any real value. Just use
+	 *             {@link #newContext(Object)}
 	 */
+	@Deprecated(forRemoval = true, since = "2025-03 (removal in 2027-03 or later)")
 	public abstract XPathContext newContext(XPathContext parentContext, T contextBean);
 
 	/**
 	 * @param <T> the object type the xpath is created for
 	 * @return Create a new XPath-Factory
+	 * @deprecated The implementation returned by this method just supports
+	 *             {@link EObject} elements. Use a specializd factory instead like
+	 *             {@link EcoreXPathContextFactory}.
 	 */
+	@Deprecated(forRemoval = true, since = "2025-03 (removal in 2027-03 or later)")
 	public static <T> XPathContextFactory<T> newInstance() {
 		return new JXPathContextFactoryImpl<>();
 	}

tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/ExampleQueriesApplicationTest.java

@@ -73,7 +73,7 @@ public void setUp() {
 		xpathContext = f.newContext(resource.getContents().get(0));
 		URI childUri = URI.createPlatformPluginURI("/org.eclipse.e4.emf.xpath.test/model/fragment.e4xmi", true);
 		childResource = resourceSet.getResource(childUri, true);
-		xpathChildContext = f.newContext(xpathContext, childResource.getContents().get(0));
+		xpathChildContext = f.newContext(childResource.getContents().get(0));
 	}
 
 	@After

tests/org.eclipse.e4.emf.xpath.test/src/org/eclipse/e4/emf/xpath/test/ExampleQueriesTestCase.java

@@ -131,7 +131,7 @@ public void testRelative() {
 		EObject context = resource.getContents().get(0);
 		List<EObject> eContents = context.eContents();
 		EObject firstElement = eContents.get(0);
-		XPathContext nestedXpathContext = xpathContextFactory.newContext(xpathContext, firstElement);
+		XPathContext nestedXpathContext = xpathContextFactory.newContext(firstElement);
 
 		List<Node> dotList = nestedXpathContext.stream(".", Node.class).toList();
 		assertEquals(1, dotList.size());