Merge pull request #4838 from line-o/cleanup/xquerycontext

Further cleanup XQueryContext
eXist-db · Jul 17, 2023 · 7edfaa5 · 7edfaa5
2 parents 42fb1d6 + d22ea07
commit 7edfaa5
Show file tree

Hide file tree

Showing 10 changed files with 296 additions and 275 deletions.
diff --git 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/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/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/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();