[MIN] Cleanups

ChristianGruen · ChristianGruen · commit 2b8ce6d3961f · 2025-12-12T14:02:33.000+01:00
diff --git a/basex-core/src/main/java/org/basex/index/IndexNames.java b/basex-core/src/main/java/org/basex/index/IndexNames.java
@@ -52,7 +52,7 @@ public IndexNames(final IndexType type, final Data data) {
         Util.debugln("Included name is invalid: %", entry);
         continue;
       }
-      qnames.add(name == null ? null : name, uri == null ? null : uri);
+      qnames.add(name, uri);
     }
   }
 
diff --git a/basex-core/src/main/java/org/basex/query/expr/CachedFilter.java b/basex-core/src/main/java/org/basex/query/expr/CachedFilter.java
@@ -51,6 +51,6 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   public Filter copy(final CompileContext cc, final IntObjectMap<Var> vm) {
-    return copyType(new CachedFilter(info, root.copy(cc, vm), Arr.copyAll(cc, vm, exprs)));
+    return copyType(new CachedFilter(info, root.copy(cc, vm), copyAll(cc, vm, exprs)));
   }
 }
diff --git a/basex-core/src/main/java/org/basex/query/expr/CachedMap.java b/basex-core/src/main/java/org/basex/query/expr/CachedMap.java
@@ -53,6 +53,6 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   public SimpleMap copy(final CompileContext cc, final IntObjectMap<Var> vm) {
-    return copyType(new CachedMap(info, Arr.copyAll(cc, vm, exprs)));
+    return copyType(new CachedMap(info, copyAll(cc, vm, exprs)));
   }
 }
