Merge pull request #4589 from evolvedbinary/hotfix/xsuite-xqsuite

Fixes an issue with XSuite not being able to run some formulations of XQsuite

Author: dizzzz

exist-core/pom.xml

@@ -693,6 +693,7 @@
                                 <exclude>src/main/java/org/exist/util/CollectionOfArrayIterator.java</exclude>
                                 <exclude>src/test/java/org/exist/util/CollectionOfArrayIteratorTest.java</exclude>
                                 <exclude>src/main/java/org/exist/util/IPUtil.java</exclude>
+                                <exclude>src/main/java/org/exist/util/MapUtil.java</exclude>
                                 <exclude>src/main/java/org/exist/xmlrpc/ACEAiderParser.java</exclude>
                                 <exclude>src/main/java/org/exist/xmlrpc/ACEAiderSerializer.java</exclude>
                                 <exclude>src/main/java/org/exist/xquery/Cardinality.java</exclude>
@@ -841,6 +842,7 @@ The original license statement is also included below.]]></preamble>
                                 <include>src/main/java/org/exist/util/CollectionOfArrayIterator.java</include>
                                 <include>src/test/java/org/exist/util/CollectionOfArrayIteratorTest.java</include>
                                 <include>src/main/java/org/exist/util/IPUtil.java</include>
+                                <include>src/main/java/org/exist/util/MapUtil.java</include>
                                 <include>src/main/java/org/exist/xmlrpc/ACEAiderParser.java</include>
                                 <include>src/main/java/org/exist/xmlrpc/ACEAiderSerializer.java</include>
                                 <include>src/main/java/org/exist/xquery/Cardinality.java</include>

exist-core/src/main/java/org/exist/repo/ExistRepository.java

