[DE-456] native image fixes

.github/workflows/maven-deploy.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'adopt'
           cache: 'maven'
           server-id: ossrh

.github/workflows/maven-release.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '11'
           distribution: 'adopt'
           cache: 'maven'
           server-id: ossrh

.github/workflows/native.yml

@@ -16,12 +16,12 @@ jobs:
         docker-img:
           - docker.io/arangodb/enterprise:3.10.1
         topology:
-          - cluster
+          - single
         java-version:
           - 17
         module:
           - driver
-          - shaded-integration-tests
+          - integration-tests
 
     steps:
       - uses: actions/checkout@v2
@@ -60,7 +60,7 @@ jobs:
           - 17
         module:
           - driver
-          - shaded-integration-tests
+          - integration-tests
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/test.yml

@@ -46,7 +46,7 @@ jobs:
         db-ext-names:
           - false
         java-version:
-          - 8
+          - 11
         user-language:
           - en
         include:
@@ -222,7 +222,7 @@ jobs:
       - name: Test
         run: mvn --no-transfer-progress -am -pl driver test -Dadb.jackson.version=${{matrix.jackson-version}}
 
-  shaded-integration-tests:
+  integration-tests:
     timeout-minutes: 20
     runs-on: ubuntu-latest
 
@@ -255,14 +255,17 @@ jobs:
       - name: Install
         run: mvn --no-transfer-progress install -DskipTests=true -Dgpg.skip=true -Dmaven.javadoc.skip=true
       - name: Test internal-serde
-        working-directory: shaded-integration-tests
+        working-directory: integration-tests
         run: mvn --no-transfer-progress -Pinternal-serde test
       - name: Test jackson-serde
-        working-directory: shaded-integration-tests
+        working-directory: integration-tests
         run: mvn --no-transfer-progress -Pjackson-serde test
       - name: Test jsonb-serde
-        working-directory: shaded-integration-tests
+        working-directory: integration-tests
         run: mvn --no-transfer-progress -Pjsonb-serde test
+      - name: Test plain
+        working-directory: integration-tests
+        run: mvn --no-transfer-progress -Pplain test
 
   sonar:
     timeout-minutes: 10

core/src/main/java/com/arangodb/async/ArangoDBAsync.java

@@ -305,6 +305,7 @@ private AsyncProtocolProvider asyncProtocolProvider(Protocol protocol) {
                 if (p.supportsProtocol(protocol)) {
                     return p;
                 }
+                LOG.debug("Required protocol ({}) not supported by ProtocolProvider: {}", protocol, p.getClass().getName());
             }
             throw new ArangoDBException("No ProtocolProvider found for protocol: " + protocol);
         }

core/src/main/java/com/arangodb/internal/InternalArangoDBBuilder.java

