arangodb · rashtao · Apr 25, 2025 · Apr 10, 2025 · Apr 15, 2025 · Apr 15, 2025
diff --git a/core/pom.xml b/core/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../release-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>release-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <name>core</name>

diff --git a/core/src/main/java/com/arangodb/config/ArangoConfigProperties.java b/core/src/main/java/com/arangodb/config/ArangoConfigProperties.java
@@ -11,6 +11,29 @@
 
 public interface ArangoConfigProperties {
 
+    //region configuration properties keys
+    String KEY_HOSTS = "hosts";
+    String KEY_PROTOCOL = "protocol";
+    String KEY_USER = "user";
+    String KEY_PASSWORD = "password";
+    String KEY_JWT = "jwt";
+    String KEY_TIMEOUT = "timeout";
+    String KEY_USE_SSL = "useSsl";
+    String KEY_VERIFY_HOST = "verifyHost";
+    String KEY_CHUNK_SIZE = "chunkSize";
+    String KEY_MAX_CONNECTIONS = "maxConnections";
+    String KEY_CONNECTION_TTL = "connectionTtl";
+    String KEY_KEEP_ALIVE_INTERVAL = "keepAliveInterval";
+    String KEY_ACQUIRE_HOST_LIST = "acquireHostList";
+    String KEY_ACQUIRE_HOST_LIST_INTERVAL = "acquireHostListInterval";
+    String KEY_LOAD_BALANCING_STRATEGY = "loadBalancingStrategy";
+    String KEY_RESPONSE_QUEUE_TIME_SAMPLES = "responseQueueTimeSamples";
+    String KEY_COMPRESSION = "compression";
+    String KEY_COMPRESSION_THRESHOLD = "compressionThreshold";
+    String KEY_COMPRESSION_LEVEL = "compressionLevel";
+    String KEY_SERDE_PROVIDER_CLASS = "serdeProviderClass";
+    //endregion
+
     /**
      * Reads properties from file arangodb.properties.
      * Properties must be prefixed with @{code "arangodb"}, eg. @{code "arangodb.hosts=localhost:8529"}.

diff --git a/core/src/main/java/com/arangodb/entity/CollectionEntity.java b/core/src/main/java/com/arangodb/entity/CollectionEntity.java
@@ -60,6 +60,7 @@ public Boolean getIsSystem() {
         return isSystem;
     }
 
+    @Deprecated
     public CollectionStatus getStatus() {
         return status;
     }

diff --git a/core/src/main/java/com/arangodb/entity/CollectionStatus.java b/core/src/main/java/com/arangodb/entity/CollectionStatus.java
@@ -23,6 +23,7 @@
 /**
  * @author Mark Vollmary
  */
+@Deprecated
 public enum CollectionStatus {
 
     LOADED(3), DELETED(5);

diff --git a/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java b/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java
@@ -68,7 +68,7 @@ private String getProperty(String key) {
 
     @Override
     public Optional<List<HostDescription>> getHosts() {
-        return Optional.ofNullable(getProperty("hosts"))
+        return Optional.ofNullable(getProperty(KEY_HOSTS))
                 .map(s -> {
                     List<HostDescription> hostDescriptions = new ArrayList<>();
                     String[] hosts = s.split(",");
@@ -81,97 +81,104 @@ public Optional<List<HostDescription>> getHosts() {
 
     @Override
     public Optional<Protocol> getProtocol() {
-        return Optional.ofNullable(getProperty("protocol")).map(Protocol::valueOf);
+        return Optional.ofNullable(getProperty(KEY_PROTOCOL)).map(Protocol::valueOf);
     }
 
     @Override
     public Optional<String> getUser() {
-        return Optional.ofNullable(getProperty("user"));
+        return Optional.ofNullable(getProperty(KEY_USER));
     }
 
     @Override
     public Optional<String> getPassword() {
-        return Optional.ofNullable(getProperty("password"));
+        return Optional.ofNullable(getProperty(KEY_PASSWORD));
     }
 
     @Override
     public Optional<String> getJwt() {
-        return Optional.ofNullable(getProperty("jwt"));
+        return Optional.ofNullable(getProperty(KEY_JWT));
     }
 
     @Override
     public Optional<Integer> getTimeout() {
-        return Optional.ofNullable(getProperty("timeout")).map(Integer::valueOf);
+        return Optional.ofNullable(getProperty(KEY_TIMEOUT)).map(Integer::valueOf);
     }
 
     @Override
     public Optional<Boolean> getUseSsl() {
-        return Optional.ofNullable(getProperty("useSsl")).map(Boolean::valueOf);
+        return Optional.ofNullable(getProperty(KEY_USE_SSL)).map(Boolean::valueOf);
     }
 
     @Override
     public Optional<Boolean> getVerifyHost() {
-        return Optional.ofNullable(getProperty("verifyHost")).map(Boolean::valueOf);
+        return Optional.ofNullable(getProperty(KEY_VERIFY_HOST)).map(Boolean::valueOf);
     }
 
     @Override
     public Optional<Integer> getChunkSize() {
-        return Optional.ofNullable(getProperty("chunkSize")).map(Integer::valueOf);
+        return Optional.ofNullable(getProperty(KEY_CHUNK_SIZE)).map(Integer::valueOf);
     }
 
     @Override
     public Optional<Integer> getMaxConnections() {
-        return Optional.ofNullable(getProperty("maxConnections")).map(Integer::valueOf);
+        return Optional.ofNullable(getProperty(KEY_MAX_CONNECTIONS)).map(Integer::valueOf);
     }
 
     @Override
     public Optional<Long> getConnectionTtl() {
-        return Optional.ofNullable(getProperty("connectionTtl")).map(Long::valueOf);
+        return Optional.ofNullable(getProperty(KEY_CONNECTION_TTL)).map(Long::valueOf);
     }
 
     @Override
     public Optional<Integer> getKeepAliveInterval() {
-        return Optional.ofNullable(getProperty("keepAliveInterval")).map(Integer::valueOf);
+        return Optional.ofNullable(getProperty(KEY_KEEP_ALIVE_INTERVAL)).map(Integer::valueOf);
     }
 
     @Override
     public Optional<Boolean> getAcquireHostList() {
-        return Optional.ofNullable(getProperty("acquireHostList")).map(Boolean::valueOf);
+        return Optional.ofNullable(getProperty(KEY_ACQUIRE_HOST_LIST)).map(Boolean::valueOf);
     }
 
     @Override
     public Optional<Integer> getAcquireHostListInterval() {
-        return Optional.ofNullable(getProperty("acquireHostListInterval")).map(Integer::valueOf);
+        return Optional.ofNullable(getProperty(KEY_ACQUIRE_HOST_LIST_INTERVAL)).map(Integer::valueOf);
     }
 
     @Override
     public Optional<LoadBalancingStrategy> getLoadBalancingStrategy() {
-        return Optional.ofNullable(getProperty("loadBalancingStrategy")).map(LoadBalancingStrategy::valueOf);
+        return Optional.ofNullable(getProperty(KEY_LOAD_BALANCING_STRATEGY)).map(LoadBalancingStrategy::valueOf);
     }
 
     @Override
     public Optional<Integer> getResponseQueueTimeSamples() {
-        return Optional.ofNullable(getProperty("responseQueueTimeSamples")).map(Integer::valueOf);
+        return Optional.ofNullable(getProperty(KEY_RESPONSE_QUEUE_TIME_SAMPLES)).map(Integer::valueOf);
     }
 
     @Override
     public Optional<Compression> getCompression() {
-        return Optional.ofNullable(getProperty("compression")).map(Compression::valueOf);
+        return Optional.ofNullable(getProperty(KEY_COMPRESSION)).map(Compression::valueOf);
     }
 
     @Override
     public Optional<Integer> getCompressionThreshold() {
-        return Optional.ofNullable(getProperty("compressionThreshold")).map(Integer::valueOf);
+        return Optional.ofNullable(getProperty(KEY_COMPRESSION_THRESHOLD)).map(Integer::valueOf);
     }
 
     @Override
     public Optional<Integer> getCompressionLevel() {
-        return Optional.ofNullable(getProperty("compressionLevel")).map(Integer::valueOf);
+        return Optional.ofNullable(getProperty(KEY_COMPRESSION_LEVEL)).map(Integer::valueOf);
     }
 
     @Override
     public Optional<String> getSerdeProviderClass() {
-        return Optional.ofNullable(getProperty("serdeProviderClass"));
+        return Optional.ofNullable(getProperty(KEY_SERDE_PROVIDER_CLASS));
     }
 
+    @Override
+    public String toString() {
+        return "ArangoConfigPropertiesImpl{" +
+                "prefix='" + prefix + '\'' +
+                ", properties=" + properties +
+                '}';
+    }
 }
diff --git a/driver/pom.xml b/driver/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../release-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>release-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <name>arangodb-java-driver</name>

diff --git a/http-protocol/pom.xml b/http-protocol/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../release-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>release-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <name>http-protocol</name>

diff --git a/jackson-serde-json/pom.xml b/jackson-serde-json/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../release-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>release-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <name>jackson-serde-json</name>

diff --git a/jackson-serde-vpack/pom.xml b/jackson-serde-vpack/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../release-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>release-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <name>jackson-serde-vpack</name>

diff --git a/jsonb-serde/pom.xml b/jsonb-serde/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../release-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>release-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <name>jsonb-serde</name>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.arangodb</groupId>
     <artifactId>arangodb-java-driver-parent</artifactId>
-    <version>7.17.1</version>
+    <version>7.18.0-SNAPSHOT</version>
     <inceptionYear>2016</inceptionYear>
     <modules>
         <module>release-parent</module>

diff --git a/release-parent/pom.xml b/release-parent/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.arangodb</groupId>
         <artifactId>arangodb-java-driver-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/shaded/pom.xml b/shaded/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../release-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>release-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <name>arangodb-java-driver-shaded</name>

diff --git a/test-functional/pom.xml b/test-functional/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../test-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>test-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-functional</artifactId>

diff --git a/test-functional/src/test/java/com/arangodb/UserAgentTest.java b/test-functional/src/test/java/com/arangodb/UserAgentTest.java
@@ -10,7 +10,7 @@
 
 class UserAgentTest extends BaseJunit5 {
 
-    private static final String EXPECTED_VERSION = "7.17.1";
+    private static final String EXPECTED_VERSION = "7.18.0-SNAPSHOT";
 
     private static final boolean SHADED = Boolean.parseBoolean(System.getProperty("shaded"));
 

diff --git a/test-non-functional/pom.xml b/test-non-functional/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../test-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>test-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-non-functional</artifactId>

diff --git a/test-parent/pom.xml b/test-parent/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.arangodb</groupId>
         <artifactId>arangodb-java-driver-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
     <packaging>pom</packaging>
 

diff --git a/test-perf/pom.xml b/test-perf/pom.xml
@@ -7,7 +7,7 @@
         <relativePath>../test-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>test-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-perf</artifactId>

diff --git a/test-resilience/pom.xml b/test-resilience/pom.xml
@@ -6,7 +6,7 @@
         <relativePath>../test-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>test-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/tutorial/gradle/build.gradle b/tutorial/gradle/build.gradle
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.arangodb:arangodb-java-driver:7.17.1'
+    implementation 'com.arangodb:arangodb-java-driver:7.18.0-SNAPSHOT'
 }
 
 ext {

diff --git a/tutorial/maven/pom.xml b/tutorial/maven/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.arangodb</groupId>
             <artifactId>arangodb-java-driver</artifactId>
-            <version>7.17.1</version>
+            <version>7.18.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

diff --git a/vst-protocol/pom.xml b/vst-protocol/pom.xml
@@ -8,7 +8,7 @@
         <relativePath>../release-parent</relativePath>
         <groupId>com.arangodb</groupId>
         <artifactId>release-parent</artifactId>
-        <version>7.17.1</version>
+        <version>7.18.0-SNAPSHOT</version>
     </parent>
 
     <name>vst-protocol</name>
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ repositories { @@
     }
     dependencies {
-        implementation 'com.arangodb:arangodb-java-driver:7.17.1'
+        implementation 'com.arangodb:arangodb-java-driver:7.18.0-SNAPSHOT'
     }
     ext {
@@ Expand Down @@