@@ -87,7 +87,7 @@ public void configure(final Configuration configuration) throws BrokerPoolServic
 
     @Override
     public void prepare(final BrokerPool brokerPool) throws BrokerPoolServiceException {
-        if(!Files.exists(expathDir)) {
+        if (!Files.exists(expathDir) && brokerPool != null) {
             moveOldRepo(brokerPool.getConfiguration().getExistHome(), expathDir);
         }
         try {

exist-core/src/main/java/org/exist/storage/BrokerPool.java

@@ -506,7 +506,7 @@ private void _initialize() throws EXistException, DatabaseConfigurationException
 
         this.symbols = servicesManager.register(new SymbolTable());
 
-        this.expathRepo = Optional.ofNullable(new ExistRepository());
+        this.expathRepo = Optional.of(new ExistRepository());
         expathRepo.ifPresent(servicesManager::register);
         servicesManager.register(new ClasspathHelper());
 

exist-core/src/main/java/org/exist/test/runner/XQueryTestRunner.java

@@ -25,11 +25,13 @@
 import com.evolvedbinary.j8fu.tuple.Tuple2;
 import org.exist.EXistException;
 import org.exist.dom.QName;
+import org.exist.repo.ExistRepository;
 import org.exist.security.PermissionDeniedException;
 import org.exist.source.ClassLoaderSource;
 import org.exist.source.FileSource;
 import org.exist.source.Source;
 import org.exist.storage.BrokerPool;
+import org.exist.storage.BrokerPoolServiceException;
 import org.exist.util.Configuration;
 import org.exist.util.ConfigurationHelper;
 import org.exist.util.DatabaseConfigurationException;
@@ -88,7 +90,17 @@ private static Configuration getConfiguration() throws DatabaseConfigurationExce
     private static XQueryTestInfo extractTestInfo(final Path path) throws InitializationError {
         try {
             final Configuration config = getConfiguration();
+
+            final ExistRepository expathRepo = new ExistRepository();
+            try {
+                expathRepo.configure(config);
+                expathRepo.prepare(null);
+            } catch (final BrokerPoolServiceException e) {
+                throw new InitializationError(e);
+            }
+
             final XQueryContext xqueryContext = new XQueryContext(config);
+            xqueryContext.setTestRepository(Optional.of(expathRepo));
 
             final Source xquerySource = new FileSource(path, UTF_8, false);
             final XQuery xquery = new XQuery();

exist-core/src/main/java/org/exist/util/MapUtil.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2014, Evolved Binary Ltd
+ *
+ * This file was originally ported from FusionDB to eXist-db by
+ * Evolved Binary, for the benefit of the eXist-db Open Source community.
+ * Only the ported code as it appears in this file, at the time that
+ * it was contributed to eXist-db, was re-licensed under The GNU
+ * Lesser General Public License v2.1 only for use in eXist-db.
+ *
+ * This license grant applies only to a snapshot of the code as it
+ * appeared when ported, it does not offer or infer any rights to either
+ * updates of this source code or access to the original source code.
+ *
+ * The GNU Lesser General Public License v2.1 only license follows.
+ *
+ * ---------------------------------------------------------------------
+ *
+ * Copyright (C) 2014, Evolved Binary Ltd
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; version 2.1.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package org.exist.util;
+
+import com.evolvedbinary.j8fu.tuple.Tuple2;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Simple utility functions for working with Java Maps.
+ *
+ * @author <a href="mailto:[email protected]">Adam Retter</a>
+ */
+public interface MapUtil {
+
+    /**
+     * Create a Hash Map from a List of Tuples.
+     *
+     * @param <K> the type of the keys in the map.
+     * @param <V> the types of the values in the map.
+     *
+     * @param entries the entries for the map.
+     *
+     * @return The HashMap
+     */
+    static <K, V> Map<K,V> HashMap(final Tuple2<K, V>... entries) {
+        return HashMap(Math.max(entries.length, 16), entries);
+    }
+
+    /**
+     * Create a Hash Map from a List of Tuples.
+     *
+     * @param <K> the type of the keys in the map.
+     * @param <V> the types of the values in the map.
+     *
+     * @param initialCapacity allows you to oversize the map if you plan to add more entries.
+     * @param entries the entries for the map.
+     *
+     * @return The HashMap
+     */
+    static <K, V> Map<K,V> HashMap(final int initialCapacity, final Tuple2<K, V>... entries) {
+        final Map<K, V> map = new HashMap<>(initialCapacity);
+        for (final Tuple2<K, V> entry : entries) {
+            map.put(entry._1, entry._2);
+        }
+        return map;
+    }
+}

exist-core/src/main/java/org/exist/xquery/ModuleContext.java

@@ -65,14 +65,18 @@ public class ModuleContext extends XQueryContext {
 
     public ModuleContext(final XQueryContext parentContext, final String modulePrefix, final String moduleNamespace,
             final String location) {
-        super();
+        super(parentContext != null ? parentContext.db : null,
+                parentContext != null ? parentContext.getConfiguration() : null,
+                null,
+                false);
+
         this.modulePrefix = modulePrefix;
         this.moduleNamespace = moduleNamespace;
         this.location = location;
+
         setParentContext(parentContext);
 
-        loadDefaults(getConfiguration());
-        this.profiler = new Profiler(getBroker() != null ? getBroker().getBrokerPool() : null);
+        loadDefaults(this.configuration);
     }
 
     @Override
@@ -103,7 +107,6 @@ private void setParentContext(final XQueryContext parentContext) {
         this.parentContext = parentContext;
         //XXX: raise error on null!
         if (parentContext != null) {
-            this.db = parentContext.db;
             this.baseURI = parentContext.baseURI;
             try {
                 if (location.startsWith(XmldbURI.XMLDB_URI_PREFIX) ||
@@ -183,11 +186,6 @@ public XQueryContext copyContext() {
         return ctx;
     }
 
-    @Override
-    public Configuration getConfiguration() {
-        return parentContext.getConfiguration();
-    }
-
     @Override
     public void addDynamicOption(final String name, final String value) throws XPathException {
         parentContext.addDynamicOption(name, value);