diff --git a/basex-core/src/main/java/org/basex/query/expr/CmpG.java b/basex-core/src/main/java/org/basex/query/expr/CmpG.java
@@ -37,19 +37,19 @@ public enum OpG {
     /** General comparison: less or equal. */
     LE("<=") {
       @Override
-      public OpG swap() { return OpG.GE; }
+      public OpG swap() { return GE; }
       @Override
-      public OpG invert() { return OpG.GT; }
+      public OpG invert() { return GT; }
       @Override
       public OpV value() { return OpV.LE; }
     },
 
     /** General comparison: less. */
     LT("<") {
       @Override
-      public OpG swap() { return OpG.GT; }
+      public OpG swap() { return GT; }
       @Override
-      public OpG invert() { return OpG.GE; }
+      public OpG invert() { return GE; }
       @Override
       public OpV value() { return OpV.LT; }
     },
@@ -77,17 +77,17 @@ public enum OpG {
     /** General comparison: equal. */
     EQ("=") {
       @Override
-      public OpG swap() { return OpG.EQ; }
+      public OpG swap() { return EQ; }
       @Override
-      public OpG invert() { return OpG.NE; }
+      public OpG invert() { return NE; }
       @Override
       public OpV value() { return OpV.EQ; }
     },
 
     /** General comparison: not equal. */
     NE("!=") {
       @Override
-      public OpG swap() { return OpG.NE; }
+      public OpG swap() { return NE; }
       @Override
       public OpG invert() { return EQ; }
       @Override
diff --git a/basex-core/src/main/java/org/basex/query/expr/DualIterMap.java b/basex-core/src/main/java/org/basex/query/expr/DualIterMap.java
@@ -80,7 +80,7 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   public DualIterMap copy(final CompileContext cc, final IntObjectMap<Var> vm) {
-    return copyType(new DualIterMap(info, Arr.copyAll(cc, vm, exprs)));
+    return copyType(new DualIterMap(info, copyAll(cc, vm, exprs)));
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/expr/DualMap.java b/basex-core/src/main/java/org/basex/query/expr/DualMap.java
@@ -92,7 +92,7 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   public DualMap copy(final CompileContext cc, final IntObjectMap<Var> vm) {
-    return copyType(new DualMap(info, Arr.copyAll(cc, vm, exprs)));
+    return copyType(new DualMap(info, copyAll(cc, vm, exprs)));
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/expr/Filter.java b/basex-core/src/main/java/org/basex/query/expr/Filter.java
@@ -95,7 +95,7 @@ public final Expr optimize(final CompileContext cc) throws QueryException {
         final ExprList results = new ExprList(unroll.size());
         for(final Expr ex : unroll) {
           results.add(get(cc, info, ex, results.size() == last ? exprs :
-            Arr.copyAll(cc, new IntObjectMap<>(), exprs)));
+            copyAll(cc, new IntObjectMap<>(), exprs)));
         }
         return List.get(cc, info, results.finish());
       }
diff --git a/basex-core/src/main/java/org/basex/query/expr/IterFilter.java b/basex-core/src/main/java/org/basex/query/expr/IterFilter.java
@@ -55,6 +55,6 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   public IterFilter copy(final CompileContext cc, final IntObjectMap<Var> vm) {
-    return copyType(new IterFilter(info, root.copy(cc, vm), Arr.copyAll(cc, vm, exprs)));
+    return copyType(new IterFilter(info, root.copy(cc, vm), copyAll(cc, vm, exprs)));
   }
 }
diff --git a/basex-core/src/main/java/org/basex/query/expr/IterMap.java b/basex-core/src/main/java/org/basex/query/expr/IterMap.java
@@ -117,7 +117,7 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   public IterMap copy(final CompileContext cc, final IntObjectMap<Var> vm) {
-    return copyType(new IterMap(info, Arr.copyAll(cc, vm, exprs)));
+    return copyType(new IterMap(info, copyAll(cc, vm, exprs)));
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/expr/ParseExpr.java b/basex-core/src/main/java/org/basex/query/expr/ParseExpr.java
@@ -550,7 +550,7 @@ protected final ANode toNode(final Item item) throws QueryException {
    */
   protected final Item toAtomItem(final Expr expr, final QueryContext qc) throws QueryException {
     final Item item = expr.atomItem(qc, info);
-    if(item.isEmpty()) throw typeError(item, AtomType.ITEM, info);
+    if(item.isEmpty()) throw typeError(item, ITEM, info);
     return item;
   }
 
diff --git a/basex-core/src/main/java/org/basex/query/expr/Pipeline.java b/basex-core/src/main/java/org/basex/query/expr/Pipeline.java
@@ -114,7 +114,7 @@ Expr merge(final Expr expr, final Expr next, final CompileContext cc) {
 
   @Override
   public Pipeline copy(final CompileContext cc, final IntObjectMap<Var> vm) {
-    return copyType(new Pipeline(info, Arr.copyAll(cc, vm, exprs)));
+    return copyType(new Pipeline(info, copyAll(cc, vm, exprs)));
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/expr/SimplePos.java b/basex-core/src/main/java/org/basex/query/expr/SimplePos.java
@@ -125,7 +125,7 @@ public Expr mergeEbv(final Expr ex, final boolean or, final CompileContext cc)
       // create intersection: pos: 1, 8 and pos: 6, INF → pos: 6, 8
       final Expr min = expr1 == Itr.ONE ? pexpr1 : pexpr1 == Itr.ONE ? expr1 : null;
       final Expr max = expr2 == Itr.MAX ? pexpr2 : pexpr2 == Itr.MAX ? expr2 : null;
-      if(min != null && max != null) return SimplePos.get(min, max, info).optimize(cc);
+      if(min != null && max != null) return get(min, max, info).optimize(cc);
       // create intersection: pos: 5 and pos: 5, 10 → pos: 5
       // create intersection: pos: 4, 6 and pos: 6 → pos: 6
       if(exact() && (expr1.equals(pexpr1) || expr1.equals(pexpr2))) return this;
diff --git a/basex-core/src/main/java/org/basex/query/expr/ft/FTOrder.java b/basex-core/src/main/java/org/basex/query/expr/ft/FTOrder.java
@@ -51,7 +51,7 @@ public FTExpr copy(final CompileContext cc, final IntObjectMap<Var> vm) {
 
   @Override
   public void toXml(final QueryPlan plan) {
-    plan.add(plan.create(this, QueryText.ORDERED, TRUE), exprs);
+    plan.add(plan.create(this, ORDERED, TRUE), exprs);
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/func/Records.java b/basex-core/src/main/java/org/basex/query/func/Records.java
@@ -62,7 +62,7 @@ public enum Records {
   public static final QNmMap<RecordType> BUILT_IN = new QNmMap<>();
 
   static {
-    for(final Records record : Records.values()) {
+    for(final Records record : values()) {
       BUILT_IN.put(record.get().name(), record.get());
     }
 
@@ -101,15 +101,14 @@ public RecordType get() {
    * @param name name
    * @param field record field
    */
-  private record NamedRecordField(byte[] name, RecordField field) { };
+  private record NamedRecordField(byte[] name, RecordField field) { }
 
   /**
    * Constructor.
    * @param name name of record
    * @param extensible extensible flag
    * @param fields field declarations
    */
-  @SafeVarargs
   Records(final String name, final boolean extensible, final NamedRecordField... fields) {
     final TokenObjectMap<RecordField> map = new TokenObjectMap<>(fields.length);
     for(final NamedRecordField field : fields) {
diff --git a/basex-core/src/main/java/org/basex/query/func/StaticFuncCall.java b/basex-core/src/main/java/org/basex/query/func/StaticFuncCall.java
@@ -127,7 +127,7 @@ public Value value(final QueryContext qc) throws QueryException {
 
   @Override
   public StaticFuncCall copy(final CompileContext cc, final IntObjectMap<Var> vm) {
-    return copyType(new StaticFuncCall(name, Arr.copyAll(cc, vm, exprs), func, info, hasImport));
+    return copyType(new StaticFuncCall(name, copyAll(cc, vm, exprs), func, info, hasImport));
   }
 
   /**
diff --git a/basex-core/src/main/java/org/basex/query/func/bin/BinOctal.java b/basex-core/src/main/java/org/basex/query/func/bin/BinOctal.java
@@ -34,7 +34,7 @@ public Item item(final QueryContext qc, final InputInfo ii) throws QueryExceptio
     final int tl = string.length;
     if(tl == 0) return B64.EMPTY;
 
-    final TokenBuilder tb = new TokenBuilder(tl * 3);
+    final TokenBuilder tb = new TokenBuilder(tl * 3L);
     for(final byte b : string) {
       final String bits = MAP.get(b);
       if(bits != null) tb.add(bits);
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnChar.java b/basex-core/src/main/java/org/basex/query/func/fn/FnChar.java
@@ -36,7 +36,7 @@ public Str item(final QueryContext qc, final InputInfo ii) throws QueryException
         // HTML character reference name
         final byte[] result = XMLToken.getEntity(token);
         if(result != null) return Str.get(result);
-        throw CHARINV_X.get(info, QueryError.similar(token, XMLToken.similarEntity(token)));
+        throw CHARINV_X.get(info, similar(token, XMLToken.similarEntity(token)));
       }
     }
     throw CHARINV_X.get(info, value);
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnDistinctValues.java b/basex-core/src/main/java/org/basex/query/func/fn/FnDistinctValues.java
@@ -10,7 +10,6 @@
 import org.basex.query.expr.*;
 import org.basex.query.expr.CmpV.*;
 import org.basex.query.expr.path.*;
-import org.basex.query.func.*;
 import org.basex.query.iter.*;
 import org.basex.query.util.collation.*;
 import org.basex.query.util.hash.*;
@@ -120,7 +119,7 @@ protected Expr opt(final CompileContext cc) throws QueryException {
         // distinct-values($string) → $string
         // distinct-values($node) → data($node)
         if(st.zeroOrOne() && !st.mayBeArray())
-          return type == st.type ? values : cc.function(Function.DATA, info, exprs);
+          return type == st.type ? values : cc.function(DATA, info, exprs);
       }
       // assign atomic type of argument
       exprType.assign(type);
@@ -139,8 +138,8 @@ public Expr duplicates(final OpV op, final CompileContext cc) throws QueryExcept
     if(op == OpV.LT) return Bln.FALSE;
     if(op == OpV.GE) return Bln.TRUE;
 
-    final Expr dupl = cc.function(Function.DUPLICATE_VALUES, info, exprs);
-    return cc.function(op == OpV.LE || op == OpV.EQ ? Function.EMPTY : Function.EXISTS, info, dupl);
+    final Expr dupl = cc.function(DUPLICATE_VALUES, info, exprs);
+    return cc.function(op == OpV.LE || op == OpV.EQ ? EMPTY : EXISTS, info, dupl);
   }
 
   /**
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnItemsAt.java b/basex-core/src/main/java/org/basex/query/func/fn/FnItemsAt.java
@@ -9,7 +9,6 @@
 import org.basex.query.expr.*;
 import org.basex.query.expr.List;
 import org.basex.query.func.*;
-import org.basex.query.func.Function;
 import org.basex.query.func.file.*;
 import org.basex.query.iter.*;
 import org.basex.query.util.*;
@@ -205,7 +204,7 @@ protected Expr opt(final CompileContext cc) throws QueryException {
   static long countInputDiff(final Expr input, final Expr end) {
     if(end != Empty.UNDEFINED) {
       final Predicate<Expr> countInput = e ->
-        Function.COUNT.is(e) && e.arg(0).equals(input) && !e.has(Flag.NDT);
+        COUNT.is(e) && e.arg(0).equals(input) && !e.has(Flag.NDT);
       // function(E, count(E)) → 0
       if(countInput.test(end)) return 0;
       // function(E, count(E) - 1) → -1
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnReplace.java b/basex-core/src/main/java/org/basex/query/func/fn/FnReplace.java
@@ -27,7 +27,7 @@ public Str item(final QueryContext qc, final InputInfo ii) throws QueryException
 
     final boolean func = replacement instanceof FItem;
     final FItem action = func ? toFunction(replacement, 2, qc) : null;
-    final byte[] replace = func ? null : replacement.isEmpty() ? Token.EMPTY : toToken(replacement);
+    final byte[] replace = func ? null : replacement.isEmpty() ? EMPTY : toToken(replacement);
 
     // shortcut for simple character replacements
     if(flags.length == 0) {
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnSchemaType.java b/basex-core/src/main/java/org/basex/query/func/fn/FnSchemaType.java
@@ -25,7 +25,7 @@ public class FnSchemaType extends StandardFunc {
   @Override
   public Value value(final QueryContext qc) throws QueryException {
     final QNm name = toQNm(arg(0).atomItem(qc, info));
-    Type type = AtomType.find(name, true);
+    Type type = find(name, true);
     if(type == null) type = ListType.find(name);
     return annotate(qc, info, type);
   }
diff --git a/basex-core/src/main/java/org/basex/query/func/fn/FnStringJoin.java b/basex-core/src/main/java/org/basex/query/func/fn/FnStringJoin.java
@@ -62,7 +62,7 @@ protected Expr opt(final CompileContext cc) throws QueryException {
 
     final SeqType st = values.seqType(), stSep = separator.seqType();
     return (st.zero() || st.one() && st.type.isStringOrUntyped()) &&
-        stSep.type.isStringOrUntyped() ? cc.function(Function.STRING, info, values) : this;
+        stSep.type.isStringOrUntyped() ? cc.function(STRING, info, values) : this;
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/query/func/map/MapMerge.java b/basex-core/src/main/java/org/basex/query/func/map/MapMerge.java
@@ -147,7 +147,7 @@ final ValueMerger merger(final MergeOptions options, final QueryContext qc, fina
     // fixed option
     final String string = duplicates.isEmpty() ? dflt.toString() : toString(duplicates, qc);
     final Duplicates value = Enums.get(Duplicates.class, string);
-    if(value == null) throw QueryError.typeError(duplicates,
+    if(value == null) throw typeError(duplicates,
         EnumType.get(Duplicates.values()), info);
 
     return switch(value) {
diff --git a/basex-core/src/main/java/org/basex/query/value/type/AtomType.java b/basex-core/src/main/java/org/basex/query/value/type/AtomType.java
@@ -1045,7 +1045,7 @@ public final boolean eq(final Type type) {
 
   @Override
   public final boolean instanceOf(final Type type) {
-    if(type == this || type == AtomType.ITEM) return true;
+    if(type == this || type == ITEM) return true;
     if(type instanceof final AtomType at) {
       return (prePost & 0xFF) >= (at.prePost & 0xFF) && (prePost & 0xFF00) <= (at.prePost & 0xFF00);
     }
@@ -1217,7 +1217,7 @@ public final boolean nsSensitive() {
 
   @Override
   public final boolean refinable() {
-    return !((Checks<AtomType>) at -> at.eq(this) || !at.instanceOf(this)).all(AtomType.values());
+    return !((Checks<AtomType>) at -> at.eq(this) || !at.instanceOf(this)).all(values());
   }
 
   @Override
diff --git a/basex-core/src/main/java/org/basex/util/http/UserInfo.java b/basex-core/src/main/java/org/basex/util/http/UserInfo.java
@@ -64,7 +64,7 @@ public UserInfo(final URI uri, final Request request) {
    * @param rb HTTP request builder
    */
   public void basic(final HttpRequest.Builder rb) {
-    if(username != null && password != null) rb.header(HTTPText.AUTHORIZATION,
+    if(username != null && password != null) rb.header(AUTHORIZATION,
         AuthMethod.BASIC + " " + Base64.encode(username + ':' + password));
   }
 
@@ -109,7 +109,7 @@ public boolean assign(final HttpRequest.Builder rb, final HttpResponse<?> respon
         + ALGORITHM + '=' + MD5 + ','
         + OPAQUE + "=\"" + auth.get(OPAQUE) + '"';
     }
-    rb.header(HTTPText.AUTHORIZATION, request.authMethod + " " + value);
+    rb.header(AUTHORIZATION, request.authMethod + " " + value);
     return true;
   }
 }
diff --git a/basex-core/src/test/java/org/basex/core/locks/LockingTest.java b/basex-core/src/test/java/org/basex/core/locks/LockingTest.java
@@ -511,7 +511,7 @@ public void run() {
             final LockTester th = new LockTester(null, read, write, latch);
             th.start();
             try {
-              Thread.sleep(HOLD_TIME);
+              sleep(HOLD_TIME);
               if(!latch.await(FUZZING_THREADS * HOLD_TIME + WAIT, TimeUnit.MILLISECONDS))
                 throw new RuntimeException("Looks like thread is stuck in a deadlock.");
             } catch(final InterruptedException e) {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public IndexNames(final IndexType type, final Data data) {`
`52`	`52`	`Util.debugln("Included name is invalid: %", entry);`
`53`	`53`	`continue;`
`54`	`54`	`}`
`55`		`- qnames.add(name == null ? null : name, uri == null ? null : uri);`
	`55`	`+ qnames.add(name, uri);`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,6 @@ public Value value(final QueryContext qc) throws QueryException {`
`51`	`51`
`52`	`52`	`@Override`
`53`	`53`	`public Filter copy(final CompileContext cc, final IntObjectMap<Var> vm) {`
`54`		`- return copyType(new CachedFilter(info, root.copy(cc, vm), Arr.copyAll(cc, vm, exprs)));`
	`54`	`+ return copyType(new CachedFilter(info, root.copy(cc, vm), copyAll(cc, vm, exprs)));`
`55`	`55`	`}`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,6 @@ public Value value(final QueryContext qc) throws QueryException {`
`53`	`53`
`54`	`54`	`@Override`
`55`	`55`	`public SimpleMap copy(final CompileContext cc, final IntObjectMap<Var> vm) {`
`56`		`- return copyType(new CachedMap(info, Arr.copyAll(cc, vm, exprs)));`
	`56`	`+ return copyType(new CachedMap(info, copyAll(cc, vm, exprs)));`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public Value value(final QueryContext qc) throws QueryException {`
`80`	`80`
`81`	`81`	`@Override`
`82`	`82`	`public DualIterMap copy(final CompileContext cc, final IntObjectMap<Var> vm) {`
`83`		`- return copyType(new DualIterMap(info, Arr.copyAll(cc, vm, exprs)));`
	`83`	`+ return copyType(new DualIterMap(info, copyAll(cc, vm, exprs)));`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public Value value(final QueryContext qc) throws QueryException {`
`92`	`92`
`93`	`93`	`@Override`
`94`	`94`	`public DualMap copy(final CompileContext cc, final IntObjectMap<Var> vm) {`
`95`		`- return copyType(new DualMap(info, Arr.copyAll(cc, vm, exprs)));`
	`95`	`+ return copyType(new DualMap(info, copyAll(cc, vm, exprs)));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public final Expr optimize(final CompileContext cc) throws QueryException {`
`95`	`95`	`final ExprList results = new ExprList(unroll.size());`
`96`	`96`	`for(final Expr ex : unroll) {`
`97`	`97`	`results.add(get(cc, info, ex, results.size() == last ? exprs :`
`98`		`- Arr.copyAll(cc, new IntObjectMap<>(), exprs)));`
	`98`	`+ copyAll(cc, new IntObjectMap<>(), exprs)));`
`99`	`99`	`}`
`100`	`100`	`return List.get(cc, info, results.finish());`
`101`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ public Value value(final QueryContext qc) throws QueryException {`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`	`public IterFilter copy(final CompileContext cc, final IntObjectMap<Var> vm) {`
`58`		`- return copyType(new IterFilter(info, root.copy(cc, vm), Arr.copyAll(cc, vm, exprs)));`
	`58`	`+ return copyType(new IterFilter(info, root.copy(cc, vm), copyAll(cc, vm, exprs)));`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public Value value(final QueryContext qc) throws QueryException {`
`117`	`117`
`118`	`118`	`@Override`
`119`	`119`	`public IterMap copy(final CompileContext cc, final IntObjectMap<Var> vm) {`
`120`		`- return copyType(new IterMap(info, Arr.copyAll(cc, vm, exprs)));`
	`120`	`+ return copyType(new IterMap(info, copyAll(cc, vm, exprs)));`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ protected final ANode toNode(final Item item) throws QueryException {`
`550`	`550`	`*/`
`551`	`551`	`protected final Item toAtomItem(final Expr expr, final QueryContext qc) throws QueryException {`
`552`	`552`	`final Item item = expr.atomItem(qc, info);`
`553`		`- if(item.isEmpty()) throw typeError(item, AtomType.ITEM, info);`
	`553`	`+ if(item.isEmpty()) throw typeError(item, ITEM, info);`
`554`	`554`	`return item;`
`555`	`555`	`}`
`556`	`556`