From 5c3fe8cc8a1eaed84306e43a9bb96e0c38cbf956 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Mon, 27 Mar 2023 21:49:43 +0200
Subject: [PATCH 01/22] [refactor] XQueryContext, MapUtil

- rename HashMap method to hashMap
---
 exist-core/src/main/java/org/exist/util/MapUtil.java     | 8 +++++---
 .../src/main/java/org/exist/xquery/XQueryContext.java    | 9 +++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/util/MapUtil.java b/exist-core/src/main/java/org/exist/util/MapUtil.java
index 19e55a71d45..c5cd212cbe9 100644
--- a/exist-core/src/main/java/org/exist/util/MapUtil.java
+++ b/exist-core/src/main/java/org/exist/util/MapUtil.java
@@ -54,8 +54,9 @@ public interface MapUtil {
      *
      * @return The HashMap
      */
-    static <K, V> Map<K,V> HashMap(final Tuple2<K, V>... entries) {
-        return HashMap(Math.max(entries.length, 16), entries);
+    @SafeVarargs
+    static <K, V> Map<K,V> hashMap(final Tuple2<K, V>... entries) {
+        return hashMap(Math.max(entries.length, 16), entries);
     }
 
     /**
@@ -69,7 +70,8 @@ static <K, V> Map<K,V> HashMap(final Tuple2<K, V>... entries) {
      *
      * @return The HashMap
      */
-    static <K, V> Map<K,V> HashMap(final int initialCapacity, final Tuple2<K, V>... entries) {
+    @SafeVarargs
+    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);
diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index f154ffab8a5..9cadd4c4077 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -85,10 +85,7 @@
 import org.exist.storage.lock.Lock.LockMode;
 import org.exist.storage.lock.LockedDocumentMap;
 import org.exist.storage.txn.Txn;
-import org.exist.util.Collations;
-import org.exist.util.CollectionOfArrayIterator;
-import org.exist.util.Configuration;
-import org.exist.util.LockException;
+import org.exist.util.*;
 import org.exist.util.hashtable.NamePool;
 import org.exist.xmldb.XmldbURI;
 import org.exist.xquery.parser.*;
@@ -105,7 +102,7 @@
 import static org.apache.commons.lang3.ArrayUtils.isEmpty;
 import static org.apache.commons.lang3.ArrayUtils.isNotEmpty;
 import static org.exist.Namespaces.XML_NS;
-import static org.exist.util.MapUtil.HashMap;
+import static org.exist.util.MapUtil.hashMap;
 
 /**
  * The current XQuery execution context. Contains the static as well as the dynamic
@@ -413,7 +410,7 @@ public class XQueryContext implements BinaryValueManager, Context {
     private HttpContext httpContext = null;
     private static final QName UNNAMED_DECIMAL_FORMAT = new QName("__UNNAMED__", Function.BUILTIN_FUNCTION_NS);
 
-    private final Map<QName, DecimalFormat> staticDecimalFormats = HashMap(Tuple(UNNAMED_DECIMAL_FORMAT, DecimalFormat.UNNAMED));
+    private final Map<QName, DecimalFormat> staticDecimalFormats = hashMap(Tuple(UNNAMED_DECIMAL_FORMAT, DecimalFormat.UNNAMED));
 
     // Only used for testing, e.g. {@link org.exist.test.runner.XQueryTestRunner}.
     private Optional<ExistRepository> testRepository = Optional.empty();

From 07465e8cb1db6fea0d62e4fcc963569ad09259a2 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Mon, 27 Mar 2023 21:50:34 +0200
Subject: [PATCH 02/22] [refactor] XQueryContext declare fields final

---
 .../java/org/exist/xquery/XQueryContext.java  | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 9cadd4c4077..4740f255adf 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -170,7 +170,7 @@ public class XQueryContext implements BinaryValueManager, Context {
     private boolean inheritNamespaces = true;
 
     // Local namespace stack
-    private Deque<Map<String, String>> namespaceStack = new ArrayDeque<>();
+    private final Deque<Map<String, String>> namespaceStack = new ArrayDeque<>();
 
     // Known user defined functions in the local module
     private Map<FunctionId, UserDefinedFunction> declaredFunctions = new Object2ObjectAVLTreeMap<>();
@@ -183,16 +183,16 @@ public class XQueryContext implements BinaryValueManager, Context {
 
     private Deque<LocalVariable> contextStack = new ArrayDeque<>();
 
-    private Deque<FunctionSignature> callStack = new ArrayDeque<>();
+    private final Deque<FunctionSignature> callStack = new ArrayDeque<>();
 
     // The current size of the variable stack
     private int variableStackSize = 0;
 
     // Unresolved references to user defined functions
-    private Deque<FunctionCall> forwardReferences = new ArrayDeque<>();
+    private final Deque<FunctionCall> forwardReferences = new ArrayDeque<>();
 
     // Inline functions using closures need to be cleared after execution
-    private Deque<UserDefinedFunction> closures = new ArrayDeque<>();
+    private final Deque<UserDefinedFunction> closures = new ArrayDeque<>();
 
     // List of options declared for this query at compile time - i.e. declare option
     private List<Option> staticOptions = new ArrayList<>();
@@ -228,7 +228,7 @@ public class XQueryContext implements BinaryValueManager, Context {
     /**
      * Used to save current state when modules are imported dynamically
      */
-    private SavedState savedState = new SavedState();
+    private final SavedState savedState = new SavedState();
 
     /**
      * Whether some modules were rebound to new instances since the last time this context's query was analyzed. (This assumes that each context is
@@ -1639,19 +1639,22 @@ Module initBuiltInModule(final String namespaceURI, final String moduleClass) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     private @Nullable Module instantiateModule(final String namespaceURI, final Class<Module> mClazz,
-            final Map<String, Map<String, List<? extends Object>>> moduleParameters) {
-        Module module = null;
+            final Map<String, Map<String, List<?>>> moduleParameters) {
         try {
-            try {
-                // attempt for a constructor that takes 1 argument
-                final Constructor<Module> cstr1 = mClazz.getConstructor(Map.class);
-                module = cstr1.newInstance(moduleParameters.get(namespaceURI));
+            final Constructor<Module> constructor = XQueryContext.getModuleConstructor(mClazz);
+
+            if (constructor == null) {
+                LOG.warn("Module {} has no matching public constructor!", mClazz.getName());
+                return null;
+            }
 
-            } catch (final NoSuchMethodException nsme) {
+            final Module module;
+            if (constructor.getParameterCount() == 1) {
+                module = constructor.newInstance(moduleParameters.get(namespaceURI));
+            } else {
                 // attempt for a constructor that takes 0 arguments
-                module = mClazz.newInstance();
+                module = constructor.newInstance();
             }
 
             if (namespaceURI != null && !module.getNamespaceURI().equals(namespaceURI)) {
@@ -1669,11 +1672,25 @@ Module initBuiltInModule(final String namespaceURI, final String moduleClass) {
             if (module instanceof InternalModule) {
                 ((InternalModule) module).prepare(this);
             }
+            return module;
         } catch (final InstantiationException | IllegalAccessException | InvocationTargetException | XPathException e) {
             LOG.warn("error while instantiating module class {}", mClazz.getName(), e);
+            return null;
         }
+    }
 
-        return module;
+    private static @Nullable Constructor<Module> getModuleConstructor(Class<Module> moduleClazz) {
+        try {
+            // prefer constructor that takes one Map argument
+            return moduleClazz.getConstructor(Map.class);
+        } catch (final NoSuchMethodException noPreferredConstructor) {
+            // attempt for a constructor that takes 0 arguments
+            try {
+                return moduleClazz.getConstructor();
+            } catch (final NoSuchMethodException noUsableConstructor) {
+                return null;
+            }
+        }
     }
 
     private static BiFunction<String, Module[], Module[]> addToMapValueArray(final Module module) {

From 2afdefe4608fcf80e728115837ffc0790c61d27c Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Mon, 27 Mar 2023 21:55:07 +0200
Subject: [PATCH 03/22] [refactor] XQueryContext.getStringValue

Remove unnecessary null checks for initialized fields.
---
 .../java/org/exist/xquery/XQueryContext.java  | 52 ++++++++-----------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 4740f255adf..26636c43edd 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -3481,35 +3481,29 @@ public String getStringValue() {
         }
 
         sb.append("inScopePrefixes: {");
-        if (inScopePrefixes != null) {
-            for (final Map.Entry<String, String> entry : inScopePrefixes.entrySet()) {
-                sb.append(entry.getKey()).append("-> ").append(entry.getValue());
-            }
+        for (final Map.Entry<String, String> entry : inScopePrefixes.entrySet()) {
+            sb.append(entry.getKey()).append("-> ").append(entry.getValue());
         }
         sb.append('}');
         sb.append('\n');
 
         sb.append("inScopeNamespaces: {");
-        if (inScopeNamespaces != null) {
-            for (final Map.Entry<String, String> entry : inScopeNamespaces.entrySet()) {
-                sb.append(entry.getKey()).append("-> ").append(entry.getValue());
-            }
+        for (final Map.Entry<String, String> entry : inScopeNamespaces.entrySet()) {
+            sb.append(entry.getKey()).append("-> ").append(entry.getValue());
         }
         sb.append('}');
         sb.append('\n');
 
         sb.append("modules: {");
-        if (modules != null) {
-            for (final Map.Entry<String, Module[]> entry : modules.entrySet()) {
-                sb.append(entry.getKey()).append("-> ");
-                for (final Module module : modules.get(entry.getKey())) {
-                    sb.append("namespaceURI: ").append(module.getNamespaceURI()).append('\n');
-                    sb.append("defaultPrefix: ").append(module.getDefaultPrefix()).append('\n');
-                    sb.append("description: ").append(module.getDescription()).append('\n');
-                    for (final Iterator<QName> it = module.getGlobalVariables(); it.hasNext(); ) {
-                        final QName qName = it.next();
-                        sb.append(qName).append(';');
-                    }
+        for (final Map.Entry<String, Module[]> entry : modules.entrySet()) {
+            sb.append(entry.getKey()).append("-> ");
+            for (final Module module : modules.get(entry.getKey())) {
+                sb.append("namespaceURI: ").append(module.getNamespaceURI()).append('\n');
+                sb.append("defaultPrefix: ").append(module.getDefaultPrefix()).append('\n');
+                sb.append("description: ").append(module.getDescription()).append('\n');
+                for (final Iterator<QName> it = module.getGlobalVariables(); it.hasNext(); ) {
+                    final QName qName = it.next();
+                    sb.append(qName).append(';');
                 }
             }
         }
@@ -3517,17 +3511,15 @@ public String getStringValue() {
         sb.append('\n');
 
         sb.append("allModules: {");
-        if (allModules != null) {
-            for (final Map.Entry<String, Module[]> entry : allModules.entrySet()) {
-                sb.append(entry.getKey()).append("-> ");
-                for (final Module module : allModules.get(entry.getKey())) {
-                    sb.append("namespaceURI: ").append(module.getNamespaceURI()).append('\n');
-                    sb.append("defaultPrefix: ").append(module.getDefaultPrefix()).append('\n');
-                    sb.append("description: ").append(module.getDescription()).append('\n');
-                    for (final Iterator<QName> it = module.getGlobalVariables(); it.hasNext(); ) {
-                        final QName qName = it.next();
-                        sb.append(qName).append(';');
-                    }
+        for (final Map.Entry<String, Module[]> entry : allModules.entrySet()) {
+            sb.append(entry.getKey()).append("-> ");
+            for (final Module module : allModules.get(entry.getKey())) {
+                sb.append("namespaceURI: ").append(module.getNamespaceURI()).append('\n');
+                sb.append("defaultPrefix: ").append(module.getDefaultPrefix()).append('\n');
+                sb.append("description: ").append(module.getDescription()).append('\n');
+                for (final Iterator<QName> it = module.getGlobalVariables(); it.hasNext(); ) {
+                    final QName qName = it.next();
+                    sb.append(qName).append(';');
                 }
             }
         }

From 80025c25e08101278f21f4b20daa7f211a963efa Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 10:52:35 +0200
Subject: [PATCH 04/22] [refactor] XQueryContext.importModuleFromLocation

- remove unnecessary else
- reformat
---
 .../java/org/exist/xquery/XQueryContext.java  | 64 ++++++++++---------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 26636c43edd..ea79695a5ae 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -2488,7 +2488,9 @@ public Module[] importModule(@Nullable String namespaceURI, @Nullable String pre
         return modules;
     }
 
-    private Module importModuleFromLocation(final String namespaceURI, @Nullable final String prefix, final AnyURIValue locationHint) throws XPathException {
+    private Module importModuleFromLocation(
+            final String namespaceURI, @Nullable final String prefix, final AnyURIValue locationHint
+    ) throws XPathException {
         String location = locationHint.toString();
 
         //Is the module's namespace mapped to a URL ?
@@ -2502,10 +2504,10 @@ private Module importModuleFromLocation(final String namespaceURI, @Nullable fin
             return loadBuiltInModule(namespaceURI, location);
         }
 
+        // Is the module source stored in the database?
         if (location.startsWith(XmldbURI.XMLDB_URI_PREFIX)
                 || ((location.indexOf(':') == -1) && moduleLoadPath.startsWith(XmldbURI.XMLDB_URI_PREFIX))) {
 
-            // Is the module source stored in the database?
             try {
                 XmldbURI locationUri = XmldbURI.xmldbUriFor(location);
 
@@ -2518,11 +2520,14 @@ private Module importModuleFromLocation(final String namespaceURI, @Nullable fin
 
                     final DocumentImpl sourceDoc = lockedSourceDoc == null ? null : lockedSourceDoc.getDocument();
                     if (sourceDoc == null) {
-                        throw moduleLoadException("Module location hint URI '" + location + "' does not refer to anything.", location);
+                        throw moduleLoadException("Module location hint URI '"
+                                + location + "' does not refer to anything.", location);
                     }
 
-                    if ((sourceDoc.getResourceType() != DocumentImpl.BINARY_FILE) || !"application/xquery".equals(sourceDoc.getMimeType())) {
-                        throw moduleLoadException("Module location hint URI '" + location + "' does not refer to an XQuery.", location);
+                    if (sourceDoc.getResourceType() != DocumentImpl.BINARY_FILE
+                            || !"application/xquery".equals(sourceDoc.getMimeType())) {
+                        throw moduleLoadException("Module location hint URI '"
+                                + location + "' does not refer to an XQuery.", location);
                     }
 
                     final Source moduleSource = new DBSource(getBroker().getBrokerPool(), (BinaryDocument) sourceDoc, true);
@@ -2535,34 +2540,35 @@ private Module importModuleFromLocation(final String namespaceURI, @Nullable fin
                 throw moduleLoadException("Invalid module location hint URI '" + location + "'.", location, e);
             }
 
-        } else {
-
-            // No. Load from file or URL
-            final Source moduleSource;
-            try {
-                //TODO: use URIs to ensure proper resolution of relative locations
-                final String contextPath;
-                if (source instanceof FileSource) {
-                    final Path sourcePath = ((FileSource)source).getPath();
-                    contextPath = sourcePath.resolveSibling(moduleLoadPath).normalize().toString();
-                } else {
-                    contextPath = moduleLoadPath;
-                }
+        }
 
-                moduleSource = SourceFactory.getSource(getBroker(), contextPath, location, true);
-                if (moduleSource == null) {
-                    throw moduleLoadException("Source for module '" + namespaceURI + "' not found module location hint URI '" + location + "'.", location);
-                }
-            } catch (final MalformedURLException e) {
-                throw moduleLoadException("Invalid module location hint URI '" + location + "'.", location, e);
-            } catch (final IOException e) {
-                throw moduleLoadException("Source for module '" + namespaceURI + "' could not be read, module location hint URI '" + location + "'.", location, e);
-            } catch (final PermissionDeniedException e) {
-                throw moduleLoadException("Permission denied to read module source from location hint URI '" + location + ".", location, e);
+        // No. Load from file or URL
+        final Source moduleSource;
+        try {
+            //TODO: use URIs to ensure proper resolution of relative locations
+            final String contextPath;
+            if (source instanceof FileSource) {
+                final Path sourcePath = ((FileSource) source).getPath();
+                contextPath = sourcePath.resolveSibling(moduleLoadPath).normalize().toString();
+            } else {
+                contextPath = moduleLoadPath;
             }
 
-            return compileOrBorrowModule(prefix, namespaceURI, location, moduleSource);
+            moduleSource = SourceFactory.getSource(getBroker(), contextPath, location, true);
+            if (moduleSource == null) {
+                throw moduleLoadException("Source for module '" + namespaceURI + "' " +
+                        "not found module location hint URI '" + location + "'.", location);
+            }
+        } catch (final MalformedURLException e) {
+            throw moduleLoadException("Invalid module location hint URI '" + location + "'.", location, e);
+        } catch (final IOException e) {
+            throw moduleLoadException("Source for module '" + namespaceURI + "' could not be read, " +
+                    "module location hint URI '" + location + "'.", location, e);
+        } catch (final PermissionDeniedException e) {
+            throw moduleLoadException("Permission denied to read module source from location hint URI '" + location + ".", location, e);
         }
+
+        return compileOrBorrowModule(prefix, namespaceURI, location, moduleSource);
     }
 
     protected XPathException moduleLoadException(final String message, final String moduleLocation)

From 7aaae87d2057cb842bc7c353af6db2a782180bb1 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 10:54:21 +0200
Subject: [PATCH 05/22] [refactor] XQueryContext.getOption

- use equals method in QName for comparison
---
 exist-core/src/main/java/org/exist/xquery/XQueryContext.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index ea79695a5ae..8094e35c564 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -2945,12 +2945,12 @@ else if (Option.OPTIMIZE_IMPLICIT_TIMEZONE.compareTo(qn) == 0) {
     @Override
     public Option getOption(final QName qname) {
         for (final Option option : dynamicOptions) {
-            if (qname.compareTo(option.getQName()) == 0) {
+            if (qname.equals(option.getQName())) {
                 return option;
             }
         }
         for (final Option option : staticOptions) {
-            if (qname.compareTo(option.getQName()) == 0) {
+            if (qname.equals(option.getQName())) {
                 return option;
             }
         }

From ef017f8e25dfc8f1af420bdc51cf70da3466ba50 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 11:05:02 +0200
Subject: [PATCH 06/22] [refactor] XQueryContext.loadDefaults for readability

- use final variables for configuration properties
- return early for less indentation
- extract method addDefaultBuiltInModule
---
 .../java/org/exist/xquery/XQueryContext.java  | 109 ++++++++++--------
 1 file changed, 59 insertions(+), 50 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 8094e35c564..a88bf489495 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -3022,61 +3022,70 @@ public Object getAttribute(final String attribute) {
     void loadDefaults(@Nullable final Configuration config) {
         loadDefaultNS();
 
-        if (config != null) {
-
-            // Switch: enable optimizer
-            String param = config.getProperty(PROPERTY_ENABLE_QUERY_REWRITING, "no");
-            this.enableOptimizer = "yes".equals(param);
-
-            // Switch: Backward compatibility
-            param = config.getProperty(PROPERTY_XQUERY_BACKWARD_COMPATIBLE, "yes");
-            this.backwardsCompatible = "yes".equals(param);
-
-            // Switch: raiseErrorOnFailedRetrieval
-            final Boolean option = config.getProperty(PROPERTY_XQUERY_RAISE_ERROR_ON_FAILED_RETRIEVAL, Boolean.FALSE);
-            this.raiseErrorOnFailedRetrieval = option;
-
-            // Get map of built-in modules
-            final Map<String, Class<Module>> builtInModules = (Map<String, Class<Module>>) config.getProperty(PROPERTY_BUILT_IN_MODULES);
-            if (builtInModules != null) {
-
-                // Iterate on all map entries
-                for (final Map.Entry<String, Class<Module>> entry : builtInModules.entrySet()) {
-
-                    // Get URI and class
-                    final String namespaceURI = entry.getKey();
-                    final Class<Module> moduleClass = entry.getValue();
-
-                    // first check if the module has already been loaded in the parent context
-                    final Module[] modules = getModules(namespaceURI);
-                    Module foundModule = null;
-                    if (modules != null) {
-                        for (final Module module : modules) {
-                            if (moduleClass.equals(module.getClass())) {
-                                foundModule = module;
-                                break;
-                            }
-                        }
-                    }
+        if (config == null) {
+            return;
+        }
 
+        // Switch: enable optimizer
+        final String queryRewritingOption = config.getProperty(PROPERTY_ENABLE_QUERY_REWRITING, "no");
+        this.enableOptimizer = "yes".equals(queryRewritingOption);
 
-                    if (foundModule == null) {
-                        // Module does not exist yet, instantiate
-                        instantiateModule(namespaceURI, moduleClass,
-                                (Map<String, Map<String, List<? extends Object>>>) config.getProperty(PROPERTY_MODULE_PARAMETERS));
+        // Switch: Backward compatibility
+        final String backwardsCompatOption = config.getProperty(PROPERTY_XQUERY_BACKWARD_COMPATIBLE, "yes");
+        this.backwardsCompatible = "yes".equals(backwardsCompatOption);
 
-                    } else if (getPrefixForURI(namespaceURI) == null && !foundModule.getDefaultPrefix().isEmpty()) {
+        // Switch: raiseErrorOnFailedRetrieval
+        this.raiseErrorOnFailedRetrieval =
+                config.getProperty(PROPERTY_XQUERY_RAISE_ERROR_ON_FAILED_RETRIEVAL, Boolean.FALSE);
 
-                        // make sure the namespaces of default modules are known,
-                        // even if they were imported in a parent context
-                        try {
-                            declareNamespace(foundModule.getDefaultPrefix(), foundModule.getNamespaceURI());
+        // Get map of built-in modules
+        final Map<String, Class<Module>> builtInModules =
+                (Map<String, Class<Module>>) config.getProperty(PROPERTY_BUILT_IN_MODULES);
 
-                        } catch (final XPathException e) {
-                            LOG.warn("Internal error while loading default modules: {}", e.getMessage(), e);
-                        }
-                    }
-                }
+        if (builtInModules == null) {
+            return;
+        }
+
+        // Iterate on all map entries
+        for (final Map.Entry<String, Class<Module>> entry : builtInModules.entrySet()) {
+            addDefaultBuiltInModule(config, entry);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private void addDefaultBuiltInModule(final Configuration config, final Map.Entry<String, Class<Module>> entry) {
+        final String namespaceURI = entry.getKey();
+        // first check if the module has already been loaded in the parent context
+        final Module[] modules = getModules(namespaceURI);
+        if (modules == null) {
+            return;
+        }
+
+        // we have to instantiate the module class
+        final Class<Module> moduleClass = entry.getValue();
+        Module foundModule = null;
+        for (final Module module : modules) {
+            if (moduleClass.equals(module.getClass())) {
+                foundModule = module;
+                break;
+            }
+        }
+
+        if (foundModule == null) {
+            // Module does not exist yet, instantiate
+            instantiateModule(namespaceURI, moduleClass,
+                    (Map<String, Map<String, List<?>>>) config.getProperty(PROPERTY_MODULE_PARAMETERS));
+            return;
+        }
+
+        if (getPrefixForURI(namespaceURI) == null && !foundModule.getDefaultPrefix().isEmpty()) {
+            // make sure the namespaces of default modules are known,
+            // even if they were imported in a parent context
+            try {
+                declareNamespace(foundModule.getDefaultPrefix(), foundModule.getNamespaceURI());
+
+            } catch (final XPathException e) {
+                LOG.warn("Internal error while loading default modules: {}", e.getMessage(), e);
             }
         }
     }

From 169511c3ee8113fea84d715e1eff74d19e16f6cc Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 11:09:05 +0200
Subject: [PATCH 07/22] [refactor] minor improvements to XQueryContext

- use final keyword on method arguments, where possible
- some formatting
---
 .../java/org/exist/xquery/XQueryContext.java  | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index a88bf489495..bbf9287f50a 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -1248,7 +1248,7 @@ Reader getDynamicallyAvailableTextResource(final String uri, final Charset chars
     }
 
     /**
-     * Get's a collection from the "Available collections" of the
+     * Gets a collection from the "Available collections" of the
      * dynamic context.
      *
      * @param uri the URI of the collection to retrieve
@@ -2417,11 +2417,13 @@ public Module[] importModule(@Nullable String namespaceURI, @Nullable String pre
             throws XPathException {
 
         if (XML_NS_PREFIX.equals(prefix) || XMLNS_ATTRIBUTE.equals(prefix)) {
-            throw new XPathException(rootExpression, ErrorCodes.XQST0070, "The prefix declared for a module import must not be 'xml' or 'xmlns'.");
+            throw new XPathException(rootExpression, ErrorCodes.XQST0070,
+                    "The prefix declared for a module import must not be 'xml' or 'xmlns'.");
         }
 
         if (namespaceURI != null && namespaceURI.isEmpty()) {
-            throw new XPathException(rootExpression, ErrorCodes.XQST0088, "The first URILiteral in a module import must be of nonzero length.");
+            throw new XPathException(rootExpression, ErrorCodes.XQST0088,
+                    "The first URILiteral in a module import must be of nonzero length.");
         }
 
         Module[] modules = null;
@@ -2780,14 +2782,11 @@ private void setRealUser(final Subject realUser) {
      * Get a static decimal format.
      *
      * @param qnDecimalFormat the name of the decimal format, or null for the UNNAMED format.
-     *
      * @return the decimal format, or null if there is no format matching the name
      */
-    public @Nullable DecimalFormat getStaticDecimalFormat(@Nullable QName qnDecimalFormat) {
-        if (qnDecimalFormat == null) {
-            qnDecimalFormat = UNNAMED_DECIMAL_FORMAT;
-        }
-        return staticDecimalFormats.get(qnDecimalFormat);
+    public @Nullable DecimalFormat getStaticDecimalFormat(@Nullable final QName qnDecimalFormat) {
+        final QName format = qnDecimalFormat == null ? UNNAMED_DECIMAL_FORMAT : qnDecimalFormat;
+        return staticDecimalFormats.get(format);
     }
 
     /**
@@ -2959,7 +2958,7 @@ public Option getOption(final QName qname) {
     }
 
     @Override
-    public Pragma getPragma(final String name, String contents) throws XPathException {
+    public Pragma getPragma(final String name, final String contents) throws XPathException {
         final QName qname;
         try {
             qname = QName.parse(this, name);
@@ -2968,7 +2967,8 @@ public Pragma getPragma(final String name, String contents) throws XPathExceptio
         }
         final String ns = qname.getNamespaceURI();
         if (ns.isEmpty()) {
-            throw new XPathException(rootExpression, ErrorCodes.XPST0081, "XPST0081: pragma's ('" + name + "') namespace URI is empty");
+            throw new XPathException(rootExpression, ErrorCodes.XPST0081,
+                    "The namespace URI for Pragma ('" + name + "') is empty");
         }
 
         if (!Namespaces.EXIST_NS.equals(ns)) {
@@ -3440,7 +3440,7 @@ public SessionWrapper getSession() {
 
         /**
          * Returns a new HttpContext with the new session set.
-         *
+         * <p>
          * The request and response are referenced from this object.
          *
          * @param newSession the new session to set.
@@ -3451,7 +3451,8 @@ public HttpContext setSession(final SessionWrapper newSession) {
         }
     }
 
-    @Override public String toString() {
+    @Override
+    public String toString() {
         return getStringValue();
     }
 
@@ -3545,6 +3546,4 @@ public String getStringValue() {
 
         return sb.toString();
     }
-
-
 }

From 601446aefd10b90fa71b5760df724859f4c728b8 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 19:51:55 +0200
Subject: [PATCH 08/22] Revert "[refactor] XQueryContext dynamic and static
 options"

This reverts commit 6cc9d5549495146a449ac8d4dc7cd4946450f85c.
---
 .../java/org/exist/xquery/XQueryContext.java  | 55 ++++++++++++-------
 1 file changed, 35 insertions(+), 20 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index bbf9287f50a..e4d4e5b3812 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -195,10 +195,10 @@ public class XQueryContext implements BinaryValueManager, Context {
     private final Deque<UserDefinedFunction> closures = new ArrayDeque<>();
 
     // List of options declared for this query at compile time - i.e. declare option
-    private List<Option> staticOptions = new ArrayList<>();
+    private List<Option> staticOptions = null;
 
     // List of options declared for this query at run time - i.e. util:declare-option()
-    private List<Option> dynamicOptions = new ArrayList<>();
+    private List<Option> dynamicOptions = null;
 
     //The Calendar for this context : may be changed by some options
     private XMLGregorianCalendar calendar = null;
@@ -698,11 +698,11 @@ protected void copyFields(final XQueryContext ctx) {
         ctx.staticNamespaces = new HashMap<>(this.staticNamespaces);
         ctx.staticPrefixes = new HashMap<>(this.staticPrefixes);
 
-        if (!this.dynamicOptions.isEmpty()) {
+        if (this.dynamicOptions != null) {
             ctx.dynamicOptions = new ArrayList<>(this.dynamicOptions);
         }
 
-        if (!this.staticOptions.isEmpty()) {
+        if (this.staticOptions != null) {
             ctx.staticOptions = new ArrayList<>(this.staticOptions);
         }
 
@@ -1394,7 +1394,7 @@ public void reset(final boolean keepGlobals) {
             globalVariables.clear();
         }
 
-        if (!dynamicOptions.isEmpty()) {
+        if (dynamicOptions != null) {
             dynamicOptions.clear(); //clear any dynamic options
         }
 
@@ -2881,11 +2881,17 @@ public boolean optimizationsEnabled() {
 
     @Override
     public void addOption(final String name, final String value) throws XPathException {
+        if (staticOptions == null) {
+            staticOptions = new ArrayList<>();
+        }
         addOption(staticOptions, name, value);
     }
 
     @Override
     public void addDynamicOption(final String name, final String value) throws XPathException {
+        if (dynamicOptions == null) {
+            dynamicOptions = new ArrayList<>();
+        }
         addOption(dynamicOptions, name, value);
     }
 
@@ -2943,14 +2949,19 @@ else if (Option.OPTIMIZE_IMPLICIT_TIMEZONE.compareTo(qn) == 0) {
 
     @Override
     public Option getOption(final QName qname) {
-        for (final Option option : dynamicOptions) {
-            if (qname.equals(option.getQName())) {
-                return option;
+        if (dynamicOptions != null) {
+            for (final Option option : dynamicOptions) {
+                if (qname.equals(option.getQName())) {
+                    return option;
+                }
             }
         }
-        for (final Option option : staticOptions) {
-            if (qname.equals(option.getQName())) {
-                return option;
+
+        if (staticOptions != null) {
+            for (final Option option : staticOptions) {
+                if (qname.equals(option.getQName())) {
+                    return option;
+                }
             }
         }
 
@@ -3144,18 +3155,22 @@ protected void clearUpdateListeners() {
     @Override
     public void checkOptions(final Properties properties) throws XPathException {
         checkLegacyOptions(properties);
-        for (final Option option : dynamicOptions) {
-            if (Namespaces.XSLT_XQUERY_SERIALIZATION_NS.equals(option.getQName().getNamespaceURI())) {
-                SerializerUtils.setProperty(option.getQName().getLocalPart(), option.getContents(), properties,
-                        inScopeNamespaces::get);
+        if (dynamicOptions != null) {
+            for (final Option option : dynamicOptions) {
+                if (Namespaces.XSLT_XQUERY_SERIALIZATION_NS.equals(option.getQName().getNamespaceURI())) {
+                    SerializerUtils.setProperty(option.getQName().getLocalPart(), option.getContents(), properties,
+                            inScopeNamespaces::get);
+                }
             }
         }
 
-        for (final Option option : staticOptions) {
-            if (Namespaces.XSLT_XQUERY_SERIALIZATION_NS.equals(option.getQName().getNamespaceURI())
-                    && !properties.containsKey(option.getQName().getLocalPart())) {
-                SerializerUtils.setProperty(option.getQName().getLocalPart(), option.getContents(), properties,
-                        inScopeNamespaces::get);
+        if (staticOptions != null) {
+            for (final Option option : staticOptions) {
+                if (Namespaces.XSLT_XQUERY_SERIALIZATION_NS.equals(option.getQName().getNamespaceURI())
+                        && !properties.containsKey(option.getQName().getLocalPart())) {
+                    SerializerUtils.setProperty(option.getQName().getLocalPart(), option.getContents(), properties,
+                            inScopeNamespaces::get);
+                }
             }
         }
     }

From f0971d8d32789839becf36ed79033012006d51d9 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 20:15:10 +0200
Subject: [PATCH 09/22] [ignore] Nullable annotations in XQueryContext

---
 .../java/org/exist/xquery/XQueryContext.java  | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index e4d4e5b3812..f0be7f8073a 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -406,8 +406,7 @@ public class XQueryContext implements BinaryValueManager, Context {
      * is executing, or null if there is no
      * HTTP context.
      */
-    @Nullable
-    private HttpContext httpContext = null;
+    private @Nullable HttpContext httpContext = null;
     private static final QName UNNAMED_DECIMAL_FORMAT = new QName("__UNNAMED__", Function.BUILTIN_FUNCTION_NS);
 
     private final Map<QName, DecimalFormat> staticDecimalFormats = hashMap(Tuple(UNNAMED_DECIMAL_FORMAT, DecimalFormat.UNNAMED));
@@ -507,8 +506,7 @@ public XQueryContext(final XQueryContext copyFrom) {
      * @return the HTTP context, or null if the query
      * is not being executed within an HTTP context.
      */
-    public @Nullable
-    HttpContext getHttpContext() {
+    public @Nullable HttpContext getHttpContext() {
         return httpContext;
     }
 
@@ -1207,8 +1205,7 @@ public DocumentSet getStaticDocs() {
      * @return sequence of available documents matching the URI
      * @throws XPathException in case of dynamic error
      */
-    public @Nullable
-    Sequence getDynamicallyAvailableDocument(final String uri) throws XPathException {
+    public @Nullable Sequence getDynamicallyAvailableDocument(final String uri) throws XPathException {
         if (dynamicDocuments == null) {
             return null;
         }
@@ -1231,8 +1228,7 @@ Sequence getDynamicallyAvailableDocument(final String uri) throws XPathException
      * @return a reader to read the resource content from
      * @throws XPathException in case of a dynamic error
      */
-    public @Nullable
-    Reader getDynamicallyAvailableTextResource(final String uri, final Charset charset)
+    public @Nullable Reader getDynamicallyAvailableTextResource(final String uri, final Charset charset)
             throws XPathException {
         if (dynamicTextResources == null) {
             return null;
@@ -1255,8 +1251,7 @@ Reader getDynamicallyAvailableTextResource(final String uri, final Charset chars
      * @return a sequence of document nodes
      * @throws XPathException in case of dynamic error
      */
-    public @Nullable
-    Sequence getDynamicallyAvailableCollection(final String uri) throws XPathException {
+    public @Nullable Sequence getDynamicallyAvailableCollection(final String uri) throws XPathException {
         if (dynamicCollections == null) {
             return null;
         }
@@ -1594,8 +1589,7 @@ public void analyzeAndOptimizeIfModulesChanged(final Expression expr) throws XPa
     }
 
     @Override
-    @Nullable
-    public Module loadBuiltInModule(final String namespaceURI, final String moduleClass) {
+    public @Nullable Module loadBuiltInModule(final String namespaceURI, final String moduleClass) {
         Module[] modules = null;
         if (namespaceURI != null) {
             modules = getModules(namespaceURI);
@@ -1752,8 +1746,7 @@ public void declareFunction(final UserDefinedFunction function) throws XPathExce
     }
 
     @Override
-    @Nullable
-    public UserDefinedFunction resolveFunction(final QName name, final int argCount) {
+    public @Nullable UserDefinedFunction resolveFunction(final QName name, final int argCount) {
         final FunctionId id = new FunctionId(name, argCount);
         return declaredFunctions.get(id);
     }

From c86e88bce37e7a02a461da517d1a2ca314b0d83f Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 20:15:52 +0200
Subject: [PATCH 10/22] [ignore] typos in XQueryContext JavaDoc

---
 exist-core/src/main/java/org/exist/xquery/XQueryContext.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index f0be7f8073a..aa14570e746 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -1198,7 +1198,7 @@ public DocumentSet getStaticDocs() {
     }
 
     /**
-     * Get's a document from the "Available documents" of the
+     * Gets a document from the "Available documents" of the
      * dynamic context.
      *
      * @param uri the URI by which the document was registered
@@ -1220,7 +1220,7 @@ public DocumentSet getStaticDocs() {
     }
 
     /**
-     * Get's a text resource from the "Available text resources" of the
+     * Gets a text resource from the "Available text resources" of the
      * dynamic context.
      *
      * @param uri the URI by which the document was registered

From c0a03acb5bf83be26c637c01e730568823a43f12 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 20:18:33 +0200
Subject: [PATCH 11/22] [refactor] reinstate behaviour in XQueryContext

In a previous commit baseURI assignment changed for uri == null.
As we do not know yet if that is correct, the previous behaviour was reinstated.
Add a todo to not forget about it.
---
 exist-core/src/main/java/org/exist/xquery/XQueryContext.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index aa14570e746..281daabb898 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -2211,7 +2211,9 @@ public void setBaseURI(final AnyURIValue uri, final boolean setInProlog) {
             return;
         }
 
-        baseURI = (uri == null) ? AnyURIValue.EMPTY_URI : uri;
+        // TODO(JL): the previous code hinted that null _should_ be treated differently
+        // baseURI = (uri == null) ? AnyURIValue.EMPTY_URI : uri;
+        baseURI = uri;
         baseURISetInProlog = setInProlog;
     }
 

From d9aa095f1842c5f84df588842ec7b27269f9d1c7 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 20:22:12 +0200
Subject: [PATCH 12/22] [refactor] XQueryContext.SavedState

- remove unnecessary SuppressWarnings annotation
- return early
---
 .../java/org/exist/xquery/XQueryContext.java  | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 281daabb898..8bdef15f6ed 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -2826,37 +2826,40 @@ private class SavedState {
         private Map<String, String> staticNamespacesSaved = null;
         private Map<String, String> staticPrefixesSaved = null;
 
-        @SuppressWarnings("unchecked")
         void save() {
-            if (modulesSaved == null) {
-                modulesSaved = new Object2ObjectOpenHashMap<>(modules.size(), Hash.VERY_FAST_LOAD_FACTOR);
-                for (final Object2ObjectMap.Entry<String, Module[]> entry : Object2ObjectMaps.fastIterable(modules)) {
-                    final Module[] mods = entry.getValue();
-                    modulesSaved.put(entry.getKey(), Arrays.copyOf(mods, mods.length));
-                }
+            if (modulesSaved != null) {
+                return;
+            }
 
-                allModulesSaved = new Object2ObjectOpenHashMap<>(allModules.size());
-                for (final Object2ObjectMap.Entry<String, Module[]> entry : Object2ObjectMaps.fastIterable(allModules)) {
-                    final Module[] mods = entry.getValue();
-                    allModulesSaved.put(entry.getKey(), Arrays.copyOf(mods, mods.length));
-                }
+            modulesSaved = new Object2ObjectOpenHashMap<>(modules.size(), Hash.VERY_FAST_LOAD_FACTOR);
+            for (final Object2ObjectMap.Entry<String, Module[]> entry : Object2ObjectMaps.fastIterable(modules)) {
+                final Module[] mods = entry.getValue();
+                modulesSaved.put(entry.getKey(), Arrays.copyOf(mods, mods.length));
+            }
 
-                staticNamespacesSaved = new HashMap<>(staticNamespaces);
-                staticPrefixesSaved = new HashMap<>(staticPrefixes);
+            allModulesSaved = new Object2ObjectOpenHashMap<>(allModules.size());
+            for (final Object2ObjectMap.Entry<String, Module[]> entry : Object2ObjectMaps.fastIterable(allModules)) {
+                final Module[] mods = entry.getValue();
+                allModulesSaved.put(entry.getKey(), Arrays.copyOf(mods, mods.length));
             }
-        }
+
+            staticNamespacesSaved = new HashMap<>(staticNamespaces);
+            staticPrefixesSaved = new HashMap<>(staticPrefixes);
+    }
 
         void restore() {
-            if (modulesSaved != null) {
-                modules = modulesSaved;
-                modulesSaved = null;
-                allModules = allModulesSaved;
-                allModulesSaved = null;
-                staticNamespaces = staticNamespacesSaved;
-                staticNamespacesSaved = null;
-                staticPrefixes = staticPrefixesSaved;
-                staticPrefixesSaved = null;
+            if (modulesSaved == null) {
+                return;
             }
+
+            modules = modulesSaved;
+            modulesSaved = null;
+            allModules = allModulesSaved;
+            allModulesSaved = null;
+            staticNamespaces = staticNamespacesSaved;
+            staticNamespacesSaved = null;
+            staticPrefixes = staticPrefixesSaved;
+            staticPrefixesSaved = null;
         }
     }
 

From 688ede8f74f5fa37bd6a3fc66596fc9573ead104 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 20:22:45 +0200
Subject: [PATCH 13/22] [refactor] minor improvement in XQueryContext.addOption

---
 .../src/main/java/org/exist/xquery/XQueryContext.java    | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 8bdef15f6ed..7c5a7d537ae 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -2902,13 +2902,8 @@ private void addOption(final List<Option> options, final String name, final Stri
         }
 
         final Option option = new Option(rootExpression, qn, value);
-
-        // if the option exists, remove it so we can add the new option
-        final int pos = options.indexOf(option);
-        if (pos != -1) {
-            options.remove(pos);
-        }
-
+        // if the option exists, remove it first
+        options.remove(option);
         //add option
         options.add(option);
 

From c2c61ee276ba6ceebfcda5d630f87b908a3e0be3 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Tue, 28 Mar 2023 21:50:27 +0200
Subject: [PATCH 14/22] [refactor] XQueryContext.addToMapValueArray

less clever, easier to read code
---
 .../src/main/java/org/exist/xquery/XQueryContext.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 7c5a7d537ae..57fbb761430 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -1700,11 +1700,9 @@ private static BiFunction<String, Module[], Module[]> addToMapValueArray(final M
                 }
             }
 
-            // add the module to the modules
-            final int currentLength = modules.length;
-            final Module[] newModules = Arrays.copyOf(modules, currentLength + 1);
-            // previous length is new last index
-            newModules[currentLength] = module;
+            // add the module to the end of current array of modules
+            final Module[] newModules = Arrays.copyOf(modules, modules.length + 1);
+            newModules[newModules.length - 1] = module;
             return newModules;
         };
     }

From fb095dcb85e7b1b790d7e0b485ba6188a11cd80d Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Wed, 29 Mar 2023 15:14:11 +0200
Subject: [PATCH 15/22] [bugfix] use non-reifiable types again in XQueryContext

---
 .../java/org/exist/xquery/XQueryContext.java  | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 57fbb761430..681337b8763 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -1622,7 +1622,7 @@ Module initBuiltInModule(final String namespaceURI, final String moduleClass) {
             }
             // INOTE: expathrepo
             final Module module = instantiateModule(namespaceURI, (Class<Module>) mClass,
-                    (Map<String, Map<String, List<?>>>) getConfiguration().getProperty(PROPERTY_MODULE_PARAMETERS));
+                    (Map<String, Map<String, List<? extends Object>>>) getConfiguration().getProperty(PROPERTY_MODULE_PARAMETERS));
             if (LOG.isDebugEnabled()) {
                 LOG.debug("module {} loaded successfully.", module.getNamespaceURI());
             }
@@ -1634,7 +1634,7 @@ Module initBuiltInModule(final String namespaceURI, final String moduleClass) {
     }
 
     private @Nullable Module instantiateModule(final String namespaceURI, final Class<Module> mClazz,
-            final Map<String, Map<String, List<?>>> moduleParameters) {
+                                               final Map<String, Map<String, List<? extends Object>>> moduleParameters) {
         try {
             final Constructor<Module> constructor = XQueryContext.getModuleConstructor(mClazz);
 
@@ -3050,33 +3050,32 @@ void loadDefaults(@Nullable final Configuration config) {
 
         // Iterate on all map entries
         for (final Map.Entry<String, Class<Module>> entry : builtInModules.entrySet()) {
-            addDefaultBuiltInModule(config, entry);
+            addBuiltInModuleOrDeclareNamespace(config, entry);
         }
     }
 
     @SuppressWarnings("unchecked")
-    private void addDefaultBuiltInModule(final Configuration config, final Map.Entry<String, Class<Module>> entry) {
+    private void addBuiltInModuleOrDeclareNamespace(final Configuration config, final Map.Entry<String, Class<Module>> entry) {
         final String namespaceURI = entry.getKey();
         // first check if the module has already been loaded in the parent context
         final Module[] modules = getModules(namespaceURI);
-        if (modules == null) {
-            return;
-        }
 
         // we have to instantiate the module class
         final Class<Module> moduleClass = entry.getValue();
         Module foundModule = null;
-        for (final Module module : modules) {
-            if (moduleClass.equals(module.getClass())) {
-                foundModule = module;
-                break;
+        if (modules != null) {
+            for (final Module module : modules) {
+                if (moduleClass.equals(module.getClass())) {
+                    foundModule = module;
+                    break;
+                }
             }
         }
 
         if (foundModule == null) {
             // Module does not exist yet, instantiate
             instantiateModule(namespaceURI, moduleClass,
-                    (Map<String, Map<String, List<?>>>) config.getProperty(PROPERTY_MODULE_PARAMETERS));
+                    (Map<String, Map<String, List<? extends Object>>>) config.getProperty(PROPERTY_MODULE_PARAMETERS));
             return;
         }
 

From ac07d127ebde2276fe4a51183265136f73b7eb17 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Wed, 29 Mar 2023 15:16:57 +0200
Subject: [PATCH 16/22] [refactor] rename variables in XQueryContext for
 clarity

- in initBuiltInModule the second parameter of type string
  is renamed to moduleClassName
- in instantiateModule mClazz is renamed to moduleClass
---
 .../java/org/exist/xquery/XQueryContext.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 681337b8763..bc1a1a8fad3 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -1610,14 +1610,14 @@ public void analyzeAndOptimizeIfModulesChanged(final Expression expr) throws XPa
     }
 
     @SuppressWarnings("unchecked")
-    Module initBuiltInModule(final String namespaceURI, final String moduleClass) {
+    Module initBuiltInModule(final String namespaceURI, final String moduleClassName) {
         try {
             // lookup the class
             final ClassLoader existClassLoader = getBroker().getBrokerPool().getClassLoader();
-            final Class<?> mClass = Class.forName(moduleClass, false, existClassLoader);
+            final Class<?> mClass = Class.forName(moduleClassName, false, existClassLoader);
 
             if (!(Module.class.isAssignableFrom(mClass))) {
-                LOG.info("failed to load module. {} is not an instance of org.exist.xquery.Module.", moduleClass);
+                LOG.info("failed to load module. {} is not an instance of org.exist.xquery.Module.", moduleClassName);
                 return null;
             }
             // INOTE: expathrepo
@@ -1628,18 +1628,18 @@ Module initBuiltInModule(final String namespaceURI, final String moduleClass) {
             }
             return module;
         } catch (final ClassNotFoundException e) {
-            LOG.warn("module class {} not found. Skipping...", moduleClass);
+            LOG.warn("module class {} not found. Skipping...", moduleClassName);
             return null;
         }
     }
 
-    private @Nullable Module instantiateModule(final String namespaceURI, final Class<Module> mClazz,
+    private @Nullable Module instantiateModule(final String namespaceURI, final Class<Module> moduleClass,
                                                final Map<String, Map<String, List<? extends Object>>> moduleParameters) {
         try {
-            final Constructor<Module> constructor = XQueryContext.getModuleConstructor(mClazz);
+            final Constructor<Module> constructor = XQueryContext.getModuleConstructor(moduleClass);
 
             if (constructor == null) {
-                LOG.warn("Module {} has no matching public constructor!", mClazz.getName());
+                LOG.warn("Module {} has no matching public constructor!", moduleClass.getName());
                 return null;
             }
 
@@ -1668,7 +1668,7 @@ Module initBuiltInModule(final String namespaceURI, final String moduleClass) {
             }
             return module;
         } catch (final InstantiationException | IllegalAccessException | InvocationTargetException | XPathException e) {
-            LOG.warn("error while instantiating module class {}", mClazz.getName(), e);
+            LOG.warn("error while instantiating module class {}", moduleClass.getName(), e);
             return null;
         }
     }

From c49646e661af10e6f1a074343bfceb9b265bc6c1 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Wed, 29 Mar 2023 15:30:41 +0200
Subject: [PATCH 17/22] [ignore] minor changes to XQueryContext

- remove throws for exceptions never thrown
- fix formatting
---
 .../java/org/exist/xquery/XQueryContext.java  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index bc1a1a8fad3..359bfa6f6f9 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -516,7 +516,7 @@ public XQueryContext(final XQueryContext copyFrom) {
      * @param httpContext the HTTP context within which the XQuery
      *                    is being executed.
      */
-    public void setHttpContext(final HttpContext httpContext) {
+    public void setHttpContext(@Nullable final HttpContext httpContext) {
         this.httpContext = httpContext;
     }
 
@@ -538,7 +538,7 @@ public void setTestRepository(final Optional<ExistRepository> testRepository) {
     public Optional<ExistRepository> getRepository() {
         return or(
                 testRepository,
-            () -> Optional.ofNullable(getBroker()).map(DBBroker::getBrokerPool).flatMap(BrokerPool::getExpathRepo)
+                () -> Optional.ofNullable(getBroker()).map(DBBroker::getBrokerPool).flatMap(BrokerPool::getExpathRepo)
         );
     }
 
@@ -984,14 +984,17 @@ public String getDefaultFunctionNamespace() {
     @Override
     public void setDefaultFunctionNamespace(final String uri) throws XPathException {
         //Not sure for the 2nd clause : eXist-db forces the function NS as default.
-        if ((defaultFunctionNamespace != null) && !defaultFunctionNamespace.equals(Function.BUILTIN_FUNCTION_NS) && !defaultFunctionNamespace.equals(uri)) {
-            throw new XPathException(rootExpression, ErrorCodes.XQST0066, "Default function namespace is already set to: '" + defaultFunctionNamespace + "'");
+        if (defaultFunctionNamespace != null
+                && !defaultFunctionNamespace.equals(Function.BUILTIN_FUNCTION_NS)
+                && !defaultFunctionNamespace.equals(uri)) {
+            throw new XPathException(rootExpression, ErrorCodes.XQST0066,
+                    "Default function namespace is already set to: '" + defaultFunctionNamespace + "'");
         }
         defaultFunctionNamespace = uri;
     }
 
     @Override
-    public String getDefaultElementNamespaceSchema() throws XPathException {
+    public String getDefaultElementNamespaceSchema() {
         return defaultElementNamespaceSchema.getStringValue();
     }
 
@@ -1005,7 +1008,7 @@ public void setDefaultElementNamespaceSchema(final String uri) throws XPathExcep
     }
 
     @Override
-    public String getDefaultElementNamespace() throws XPathException {
+    public String getDefaultElementNamespace() {
         return defaultElementNamespace.getStringValue();
     }
 
@@ -1076,7 +1079,7 @@ public void setStaticallyKnownDocuments(final DocumentSet set) {
     }
 
     public void addDynamicallyAvailableDocument(final String uri,
-            final TriFunctionE<DBBroker, Txn, String, Either<org.exist.dom.memtree.DocumentImpl, DocumentImpl>, XPathException> supplier) {
+                                                final TriFunctionE<DBBroker, Txn, String, Either<org.exist.dom.memtree.DocumentImpl, DocumentImpl>, XPathException> supplier) {
         if (dynamicDocuments == null) {
             dynamicDocuments = new HashMap<>();
         }
@@ -1870,7 +1873,7 @@ public Variable resolveVariable(final String name) throws XPathException {
     public Variable resolveVariable(final QName qname) throws XPathException {
         return resolveVariable(null, qname);
     }
-    
+
     @Override
     public Variable resolveVariable(@Nullable final AnalyzeContextInfo contextInfo, final QName qname) throws XPathException {
         // check if the variable is declared local
@@ -2625,7 +2628,7 @@ private ExternalModule compileOrBorrowModule(final String prefix, final String n
      * @throws XPathException if the module could not be loaded (XQST0059) or compiled (XPST0003)
      */
     private @Nullable ExternalModule compileModule(final String prefix, String namespaceURI, final String location,
-            final Source source) throws XPathException {
+                                                   final Source source) throws XPathException {
         if (LOG.isDebugEnabled()) {
             LOG.debug("Loading module from {}", location);
         }
@@ -2843,7 +2846,7 @@ void save() {
 
             staticNamespacesSaved = new HashMap<>(staticNamespaces);
             staticPrefixesSaved = new HashMap<>(staticPrefixes);
-    }
+        }
 
         void restore() {
             if (modulesSaved == null) {

From abec20ad8ddf377aa371d5fae6334c4c3d5a0f3e Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Wed, 29 Mar 2023 15:47:09 +0200
Subject: [PATCH 18/22] [refactor] XQueryContext.declareFunction

Namespaces

- add new Set PROTECTED_NS containing all namespaces
  that cannot be extended

XQueryContext.declareFunction

- check for empty Namespace first
- use new Set Namespaces.PROTECTED_NS to check for namespace
  that is protected from extension
---
 .../src/main/java/org/exist/Namespaces.java   |  4 +++
 .../java/org/exist/xquery/XQueryContext.java  | 28 ++++++++-----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/Namespaces.java b/exist-core/src/main/java/org/exist/Namespaces.java
index 49ff3d105db..593ab890857 100644
--- a/exist-core/src/main/java/org/exist/Namespaces.java
+++ b/exist-core/src/main/java/org/exist/Namespaces.java
@@ -24,6 +24,7 @@
 import org.exist.dom.QName;
 
 import javax.xml.XMLConstants;
+import java.util.Set;
 
 /**
  * Global namespace declarations.
@@ -92,4 +93,7 @@ public interface Namespaces {
     String XHTML_NS = "http://www.w3.org/1999/xhtml";
 
 	String XINCLUDE_NS = "http://www.w3.org/2001/XInclude";
+
+	Set<String> PROTECTED_NS = Set.of(
+			XML_NS, SCHEMA_NS, SCHEMA_INSTANCE_NS, XPATH_FUNCTIONS_NS);
 }
diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 359bfa6f6f9..57518869287 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -1716,31 +1716,25 @@ public void declareFunction(final UserDefinedFunction function) throws XPathExce
         // exception will currently break util:eval.
 
         final QName name = function.getSignature().getName();
+        final String uri = name.getNamespaceURI();
 
-        if (XML_NS.equals(name.getNamespaceURI())) {
-            throw new XPathException(function, ErrorCodes.XQST0045, "Function '" + name + "' is in the forbidden namespace '" + XML_NS + "'");
+        if (uri.isEmpty()) {
+            throw new XPathException(function, ErrorCodes.XQST0060,
+                    "Every declared function name must have a non-null namespace URI, " +
+                            "but function '" + name + "' does not meet this requirement.");
         }
 
-        if (Namespaces.SCHEMA_NS.equals(name.getNamespaceURI())) {
-            throw new XPathException(function, ErrorCodes.XQST0045, "Function '" + name + "' is in the forbidden namespace '" + Namespaces.SCHEMA_NS + "'");
-        }
-
-        if (Namespaces.SCHEMA_INSTANCE_NS.equals(name.getNamespaceURI())) {
-            throw new XPathException(function, ErrorCodes.XQST0045, "Function '" + name + "' is in the forbidden namespace '" + Namespaces.SCHEMA_INSTANCE_NS + "'");
-        }
-
-        if (Namespaces.XPATH_FUNCTIONS_NS.equals(name.getNamespaceURI())) {
-            throw new XPathException(function, ErrorCodes.XQST0045, "Function '" + name + "' is in the forbidden namespace '" + Namespaces.XPATH_FUNCTIONS_NS + "'");
-        }
-
-        if (name.getNamespaceURI().isEmpty()) {
-            throw new XPathException(function, ErrorCodes.XQST0060, "Every declared function name must have a non-null namespace URI, but function '" + name + "' does not meet this requirement.");
+        if (Namespaces.PROTECTED_NS.contains(uri)) {
+            throw new XPathException(function, ErrorCodes.XQST0045,
+                    "Function '" + name + "' is in the forbidden namespace '" + uri + "'");
         }
 
         final FunctionSignature signature = function.getSignature();
         final FunctionId functionKey = signature.getFunctionId();
         if (declaredFunctions.containsKey(functionKey)) {
-            throw new XPathException(function, ErrorCodes.XQST0034, "Function " +  signature.getName().toURIQualifiedName() + '#' + signature.getArgumentCount() + " is already defined.");
+            throw new XPathException(function, ErrorCodes.XQST0034,
+                    "Function " +  signature.getName().toURIQualifiedName() + '#' + signature.getArgumentCount()
+                            + " is already defined.");
         }
 
         declaredFunctions.put(functionKey, function);

From 210b53792c5183767955b1e54e7d11408cff5df2 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Wed, 29 Mar 2023 15:48:01 +0200
Subject: [PATCH 19/22] [refactor] remove unused Context.addLockedDocument

---
 exist-core/src/main/java/org/exist/interpreter/Context.java  | 2 --
 exist-core/src/main/java/org/exist/xquery/XQueryContext.java | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/interpreter/Context.java b/exist-core/src/main/java/org/exist/interpreter/Context.java
index 4cc72d3b7b4..e07ff231740 100644
--- a/exist-core/src/main/java/org/exist/interpreter/Context.java
+++ b/exist-core/src/main/java/org/exist/interpreter/Context.java
@@ -308,8 +308,6 @@ public interface Context {
      */
     boolean lockDocumentsOnLoad();
 
-    void addLockedDocument(DocumentImpl doc);
-
     void setShared(boolean shared);
 
     boolean isShared();
diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index 57518869287..ad02d08d23e 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -1302,10 +1302,6 @@ public boolean lockDocumentsOnLoad() {
         return false;
     }
 
-    @Override
-    public void addLockedDocument(final DocumentImpl doc) {
-    }
-
     @Override
     public void setShared(final boolean shared) {
         isShared = shared;

From dc02c3be19ed09933cd3a3bf641b00c689b8a65a Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Wed, 29 Mar 2023 18:56:18 +0200
Subject: [PATCH 20/22] [refactor] rename Pragma static fields

---
 .../src/main/java/org/exist/xquery/XQueryContext.java  | 10 +++++-----
 .../java/org/exist/xquery/pragmas/ForceIndexUse.java   |  4 ++--
 .../java/org/exist/xquery/pragmas/NoIndexPragma.java   |  4 ++--
 .../main/java/org/exist/xquery/pragmas/Optimize.java   |  4 ++--
 .../java/org/exist/xquery/pragmas/ProfilePragma.java   |  4 ++--
 .../java/org/exist/xquery/pragmas/TimerPragma.java     |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
index ad02d08d23e..84801c45d19 100644
--- a/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
+++ b/exist-core/src/main/java/org/exist/xquery/XQueryContext.java
@@ -2974,11 +2974,11 @@ public Pragma getPragma(final String name, final String contents) throws XPathEx
         final String sanitizedContents = StringValue.trimWhitespace(contents);
 
         return switch(qname.getLocalPart()) {
-            case Optimize.LOCAL_NAME -> new Optimize(rootExpression, this, qname, sanitizedContents, true);
-            case TimerPragma.LOCAL_NAME -> new TimerPragma(rootExpression, qname, sanitizedContents);
-            case ProfilePragma.LOCAL_NAME -> new ProfilePragma(rootExpression, qname, sanitizedContents);
-            case ForceIndexUse.LOCAL_NAME -> new ForceIndexUse(rootExpression, qname, sanitizedContents);
-            case NoIndexPragma.LOCAL_NAME -> new NoIndexPragma(rootExpression, qname, sanitizedContents);
+            case Optimize.OPTIMIZE_PRAGMA_LOCAL_NAME -> new Optimize(rootExpression, this, qname, sanitizedContents, true);
+            case TimerPragma.TIMER_PRAGMA_LOCAL_NAME -> new TimerPragma(rootExpression, qname, sanitizedContents);
+            case ProfilePragma.PROFILING_PRAGMA_LOCAL_NAME -> new ProfilePragma(rootExpression, qname, sanitizedContents);
+            case ForceIndexUse.FORCE_INDEX_USE_PRAGMA_LOCAL_NAME -> new ForceIndexUse(rootExpression, qname, sanitizedContents);
+            case NoIndexPragma.NO_INDEX_PRAGMA_LOCAL_NAME -> new NoIndexPragma(rootExpression, qname, sanitizedContents);
             default -> null;
         };
     }
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/ForceIndexUse.java b/exist-core/src/main/java/org/exist/xquery/pragmas/ForceIndexUse.java
index 07c5fe65aab..5cba1b661d7 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/ForceIndexUse.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/ForceIndexUse.java
@@ -27,8 +27,8 @@
 import org.exist.xquery.value.Sequence;
 
 public class ForceIndexUse extends Pragma {
-    public static final String LOCAL_NAME = "force-index-use";
-    public static final QName EXCEPTION_IF_INDEX_NOT_USED_PRAGMA =  new QName(LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+    public static final String FORCE_INDEX_USE_PRAGMA_LOCAL_NAME = "force-index-use";
+    public static final QName EXCEPTION_IF_INDEX_NOT_USED_PRAGMA =  new QName(FORCE_INDEX_USE_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
 
 	Expression expression;
 	boolean bailout = true;
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/NoIndexPragma.java b/exist-core/src/main/java/org/exist/xquery/pragmas/NoIndexPragma.java
index 607f3355bb6..13861111aed 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/NoIndexPragma.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/NoIndexPragma.java
@@ -30,8 +30,8 @@
 import org.exist.xquery.value.Sequence;
 
 public class NoIndexPragma extends Pragma {
-    public final static String LOCAL_NAME = "no-index";
-    public final static QName NO_INDEX_PRAGMA = new QName(LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+    public final static String NO_INDEX_PRAGMA_LOCAL_NAME = "no-index";
+    public final static QName NO_INDEX_PRAGMA = new QName(NO_INDEX_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
 
     private final static Logger LOG = LogManager.getLogger(NoIndexPragma.class);
 
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/Optimize.java b/exist-core/src/main/java/org/exist/xquery/pragmas/Optimize.java
index 591a999f520..bb9bef71d5b 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/Optimize.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/Optimize.java
@@ -42,8 +42,8 @@
 import static java.lang.System.arraycopy;
 
 public class Optimize extends Pragma {
-    public final static String LOCAL_NAME = "optimize";
-    public final static QName OPTIMIZE_PRAGMA = new QName(LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+    public final static String OPTIMIZE_PRAGMA_LOCAL_NAME = "optimize";
+    public final static QName OPTIMIZE_PRAGMA = new QName(OPTIMIZE_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
 
     private final static Logger LOG = LogManager.getLogger(Optimize.class);
 
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/ProfilePragma.java b/exist-core/src/main/java/org/exist/xquery/pragmas/ProfilePragma.java
index 5db1c1851d6..f3f4fa0f671 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/ProfilePragma.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/ProfilePragma.java
@@ -27,8 +27,8 @@
 import org.exist.xquery.value.Sequence;
 
 public class ProfilePragma extends Pragma {
-    public final static String LOCAL_NAME = "profiling";
-    public final static QName PROFILING_PRAGMA = new QName(LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+    public final static String PROFILING_PRAGMA_LOCAL_NAME = "profiling";
+    public final static QName PROFILING_PRAGMA = new QName(PROFILING_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
     
     public ProfilePragma(QName qname, String contents) throws XPathException {
         this(null, qname, contents);
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/TimerPragma.java b/exist-core/src/main/java/org/exist/xquery/pragmas/TimerPragma.java
index dea95edab0c..2a81cb3e6df 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/TimerPragma.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/TimerPragma.java
@@ -30,8 +30,8 @@
 import org.exist.xquery.value.Sequence;
 
 public class TimerPragma extends Pragma {
-    public final static String LOCAL_NAME = "timer";
-    public final static QName TIMER_PRAGMA = new QName(LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+    public final static String TIMER_PRAGMA_LOCAL_NAME = "timer";
+    public final static QName TIMER_PRAGMA = new QName(TIMER_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
     
     private Logger log = null;
     

From 55ce29d93d0d7fe68c0536edec9b8a571b76b257 Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Wed, 29 Mar 2023 21:09:42 +0200
Subject: [PATCH 21/22] [refactor] Declare Optimizer.context and rewriters
 final

---
 exist-core/src/main/java/org/exist/xquery/Optimizer.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/Optimizer.java b/exist-core/src/main/java/org/exist/xquery/Optimizer.java
index b26412d2e3f..e6cc8aab698 100644
--- a/exist-core/src/main/java/org/exist/xquery/Optimizer.java
+++ b/exist-core/src/main/java/org/exist/xquery/Optimizer.java
@@ -58,14 +58,13 @@ public class Optimizer extends DefaultExpressionVisitor {
 
     private static final Logger LOG = LogManager.getLogger(Optimizer.class);
 
-    private XQueryContext context;
+    private final XQueryContext context;
+    private final List<QueryRewriter> rewriters;
 
     private int predicates = 0;
 
     private boolean hasOptimized = false;
 
-    private List<QueryRewriter> rewriters;
-
     public Optimizer(XQueryContext context) {
         this.context = context;
         final DBBroker broker = context.getBroker();

From d22ea07d697190af1eb6f344eb912a3564f9769f Mon Sep 17 00:00:00 2001
From: Juri Leino <github@line-o.de>
Date: Thu, 30 Mar 2023 12:31:22 +0200
Subject: [PATCH 22/22] [refactor] field modifier order in pragmas

---
 .../main/java/org/exist/xquery/pragmas/NoIndexPragma.java   | 6 +++---
 .../src/main/java/org/exist/xquery/pragmas/Optimize.java    | 6 +++---
 .../main/java/org/exist/xquery/pragmas/ProfilePragma.java   | 4 ++--
 .../src/main/java/org/exist/xquery/pragmas/TimerPragma.java | 6 +++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/NoIndexPragma.java b/exist-core/src/main/java/org/exist/xquery/pragmas/NoIndexPragma.java
index 13861111aed..7b7ed24081d 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/NoIndexPragma.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/NoIndexPragma.java
@@ -30,10 +30,10 @@
 import org.exist.xquery.value.Sequence;
 
 public class NoIndexPragma extends Pragma {
-    public final static String NO_INDEX_PRAGMA_LOCAL_NAME = "no-index";
-    public final static QName NO_INDEX_PRAGMA = new QName(NO_INDEX_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+    public static final String NO_INDEX_PRAGMA_LOCAL_NAME = "no-index";
+    public static final QName NO_INDEX_PRAGMA = new QName(NO_INDEX_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
 
-    private final static Logger LOG = LogManager.getLogger(NoIndexPragma.class);
+    private static final Logger LOG = LogManager.getLogger(NoIndexPragma.class);
 
     public NoIndexPragma(QName qname, String contents) throws XPathException {
         this(null, qname, contents);
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/Optimize.java b/exist-core/src/main/java/org/exist/xquery/pragmas/Optimize.java
index bb9bef71d5b..b18657bfeb0 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/Optimize.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/Optimize.java
@@ -42,10 +42,10 @@
 import static java.lang.System.arraycopy;
 
 public class Optimize extends Pragma {
-    public final static String OPTIMIZE_PRAGMA_LOCAL_NAME = "optimize";
-    public final static QName OPTIMIZE_PRAGMA = new QName(OPTIMIZE_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+    public static final String OPTIMIZE_PRAGMA_LOCAL_NAME = "optimize";
+    public static final QName OPTIMIZE_PRAGMA = new QName(OPTIMIZE_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
 
-    private final static Logger LOG = LogManager.getLogger(Optimize.class);
+    private static final Logger LOG = LogManager.getLogger(Optimize.class);
 
     private boolean enabled = true;
     private XQueryContext context;
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/ProfilePragma.java b/exist-core/src/main/java/org/exist/xquery/pragmas/ProfilePragma.java
index f3f4fa0f671..e70dbba8717 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/ProfilePragma.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/ProfilePragma.java
@@ -27,8 +27,8 @@
 import org.exist.xquery.value.Sequence;
 
 public class ProfilePragma extends Pragma {
-    public final static String PROFILING_PRAGMA_LOCAL_NAME = "profiling";
-    public final static QName PROFILING_PRAGMA = new QName(PROFILING_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+    public static final String PROFILING_PRAGMA_LOCAL_NAME = "profiling";
+    public static final QName PROFILING_PRAGMA = new QName(PROFILING_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
     
     public ProfilePragma(QName qname, String contents) throws XPathException {
         this(null, qname, contents);
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/TimerPragma.java b/exist-core/src/main/java/org/exist/xquery/pragmas/TimerPragma.java
index 2a81cb3e6df..5488997371a 100644
--- a/exist-core/src/main/java/org/exist/xquery/pragmas/TimerPragma.java
+++ b/exist-core/src/main/java/org/exist/xquery/pragmas/TimerPragma.java
@@ -30,9 +30,9 @@
 import org.exist.xquery.value.Sequence;
 
 public class TimerPragma extends Pragma {
-    public final static String TIMER_PRAGMA_LOCAL_NAME = "timer";
-    public final static QName TIMER_PRAGMA = new QName(TIMER_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
-    
+    public static final String TIMER_PRAGMA_LOCAL_NAME = "timer";
+    public static final QName TIMER_PRAGMA = new QName(TIMER_PRAGMA_LOCAL_NAME, Namespaces.EXIST_NS, "exist");
+
     private Logger log = null;
     
     private long start;