@@ -44,7 +44,7 @@
  * @author Mark Vollmary
  */
 public abstract class InternalArangoDBBuilder<T extends InternalArangoDBBuilder<T>> {
-    private static final Logger LOG = LoggerFactory.getLogger(InternalArangoDBBuilder.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(InternalArangoDBBuilder.class);
     protected final ArangoConfig config = new ArangoConfig();
 
     @SuppressWarnings("unchecked")
@@ -295,6 +295,7 @@ protected ProtocolProvider protocolProvider(Protocol protocol) {
             if (p.supportsProtocol(protocol)) {
                 return p;
             }
+            LOG.debug("Required protocol ({}) not supported by ProtocolProvider: {}", protocol, p.getClass().getName());
         }
         throw new ArangoDBException("No ProtocolProvider found for protocol: " + protocol);
     }

core/src/main/java/com/arangodb/internal/serde/InternalMapperProvider.java

@@ -4,11 +4,15 @@
 import com.arangodb.ContentType;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ServiceLoader;
 import java.util.function.Supplier;
 
 public interface InternalMapperProvider extends Supplier<ObjectMapper> {
+    Logger LOG = LoggerFactory.getLogger(InternalMapperProvider.class);
+
     static ObjectMapper of(final ContentType contentType) {
         String formatName;
         if (contentType == ContentType.JSON) {
@@ -24,6 +28,7 @@ static ObjectMapper of(final ContentType contentType) {
             if(formatName.equals(jf.getFormatName())){
                 return new ObjectMapper(jf);
             }
+            LOG.debug("Required format ({}) not supported by JsonFactory: {}", formatName, jf.getClass().getName());
         }
 
         throw new ArangoDBException("No JsonFactory found for content type: " + contentType);

driver/pom.xml

@@ -138,12 +138,12 @@
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>jackson-serde-vpack</artifactId>
-            <scope>test</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>vst-protocol</artifactId>
-            <scope>test</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
-            <version>22.3.0</version>
+            <version>22.3.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/native-image.properties

@@ -1,9 +1,13 @@
 Args=\
--H:ResourceConfigurationResources=${.}/resource-config.json \
--H:ReflectionConfigurationResources=${.}/reflect-config.json \
+-H:ResourceConfigurationResources=${.}/resource-config.json,${.}/resource-config-spi.json \
+-H:ReflectionConfigurationResources=${.}/reflect-config.json,${.}/reflect-config-spi.json,${.}/reflect-config-mp-config.json \
 -H:SerializationConfigurationResources=${.}/serialization-config.json \
+--initialize-at-build-time=\
+    org.slf4j \
 --initialize-at-run-time=\
-  io.netty.handler.ssl.BouncyCastleAlpnSslUtils,\
-  io.netty.handler.codec.compression.ZstdOptions \
+    io.netty.handler.ssl.BouncyCastleAlpnSslUtils,\
+    io.netty.handler.codec.compression.ZstdOptions,\
+    io.netty.handler.codec.compression.BrotliOptions,\
+    io.netty.handler.codec.compression.Brotli \
 -Dio.netty.noUnsafe=true \
 -Dio.netty.leakDetection.level=DISABLED

driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/reflect-config-mp-config.json

@@ -0,0 +1,13 @@
+[
+  {
+    "name": "com.arangodb.config.HostDescription",
+    "methods": [
+      {
+        "name": "parse",
+        "parameterTypes": [
+          "java.lang.CharSequence"
+        ]
+      }
+    ]
+  }
+]

driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/reflect-config-spi.json

@@ -0,0 +1,11 @@
+[
+  {
+    "name": "com.fasterxml.jackson.core.JsonFactory",
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": []
+      }
+    ]
+  }
+]

driver/src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/resource-config-spi.json

@@ -0,0 +1,10 @@
+{
+  "resources": {
+    "includes": [
+      {
+        "pattern": "META-INF/services/com.fasterxml.jackson.core.JsonFactory"
+      }
+    ]
+  },
+  "bundles": []
+}

driver/src/test/java/com/arangodb/example/FirstProject.java

@@ -1,6 +1,7 @@
 package com.arangodb.example;
 
 import com.arangodb.*;
+import com.arangodb.config.ArangoConfigProperties;
 import com.arangodb.entity.BaseDocument;
 import com.arangodb.entity.CollectionEntity;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -12,7 +13,7 @@
 public class FirstProject {
 
     public static void main(final String[] args) {
-        final ArangoDB arangoDB = new ArangoDB.Builder().user("root").build();
+        final ArangoDB arangoDB = new ArangoDB.Builder().loadProperties(ArangoConfigProperties.fromFile()).user("root").build();
 
         // create database
         final DbName dbName = DbName.of("mydb");

driver/src/test/java/graal/EmptyByteBufStub.java

@@ -0,0 +1,33 @@
+package graal;
+
+import io.netty.util.internal.PlatformDependent;
+
+import java.nio.ByteBuffer;
+
+public final class EmptyByteBufStub {
+    private static final ByteBuffer EMPTY_BYTE_BUFFER = ByteBuffer.allocateDirect(0);
+    private static final long EMPTY_BYTE_BUFFER_ADDRESS;
+
+    static {
+        long emptyByteBufferAddress = 0;
+        try {
+            if (PlatformDependent.hasUnsafe()) {
+                emptyByteBufferAddress = PlatformDependent.directBufferAddress(EMPTY_BYTE_BUFFER);
+            }
+        } catch (Throwable t) {
+            // Ignore
+        }
+        EMPTY_BYTE_BUFFER_ADDRESS = emptyByteBufferAddress;
+    }
+
+    public static ByteBuffer emptyByteBuffer() {
+        return EMPTY_BYTE_BUFFER;
+    }
+
+    public static long emptyByteBufferAddress() {
+        return EMPTY_BYTE_BUFFER_ADDRESS;
+    }
+
+    private EmptyByteBufStub() {
+    }
+}

driver/src/test/java/graal/HttpContentCompressorSubstitutions.java

@@ -0,0 +1,29 @@
+package graal;
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+
+public class HttpContentCompressorSubstitutions {
+
+    @TargetClass(className = "io.netty.handler.codec.compression.ZstdEncoder")
+    public static final class ZstdEncoderFactorySubstitution {
+
+        @Substitute
+        protected ByteBuf allocateBuffer(ChannelHandlerContext ctx, ByteBuf msg, boolean preferDirect) throws Exception {
+            throw new UnsupportedOperationException();
+        }
+
+        @Substitute
+        protected void encode(ChannelHandlerContext ctx, ByteBuf in, ByteBuf out) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Substitute
+        public void flush(final ChannelHandlerContext ctx) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+}