Update Brackit (#647)

* Replace package org... with io...

* Fix package names

* Fix package names

* Update Brackit to new version and thus change all package imports

* Fix class name due to renamed package

bundles/sirix-core/src/main/java/io/sirix/access/Utils.java

@@ -1,7 +1,7 @@
 package io.sirix.access;
 
 import javax.xml.namespace.QName;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 
 /**
  * Encapsulates generic stuff.

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/AbstractIndexController.java

@@ -2,12 +2,12 @@
 
 import io.sirix.api.*;
 import io.sirix.index.*;
-import org.brackit.xquery.atomic.Atomic;
-import org.brackit.xquery.atomic.QNm;
-import org.brackit.xquery.jdm.DocumentException;
-import org.brackit.xquery.util.path.Path;
-import org.brackit.xquery.util.path.PathException;
-import org.brackit.xquery.util.serialize.SubtreePrinter;
+import io.brackit.query.atomic.Atomic;
+import io.brackit.query.atomic.QNm;
+import io.brackit.query.jdm.DocumentException;
+import io.brackit.query.util.path.Path;
+import io.brackit.query.util.path.PathException;
+import io.brackit.query.util.serialize.SubtreePrinter;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import io.sirix.exception.SirixRuntimeException;
 import io.sirix.index.cas.CASFilter;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/AbstractResourceSession.java

@@ -2,7 +2,7 @@
 
 import cn.danielw.fop.*;
 import io.sirix.api.*;
-import org.brackit.xquery.jdm.DocumentException;
+import io.brackit.query.jdm.DocumentException;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/ForwardingNodeReadOnlyTrx.java

@@ -1,6 +1,6 @@
 package io.sirix.access.trx.node;
 
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.access.User;
 import io.sirix.api.NodeReadOnlyTrx;
 import io.sirix.api.NodeTrx;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/IndexController.java

@@ -1,12 +1,12 @@
 package io.sirix.access.trx.node;
 
 import io.sirix.api.*;
-import org.brackit.xquery.atomic.Atomic;
-import org.brackit.xquery.jdm.DocumentException;
-import org.brackit.xquery.jdm.node.Node;
-import org.brackit.xquery.node.d2linked.D2NodeBuilder;
-import org.brackit.xquery.node.parser.DocumentParser;
-import org.brackit.xquery.util.path.PathException;
+import io.brackit.query.atomic.Atomic;
+import io.brackit.query.jdm.DocumentException;
+import io.brackit.query.jdm.node.Node;
+import io.brackit.query.node.d2linked.D2NodeBuilder;
+import io.brackit.query.node.parser.DocumentParser;
+import io.brackit.query.util.path.PathException;
 import io.sirix.access.ResourceConfiguration;
 import io.sirix.access.trx.node.xml.XmlIndexController;
 import io.sirix.api.xml.XmlNodeTrx;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/NodeFactory.java

@@ -1,7 +1,7 @@
 package io.sirix.access.trx.node;
 
 import javax.xml.namespace.QName;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.exception.SirixIOException;
 import io.sirix.index.path.summary.PathNode;
 import io.sirix.node.NodeKind;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/json/ForwardingJsonNodeReadOnlyTrx.java

@@ -11,7 +11,7 @@
 import io.sirix.node.NodeKind;
 import io.sirix.node.SirixDeweyID;
 import io.sirix.node.interfaces.immutable.ImmutableNode;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 
 import java.time.Instant;
 import java.util.List;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/json/JsonIndexController.java

@@ -13,10 +13,10 @@
 import io.sirix.index.path.PathFilter;
 import io.sirix.index.path.json.JsonPCRCollector;
 import io.sirix.index.path.json.JsonPathIndexImpl;
-import org.brackit.xquery.atomic.QNm;
-import org.brackit.xquery.util.path.Path;
-import org.brackit.xquery.util.path.PathException;
-import org.brackit.xquery.util.path.PathParser;
+import io.brackit.query.atomic.QNm;
+import io.brackit.query.util.path.Path;
+import io.brackit.query.util.path.PathException;
+import io.brackit.query.util.path.PathParser;
 import io.sirix.index.path.summary.PathSummaryReader;
 
 import java.util.HashSet;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/json/JsonNodeFactoryImpl.java

@@ -17,7 +17,7 @@
 import io.sirix.utils.Compression;
 import io.sirix.utils.NamePageHash;
 import net.openhft.hashing.LongHashFunction;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/json/JsonNodeReadOnlyTrxImpl.java

@@ -25,7 +25,7 @@
 import io.sirix.node.json.*;
 import io.sirix.service.xml.xpath.ItemListImpl;
 import io.sirix.settings.Constants;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import org.checkerframework.checker.index.qual.NonNegative;
 
 import java.io.IOException;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/json/JsonNodeTrxImpl.java

@@ -58,8 +58,8 @@
 import io.sirix.settings.Fixed;
 import net.openhft.chronicle.bytes.Bytes;
 import net.openhft.hashing.LongHashFunction;
-import org.brackit.xquery.atomic.QNm;
-import org.brackit.xquery.jdm.Item;
+import io.brackit.query.atomic.QNm;
+import io.brackit.query.jdm.Item;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/xml/ForwardingXmlNodeReadOnlyTrx.java

@@ -14,7 +14,7 @@
 import io.sirix.node.interfaces.immutable.ImmutableValueNode;
 import io.sirix.node.interfaces.immutable.ImmutableXmlNode;
 import io.sirix.service.xml.xpath.AtomicValue;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/xml/InsertPos.java

@@ -27,7 +27,7 @@
 import io.sirix.node.NodeKind;
 import io.sirix.node.interfaces.StructNode;
 import io.sirix.settings.Fixed;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.node.xml.TextNode;
 
 /**

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/xml/XmlIndexController.java

@@ -14,9 +14,9 @@
 import io.sirix.index.path.summary.PathSummaryReader;
 import io.sirix.index.path.xml.XmlPCRCollector;
 import io.sirix.index.path.xml.XmlPathIndexImpl;
-import org.brackit.xquery.atomic.QNm;
-import org.brackit.xquery.util.path.Path;
-import org.brackit.xquery.util.path.PathParser;
+import io.brackit.query.atomic.QNm;
+import io.brackit.query.util.path.Path;
+import io.brackit.query.util.path.PathParser;
 
 import java.util.HashSet;
 import java.util.Set;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/xml/XmlNodeFactory.java

@@ -7,7 +7,7 @@
 import io.sirix.node.xml.PINode;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.node.xml.AttributeNode;
 import io.sirix.node.xml.CommentNode;
 import io.sirix.node.xml.NamespaceNode;

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/xml/XmlNodeFactoryImpl.java

@@ -17,7 +17,7 @@
 import io.sirix.utils.NamePageHash;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import net.openhft.hashing.LongHashFunction;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/xml/XmlNodeReadOnlyTrxImpl.java

@@ -46,7 +46,7 @@
 import io.sirix.service.xml.xpath.ItemListImpl;
 import io.sirix.settings.Constants;
 import io.sirix.utils.NamePageHash;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 

bundles/sirix-core/src/main/java/io/sirix/access/trx/node/xml/XmlNodeTrxImpl.java

@@ -52,7 +52,7 @@
 import io.sirix.settings.Fixed;
 import io.sirix.utils.XMLToken;
 import net.openhft.chronicle.bytes.Bytes;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;

bundles/sirix-core/src/main/java/io/sirix/access/trx/page/PageTrxFactory.java

@@ -34,7 +34,7 @@
 import io.sirix.cache.TransactionIntentLog;
 import io.sirix.page.*;
 import io.sirix.cache.BufferManager;
-import org.brackit.xquery.jdm.DocumentException;
+import io.brackit.query.jdm.DocumentException;
 import org.checkerframework.checker.index.qual.NonNegative;
 import io.sirix.access.trx.node.xml.XmlResourceSessionImpl;
 import io.sirix.api.NodeReadOnlyTrx;

bundles/sirix-core/src/main/java/io/sirix/api/NodeReadOnlyTrx.java

@@ -6,7 +6,7 @@
 import io.sirix.node.NodeKind;
 import io.sirix.node.SirixDeweyID;
 import io.sirix.exception.SirixException;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 
 import java.time.Instant;
 import java.util.Optional;

bundles/sirix-core/src/main/java/io/sirix/api/json/JsonNodeTrx.java

@@ -1,7 +1,7 @@
 package io.sirix.api.json;
 
 import com.google.gson.stream.JsonReader;
-import org.brackit.xquery.jdm.Item;
+import io.brackit.query.jdm.Item;
 import io.sirix.access.trx.node.json.objectvalue.ObjectRecordValue;
 import io.sirix.api.NodeTrx;
 

bundles/sirix-core/src/main/java/io/sirix/api/xml/XmlNodeReadOnlyTrx.java

@@ -29,7 +29,7 @@
 import io.sirix.node.SirixDeweyID;
 import io.sirix.node.interfaces.ValueNode;
 import io.sirix.service.xml.xpath.AtomicValue;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.node.interfaces.immutable.ImmutableNameNode;
 import io.sirix.node.interfaces.immutable.ImmutableValueNode;
 import io.sirix.node.interfaces.immutable.ImmutableXmlNode;

bundles/sirix-core/src/main/java/io/sirix/api/xml/XmlNodeTrx.java

@@ -23,7 +23,7 @@
 
 import io.sirix.exception.SirixException;
 import io.sirix.exception.SirixIOException;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.api.Movement;
 import io.sirix.api.NodeTrx;
 import io.sirix.api.PostCommitHook;

bundles/sirix-core/src/main/java/io/sirix/axis/filter/PathNameFilter.java

@@ -22,7 +22,7 @@
 package io.sirix.axis.filter;
 
 import io.sirix.index.path.summary.PathSummaryReader;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 
 /**
  * <p>

bundles/sirix-core/src/main/java/io/sirix/axis/filter/json/JsonNameFilter.java

@@ -2,7 +2,7 @@
 
 import io.sirix.api.json.JsonNodeReadOnlyTrx;
 import io.sirix.api.xml.XmlNodeReadOnlyTrx;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.axis.filter.AbstractFilter;
 
 /**

bundles/sirix-core/src/main/java/io/sirix/axis/filter/xml/XmlNameFilter.java

@@ -23,7 +23,7 @@
 
 import io.sirix.api.xml.XmlNodeReadOnlyTrx;
 import io.sirix.axis.filter.PathNameFilter;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.axis.filter.AbstractFilter;
 
 /**

bundles/sirix-core/src/main/java/io/sirix/axis/visitor/ModificationVisitor.java

@@ -7,7 +7,7 @@
 import io.sirix.node.NodeKind;
 import io.sirix.node.interfaces.immutable.ImmutableNode;
 import io.sirix.utils.LogWrapper;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.access.trx.node.xml.AbstractXmlNodeVisitor;
 import io.sirix.exception.SirixException;
 import io.sirix.node.immutable.xml.ImmutableElement;

bundles/sirix-core/src/main/java/io/sirix/cache/PathSummaryData.java

@@ -3,7 +3,7 @@
 import io.sirix.index.path.summary.PathNode;
 import io.sirix.node.interfaces.StructNode;
 import io.sirix.utils.IntToObjectMap;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 
 import java.util.Map;
 import java.util.Set;

bundles/sirix-core/src/main/java/io/sirix/diff/algorithm/fmse/DefaultNodeComparisonFactory.java

@@ -3,7 +3,7 @@
 import java.util.Map;
 
 import io.sirix.api.xml.XmlNodeReadOnlyTrx;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.index.path.summary.PathSummaryReader;
 
 public final class DefaultNodeComparisonFactory implements NodeComparisonFactory {

bundles/sirix-core/src/main/java/io/sirix/diff/algorithm/fmse/FMSE.java

@@ -36,7 +36,7 @@
 import io.sirix.node.interfaces.Node;
 import io.sirix.utils.LogWrapper;
 import io.sirix.utils.Pair;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import org.slf4j.LoggerFactory;
 
 import java.util.*;

bundles/sirix-core/src/main/java/io/sirix/diff/algorithm/fmse/FMSENodeComparisonUtils.java

@@ -4,7 +4,7 @@
 
 import io.sirix.access.Utils;
 import io.sirix.api.xml.XmlNodeReadOnlyTrx;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.node.xml.TextNode;
 
 import java.util.Objects;

bundles/sirix-core/src/main/java/io/sirix/diff/algorithm/fmse/InnerNodeComparator.java

@@ -3,7 +3,7 @@
 import java.util.Map;
 
 import io.sirix.api.xml.XmlNodeReadOnlyTrx;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 
 /**
  * This functional class is used to compare inner nodes. FMES uses different comparison criteria for

bundles/sirix-core/src/main/java/io/sirix/diff/algorithm/fmse/LeafNodeEquality.java

@@ -2,7 +2,7 @@
 
 import io.sirix.api.xml.XmlNodeReadOnlyTrx;
 import io.sirix.node.NodeKind;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.index.path.summary.PathSummaryReader;
 
 /**

bundles/sirix-core/src/main/java/io/sirix/diff/algorithm/fmse/NodeComparisonFactory.java

@@ -3,7 +3,7 @@
 import java.util.Map;
 
 import io.sirix.api.xml.XmlNodeReadOnlyTrx;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.index.path.summary.PathSummaryReader;
 
 public interface NodeComparisonFactory {

bundles/sirix-core/src/main/java/io/sirix/diff/service/FMSEImport.java

@@ -38,7 +38,7 @@
 import io.sirix.service.xml.shredder.XmlShredder;
 import io.sirix.utils.SirixFiles;
 import org.checkerframework.checker.nullness.qual.NonNull;
-import org.brackit.xquery.atomic.QNm;
+import io.brackit.query.atomic.QNm;
 import io.sirix.utils.LogWrapper;
 import org.slf4j.LoggerFactory;
 

bundles/sirix-core/src/main/java/io/sirix/index/AtomicUtil.java

@@ -1,9 +1,9 @@
 package io.sirix.index;
 
-import org.brackit.xquery.QueryException;
-import org.brackit.xquery.atomic.*;
-import org.brackit.xquery.expr.Cast;
-import org.brackit.xquery.jdm.Type;
+import io.brackit.query.QueryException;
+import io.brackit.query.atomic.*;
+import io.brackit.query.expr.Cast;
+import io.brackit.query.jdm.Type;
 import io.sirix.exception.SirixException;
 import io.sirix.exception.SirixRuntimeException;
 import io.sirix.utils.Calc;

bundles/sirix-core/src/main/java/io/sirix/index/IndexDef.java

@@ -1,16 +1,16 @@
 package io.sirix.index;
 
-import org.brackit.xquery.atomic.QNm;
-import org.brackit.xquery.atomic.Una;
-import org.brackit.xquery.jdm.DocumentException;
-import org.brackit.xquery.jdm.Stream;
-import org.brackit.xquery.jdm.Type;
-import org.brackit.xquery.jdm.node.Node;
-import org.brackit.xquery.module.Namespaces;
-import org.brackit.xquery.node.parser.FragmentHelper;
-import org.brackit.xquery.util.path.Path;
-import org.brackit.xquery.util.path.PathParser;
-import org.brackit.xquery.util.serialize.SubtreePrinter;
+import io.brackit.query.atomic.QNm;
+import io.brackit.query.atomic.Una;
+import io.brackit.query.jdm.DocumentException;
+import io.brackit.query.jdm.Stream;
+import io.brackit.query.jdm.Type;
+import io.brackit.query.jdm.node.Node;
+import io.brackit.query.module.Namespaces;
+import io.brackit.query.node.parser.FragmentHelper;
+import io.brackit.query.util.path.Path;
+import io.brackit.query.util.path.PathParser;
+import io.brackit.query.util.serialize.SubtreePrinter;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.io.ByteArrayOutputStream;