Merge branch 'fix-5315-type_checking_order' into JB-current

Author: Nico Verwer

.github/workflows/sonarcloud.yml

@@ -72,6 +72,7 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

exist-ant/pom.xml

@@ -144,8 +144,8 @@
 
         <dependency>
             <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.70</version>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.77</version>
         </dependency>
 
         <dependency>
@@ -162,7 +162,7 @@
         <dependency>
             <groupId>com.fasterxml.uuid</groupId>
             <artifactId>java-uuid-generator</artifactId>
-            <version>4.1.0</version>
+            <version>4.3.0</version>
         </dependency>
 
         <dependency>
@@ -191,7 +191,7 @@
         <dependency>
             <groupId>org.jline</groupId>
             <artifactId>jline</artifactId>
-            <version>3.22.0</version>
+            <version>3.25.1</version>
         </dependency>
 
         <dependency>
@@ -233,13 +233,13 @@
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
+            <version>1.3.0</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-            <version>2.11.1</version>
+            <version>2.12.0</version>
         </dependency>
 
         <dependency>
@@ -426,7 +426,7 @@
         <dependency>
             <groupId>com.fifesoft</groupId>
             <artifactId>rsyntaxtextarea</artifactId>
-            <version>3.3.2</version>
+            <version>3.3.4</version>
         </dependency>
 
         <dependency>
@@ -509,6 +509,11 @@
             <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
@@ -521,6 +526,7 @@
         <dependency>
             <groupId>org.xmlunit</groupId>
             <artifactId>xmlunit-matchers</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.xmlunit</groupId>
@@ -596,6 +602,11 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+          <groupId>de.bottlecaps</groupId>
+          <artifactId>markup-blitz</artifactId>
+          <version>1.3</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -939,9 +950,9 @@ The BaseX Team. The original license statement is also included below.]]></pream
                                 <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-core:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-jcl:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
-
+                                <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-jul:jar:${log4j.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.glassfish.jaxb:jaxb-runtime:jar:${jaxb.impl.version}</ignoredUnusedDeclaredDependency>
-                                <ignoredUnusedDeclaredDependency>org.fusesource.jansi:jansi:jar:2.4.0</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.fusesource.jansi:jansi:jar:${jansi.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>net.sourceforge.nekohtml:nekohtml:jar:1.9.22</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>xml-resolver:xml-resolver:jar:1.2</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>org.xmlresolver:xmlresolver:jar:${xmlresolver.version}</ignoredUnusedDeclaredDependency>
@@ -953,6 +964,10 @@ The BaseX Team. The original license statement is also included below.]]></pream
                                 <ignoredUnusedDeclaredDependency>org.eclipse.jetty:jetty-annotations:jar:${jetty.version}</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>${project.groupId}:exist-jetty-config:jar:${project.version}</ignoredUnusedDeclaredDependency>
                             </ignoredUnusedDeclaredDependencies>
+
+                            <ignoredNonTestScopedDependencies>
+                                <ignoredNonTestScopedDependency>org.eclipse.jetty:jetty-http:jar:${jetty.version}</ignoredNonTestScopedDependency>
+                            </ignoredNonTestScopedDependencies>
                         </configuration>
                     </execution>
                 </executions>
@@ -1066,7 +1081,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
                     <dependency>
                         <groupId>org.junit.vintage</groupId>
                         <artifactId>junit-vintage-engine</artifactId>
-                        <version>${junit.vintage.version}</version>
+                        <version>${junit.jupiter.version}</version>
                     </dependency>
                     <dependency>
                         <groupId>org.objenesis</groupId>
@@ -1139,7 +1154,7 @@ The BaseX Team. The original license statement is also included below.]]></pream
                             <dependency>
                                 <groupId>org.junit.vintage</groupId>
                                 <artifactId>junit-vintage-engine</artifactId>
-                                <version>${junit.vintage.version}</version>
+                                <version>${junit.jupiter.version}</version>
                             </dependency>
                             <dependency>
                                 <groupId>org.objenesis</groupId>

exist-core/pom.xml

@@ -33,6 +33,7 @@
 import org.exist.start.Main;
 import org.exist.storage.lock.LockManager;
 import org.exist.storage.lock.LockTable;
+import org.exist.util.io.ContentFilePool;
 import org.exist.xquery.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -96,6 +97,8 @@
 
 import static com.evolvedbinary.j8fu.tuple.Tuple.Tuple;
 import static javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING;
+import static org.exist.util.io.ContentFilePool.PROPERTY_IN_MEMORY_SIZE;
+import static org.exist.util.io.VirtualTempPath.DEFAULT_IN_MEMORY_SIZE;
 
 
 public class Configuration implements ErrorHandler
@@ -107,6 +110,7 @@ public class Configuration implements ErrorHandler
     protected DocumentBuilder         builder        = null;
     protected HashMap<String, Object> config         = new HashMap<>(); //Configuration
 
+    private static final String PRP_DETAILS = "{}: {}";
     private static final String XQUERY_CONFIGURATION_ELEMENT_NAME = "xquery";
     private static final String XQUERY_BUILTIN_MODULES_CONFIGURATION_MODULES_ELEMENT_NAME = "builtin-modules";
     private static final String XQUERY_BUILTIN_MODULES_CONFIGURATION_MODULE_ELEMENT_NAME = "module";
