Adjust and use the embedded JXpath

Author: laeubi

bundles/org.eclipse.e4.emf.xpath/META-INF/MANIFEST.MF

@@ -9,10 +9,5 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.35.0",
 Export-Package: org.eclipse.e4.emf.internal.xpath;x-internal:=true,
  org.eclipse.e4.emf.internal.xpath.helper;x-friends:="org.eclipse.e4.emf.xpath.test,org.eclipse.e4.ui.model.workbench,org.eclipse.e4.ui.workbench",
  org.eclipse.e4.emf.xpath
-Import-Package: org.apache.commons.jxpath;version="[1.3.0,2.0.0)",
- org.apache.commons.jxpath.ri;version="[1.3.0,2.0.0)",
- org.apache.commons.jxpath.ri.compiler;version="[1.3.0,2.0.0)",
- org.apache.commons.jxpath.ri.model;version="[1.3.0,2.0.0)",
- org.apache.commons.jxpath.util;version="[1.3.0,2.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.e4.emf.xpath

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/ri/JXPathContextReferenceImpl.java

@@ -88,24 +88,6 @@ public class JXPathContextReferenceImpl extends JXPathContext {
             nodeFactories.add(domFactory);
         }
 
-        // JDOM  factory is only registered if JDOM is on the classpath
-        final Object jdomFactory = allocateConditionally(
-                "org.apache.commons.jxpath.ri.model.jdom.JDOMPointerFactory",
-                "org.jdom.Document");
-        if (jdomFactory != null) {
-            nodeFactories.add(jdomFactory);
-        }
-
-        // DynaBean factory is only registered if BeanUtils are on the classpath
-        final Object dynaBeanFactory =
-            allocateConditionally(
-                "org.apache.commons.jxpath.ri.model.dynabeans."
-                    + "DynaBeanPointerFactory",
-                "org.apache.commons.beanutils.DynaBean");
-        if (dynaBeanFactory != null) {
-            nodeFactories.add(dynaBeanFactory);
-        }
-
         nodeFactories.add(new ContainerPointerFactory());
         createNodeFactoryArray();
     }
@@ -119,8 +101,8 @@ private static synchronized void createNodeFactoryArray() {
                 (NodePointerFactory[]) nodeFactories.
                     toArray(new NodePointerFactory[nodeFactories.size()]);
             Arrays.sort(nodeFactoryArray, (a, b) -> {
-                final int orderA = ((NodePointerFactory) a).getOrder();
-                final int orderB = ((NodePointerFactory) b).getOrder();
+				final int orderA = a.getOrder();
+				final int orderB = b.getOrder();
                 return orderA - orderB;
             });
         }

bundles/org.eclipse.e4.emf.xpath/src/org/apache/commons/jxpath/util/BasicTypeConverter.java

@@ -29,8 +29,6 @@
 import java.util.Set;
 import java.util.SortedSet;
 
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.Converter;
 import org.apache.commons.jxpath.JXPathInvalidAccessException;
 import org.apache.commons.jxpath.JXPathTypeConversionException;
 import org.apache.commons.jxpath.NodeSet;
@@ -141,7 +139,7 @@ public boolean canConvert(final Object object, final Class toType) {
         if (object instanceof Pointer) {
             return canConvert(((Pointer) object).getValue(), useType);
         }
-        return ConvertUtils.lookup(useType) != null;
+		return false;
     }
 
     /**
@@ -268,11 +266,6 @@ public Object convert(final Object object, final Class toType) {
             }
         }
 
-        final Converter converter = ConvertUtils.lookup(useType);
-        if (converter != null) {
-            return converter.convert(useType, object);
-        }
-
         throw new JXPathTypeConversionException("Cannot convert "
                 + object.getClass() + " to " + useType);
     }

tests/org.eclipse.e4.emf.xpath.test/META-INF/MANIFEST.MF

@@ -12,7 +12,6 @@ Export-Package: org.eclipse.e4.emf.xpath.test.model.xpathtest,
 Require-Bundle: org.eclipse.e4.ui.model.workbench,
  org.eclipse.e4.emf.xpath,
  org.junit,
- org.apache.commons.jxpath,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore,

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

@@ -23,7 +23,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.jxpath.JXPathNotFoundException;
 import org.eclipse.e4.emf.xpath.EcoreXPathContextFactory;
 import org.eclipse.e4.emf.xpath.XPathContext;
 import org.eclipse.e4.emf.xpath.XPathContextFactory;
@@ -83,7 +82,7 @@ public void testSimpleQuery() {
 		assertNotNull(application);
 		assertSame(RootImpl.class, application.getClass());
 
-		assertThrows(JXPathNotFoundException.class, () -> xpathContext.getValue(".[@id='nixda']"));
+		assertThrows(RuntimeException.class, () -> xpathContext.getValue(".[@id='nixda']"));
 
 		application = xpathContext.getValue(".[@id='root']");
 		assertNotNull(application);