@@ -291,6 +295,11 @@ public Configuration(String configFilename, Optional<Path> existHomeDirname) thr
                 configureValidation(existHomeDirname, (Element)validations.item(0));
             }
 
+            //RPC server
+            final NodeList rpcServer = doc.getElementsByTagName("rpc-server");
+            if (rpcServer.getLength() > 0) {
+                configureRpcServer((Element) rpcServer.item(0));
+            }
         }
         catch(final SAXException | IOException | ParserConfigurationException e) {
             LOG.error("error while reading config file: {}", configFilename, e);
@@ -1499,8 +1508,28 @@ private void configureValidation(final Optional<Path> dbHome, final Element vali
         final GrammarPool gp = new GrammarPool();
         config.put( XMLReaderObjectFactory.GRAMMAR_POOL, gp);
     }
-    
-     /**
+
+    private void configureRpcServer(final Element validation) {
+        final NodeList contentFile = validation.getElementsByTagName("content-file");
+        if (contentFile.getLength() > 0) {
+            final String inMemorySize = ((Element) contentFile.item(0)).getAttribute("in-memory-size");
+            if (inMemorySize != null) {
+                config.put(PROPERTY_IN_MEMORY_SIZE, parseInt(inMemorySize, DEFAULT_IN_MEMORY_SIZE));
+                LOG.debug(PRP_DETAILS, PROPERTY_IN_MEMORY_SIZE, config.get(PROPERTY_IN_MEMORY_SIZE));
+            }
+        }
+        final NodeList contentFilePool = validation.getElementsByTagName("content-file-pool");
+        if (contentFilePool.getLength() > 0) {
+            final String size = ((Element) contentFilePool.item(0)).getAttribute("size");
+            config.put(ContentFilePool.PROPERTY_POOL_SIZE, parseInt(size, -1));
+            LOG.debug(PRP_DETAILS, ContentFilePool.PROPERTY_POOL_SIZE, config.get(ContentFilePool.PROPERTY_POOL_SIZE));
+            final String maxIdle = ((Element) contentFilePool.item(0)).getAttribute("max-idle");
+            config.put(ContentFilePool.PROPERTY_POOL_MAX_IDLE, parseInt(maxIdle, 5));
+            LOG.debug(PRP_DETAILS, ContentFilePool.PROPERTY_POOL_MAX_IDLE, config.get(ContentFilePool.PROPERTY_POOL_MAX_IDLE));
+        }
+    }
+
+    /**
      * Gets the value of a configuration attribute
      *
      * The value typically is specified in the conf.xml file, but can be overridden with using a System Property
@@ -1596,6 +1625,17 @@ public void removeProperty(final String name) {
         config.remove(name);
     }
 
+    public int getInteger(final String name) {
+        return getInteger(name, -1);
+    }
+
+    public int getInteger(final String name, final int defaultValue) {
+        return Optional.ofNullable(getProperty(name))
+                .filter(v -> v instanceof Integer)
+                .map(v -> (int) v)
+                .orElse(defaultValue);
+    }
+
     /**
      * Takes the passed string and converts it to a non-null <code>Boolean</code> object. If value is null, the specified default value is used.
      * Otherwise, Boolean.TRUE is returned if and only if the passed string equals &quot;yes&quot; or &quot;true&quot;, ignoring case.
@@ -1633,14 +1673,6 @@ public static int parseInt(@Nullable final String value, final int defaultValue)
         }
     }
 
-    public int getInteger(final String name) {
-        return Optional.ofNullable(getProperty(name))
-                .filter(v -> v instanceof Integer)
-                .map(v -> (int)v)
-                .orElse(-1);
-    }
-
-
     /**
      * (non-Javadoc).
      *

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

@@ -25,21 +25,50 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * @author <a href="mailto:[email protected]">Patrick Reinhart</a>
  */
 public interface ContentFile extends AutoCloseable {
 
     @Override
+    /**
+     * Closes all resource held by the implementation as open files or off HEAP memory as example.
+     */
     void close();
 
+    /**
+     * Returns the complete content as an byte array.
+     *
+     * @return the content as byte array
+     */
     byte[] getBytes();
 
+    /**
+     * Returns the size of the conent in bytes
+     *
+     * @return the content size
+     */
     long size();
 
+    /**
+     * Returns a new {@link InputStream} instance based on the content data.
+     *
+     * @return a new input stream based on the content.
+     * @throws IOException if an error occurs accessing the content
+     */
     default InputStream newInputStream() throws IOException {
-       return new ByteArrayInputStream(getBytes());
+        return new ByteArrayInputStream(getBytes());
     }
 
+    /**
+     * Returns a new {@link OutputStream} instance to write content data.
+     * @return a new output stream for writing content
+     * @throws IOException if an error occurs accessing the content
+     * @throws UnsupportedOperationException if the operation is not available
+     */
+    default OutputStream newOutputStream() throws IOException {
+        throw new UnsupportedOperationException("not supported");
+    }
 }