From 6a5f8a0572da3761ff5e64f88508122bc37612bd Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Thu, 10 Apr 2025 08:56:51 +0200 Subject: [PATCH 1/5] deprecated CollectionStatus --- core/src/main/java/com/arangodb/entity/CollectionEntity.java | 1 + core/src/main/java/com/arangodb/entity/CollectionStatus.java | 1 + 2 files changed, 2 insertions(+) diff --git a/core/src/main/java/com/arangodb/entity/CollectionEntity.java b/core/src/main/java/com/arangodb/entity/CollectionEntity.java index 0d98b2598..45ddeaf12 100644 --- 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 index b3d30f5d6..39b7863b9 100644 --- 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); From 92c288c1d4c36bcdabad8fab116a9a42c87766a0 Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Tue, 15 Apr 2025 13:41:07 +0200 Subject: [PATCH 2/5] exposed configuration properties keys in ArangoConfigProperties --- .../config/ArangoConfigProperties.java | 23 +++++++++++ .../config/ArangoConfigPropertiesImpl.java | 40 +++++++++---------- 2 files changed, 43 insertions(+), 20 deletions(-) diff --git a/core/src/main/java/com/arangodb/config/ArangoConfigProperties.java b/core/src/main/java/com/arangodb/config/ArangoConfigProperties.java index 1a67eb3fb..047d55280 100644 --- 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/internal/config/ArangoConfigPropertiesImpl.java b/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java index 2200db752..575971e54 100644 --- 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> getHosts() { - return Optional.ofNullable(getProperty("hosts")) + return Optional.ofNullable(getProperty(KEY_HOSTS)) .map(s -> { List hostDescriptions = new ArrayList<>(); String[] hosts = s.split(","); @@ -81,97 +81,97 @@ public Optional> getHosts() { @Override public Optional getProtocol() { - return Optional.ofNullable(getProperty("protocol")).map(Protocol::valueOf); + return Optional.ofNullable(getProperty(KEY_PROTOCOL)).map(Protocol::valueOf); } @Override public Optional getUser() { - return Optional.ofNullable(getProperty("user")); + return Optional.ofNullable(getProperty(KEY_USER)); } @Override public Optional getPassword() { - return Optional.ofNullable(getProperty("password")); + return Optional.ofNullable(getProperty(KEY_PASSWORD)); } @Override public Optional getJwt() { - return Optional.ofNullable(getProperty("jwt")); + return Optional.ofNullable(getProperty(KEY_JWT)); } @Override public Optional getTimeout() { - return Optional.ofNullable(getProperty("timeout")).map(Integer::valueOf); + return Optional.ofNullable(getProperty(KEY_TIMEOUT)).map(Integer::valueOf); } @Override public Optional getUseSsl() { - return Optional.ofNullable(getProperty("useSsl")).map(Boolean::valueOf); + return Optional.ofNullable(getProperty(KEY_USE_SSL)).map(Boolean::valueOf); } @Override public Optional getVerifyHost() { - return Optional.ofNullable(getProperty("verifyHost")).map(Boolean::valueOf); + return Optional.ofNullable(getProperty(KEY_VERIFY_HOST)).map(Boolean::valueOf); } @Override public Optional getChunkSize() { - return Optional.ofNullable(getProperty("chunkSize")).map(Integer::valueOf); + return Optional.ofNullable(getProperty(KEY_CHUNK_SIZE)).map(Integer::valueOf); } @Override public Optional getMaxConnections() { - return Optional.ofNullable(getProperty("maxConnections")).map(Integer::valueOf); + return Optional.ofNullable(getProperty(KEY_MAX_CONNECTIONS)).map(Integer::valueOf); } @Override public Optional getConnectionTtl() { - return Optional.ofNullable(getProperty("connectionTtl")).map(Long::valueOf); + return Optional.ofNullable(getProperty(KEY_CONNECTION_TTL)).map(Long::valueOf); } @Override public Optional getKeepAliveInterval() { - return Optional.ofNullable(getProperty("keepAliveInterval")).map(Integer::valueOf); + return Optional.ofNullable(getProperty(KEY_KEEP_ALIVE_INTERVAL)).map(Integer::valueOf); } @Override public Optional getAcquireHostList() { - return Optional.ofNullable(getProperty("acquireHostList")).map(Boolean::valueOf); + return Optional.ofNullable(getProperty(KEY_ACQUIRE_HOST_LIST)).map(Boolean::valueOf); } @Override public Optional getAcquireHostListInterval() { - return Optional.ofNullable(getProperty("acquireHostListInterval")).map(Integer::valueOf); + return Optional.ofNullable(getProperty(KEY_ACQUIRE_HOST_LIST_INTERVAL)).map(Integer::valueOf); } @Override public Optional getLoadBalancingStrategy() { - return Optional.ofNullable(getProperty("loadBalancingStrategy")).map(LoadBalancingStrategy::valueOf); + return Optional.ofNullable(getProperty(KEY_LOAD_BALANCING_STRATEGY)).map(LoadBalancingStrategy::valueOf); } @Override public Optional getResponseQueueTimeSamples() { - return Optional.ofNullable(getProperty("responseQueueTimeSamples")).map(Integer::valueOf); + return Optional.ofNullable(getProperty(KEY_RESPONSE_QUEUE_TIME_SAMPLES)).map(Integer::valueOf); } @Override public Optional getCompression() { - return Optional.ofNullable(getProperty("compression")).map(Compression::valueOf); + return Optional.ofNullable(getProperty(KEY_COMPRESSION)).map(Compression::valueOf); } @Override public Optional getCompressionThreshold() { - return Optional.ofNullable(getProperty("compressionThreshold")).map(Integer::valueOf); + return Optional.ofNullable(getProperty(KEY_COMPRESSION_THRESHOLD)).map(Integer::valueOf); } @Override public Optional getCompressionLevel() { - return Optional.ofNullable(getProperty("compressionLevel")).map(Integer::valueOf); + return Optional.ofNullable(getProperty(KEY_COMPRESSION_LEVEL)).map(Integer::valueOf); } @Override public Optional getSerdeProviderClass() { - return Optional.ofNullable(getProperty("serdeProviderClass")); + return Optional.ofNullable(getProperty(KEY_SERDE_PROVIDER_CLASS)); } } From 8b90fe85479f00926a41da1f0d6ea016e3955092 Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Tue, 15 Apr 2025 13:43:10 +0200 Subject: [PATCH 3/5] v7.18.0-SNAPSHOT --- core/pom.xml | 2 +- driver/pom.xml | 2 +- http-protocol/pom.xml | 2 +- jackson-serde-json/pom.xml | 2 +- jackson-serde-vpack/pom.xml | 2 +- jsonb-serde/pom.xml | 2 +- pom.xml | 2 +- release-parent/pom.xml | 2 +- shaded/pom.xml | 2 +- test-functional/pom.xml | 2 +- test-functional/src/test/java/com/arangodb/UserAgentTest.java | 2 +- test-non-functional/pom.xml | 2 +- test-parent/pom.xml | 2 +- test-perf/pom.xml | 2 +- test-resilience/pom.xml | 2 +- tutorial/gradle/build.gradle | 2 +- tutorial/maven/pom.xml | 2 +- vst-protocol/pom.xml | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 0bf00504e..234772269 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -8,7 +8,7 @@ ../release-parent com.arangodb release-parent - 7.17.1 + 7.18.0-SNAPSHOT core diff --git a/driver/pom.xml b/driver/pom.xml index 00c6a7538..29cf75858 100644 --- a/driver/pom.xml +++ b/driver/pom.xml @@ -8,7 +8,7 @@ ../release-parent com.arangodb release-parent - 7.17.1 + 7.18.0-SNAPSHOT arangodb-java-driver diff --git a/http-protocol/pom.xml b/http-protocol/pom.xml index 8aa53917c..fc5ad573b 100644 --- a/http-protocol/pom.xml +++ b/http-protocol/pom.xml @@ -8,7 +8,7 @@ ../release-parent com.arangodb release-parent - 7.17.1 + 7.18.0-SNAPSHOT http-protocol diff --git a/jackson-serde-json/pom.xml b/jackson-serde-json/pom.xml index 8083d67ff..0b63279a4 100644 --- a/jackson-serde-json/pom.xml +++ b/jackson-serde-json/pom.xml @@ -8,7 +8,7 @@ ../release-parent com.arangodb release-parent - 7.17.1 + 7.18.0-SNAPSHOT jackson-serde-json diff --git a/jackson-serde-vpack/pom.xml b/jackson-serde-vpack/pom.xml index 2194634b4..553778b48 100644 --- a/jackson-serde-vpack/pom.xml +++ b/jackson-serde-vpack/pom.xml @@ -8,7 +8,7 @@ ../release-parent com.arangodb release-parent - 7.17.1 + 7.18.0-SNAPSHOT jackson-serde-vpack diff --git a/jsonb-serde/pom.xml b/jsonb-serde/pom.xml index 04efb67d7..7267fb9ee 100644 --- a/jsonb-serde/pom.xml +++ b/jsonb-serde/pom.xml @@ -8,7 +8,7 @@ ../release-parent com.arangodb release-parent - 7.17.1 + 7.18.0-SNAPSHOT jsonb-serde diff --git a/pom.xml b/pom.xml index 137e7ec52..562de1a4f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.arangodb arangodb-java-driver-parent - 7.17.1 + 7.18.0-SNAPSHOT 2016 release-parent diff --git a/release-parent/pom.xml b/release-parent/pom.xml index cf5d8d17d..89bc1d3d1 100644 --- a/release-parent/pom.xml +++ b/release-parent/pom.xml @@ -6,7 +6,7 @@ com.arangodb arangodb-java-driver-parent - 7.17.1 + 7.18.0-SNAPSHOT pom diff --git a/shaded/pom.xml b/shaded/pom.xml index 6df2985ae..79aab34e6 100644 --- a/shaded/pom.xml +++ b/shaded/pom.xml @@ -8,7 +8,7 @@ ../release-parent com.arangodb release-parent - 7.17.1 + 7.18.0-SNAPSHOT arangodb-java-driver-shaded diff --git a/test-functional/pom.xml b/test-functional/pom.xml index 1e8c024f3..688afb06a 100644 --- a/test-functional/pom.xml +++ b/test-functional/pom.xml @@ -8,7 +8,7 @@ ../test-parent com.arangodb test-parent - 7.17.1 + 7.18.0-SNAPSHOT test-functional diff --git a/test-functional/src/test/java/com/arangodb/UserAgentTest.java b/test-functional/src/test/java/com/arangodb/UserAgentTest.java index 6ea78187d..aa794f069 100644 --- 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"; private static final boolean SHADED = Boolean.parseBoolean(System.getProperty("shaded")); diff --git a/test-non-functional/pom.xml b/test-non-functional/pom.xml index aa10ed6b5..c693f7826 100644 --- a/test-non-functional/pom.xml +++ b/test-non-functional/pom.xml @@ -8,7 +8,7 @@ ../test-parent com.arangodb test-parent - 7.17.1 + 7.18.0-SNAPSHOT test-non-functional diff --git a/test-parent/pom.xml b/test-parent/pom.xml index 3a5e5d5bc..ce7b2801a 100644 --- a/test-parent/pom.xml +++ b/test-parent/pom.xml @@ -7,7 +7,7 @@ com.arangodb arangodb-java-driver-parent - 7.17.1 + 7.18.0-SNAPSHOT pom diff --git a/test-perf/pom.xml b/test-perf/pom.xml index 037ddc4bc..f5ff8a5d1 100644 --- a/test-perf/pom.xml +++ b/test-perf/pom.xml @@ -7,7 +7,7 @@ ../test-parent com.arangodb test-parent - 7.17.1 + 7.18.0-SNAPSHOT test-perf diff --git a/test-resilience/pom.xml b/test-resilience/pom.xml index 3ceb9aa00..c9b674891 100644 --- a/test-resilience/pom.xml +++ b/test-resilience/pom.xml @@ -6,7 +6,7 @@ ../test-parent com.arangodb test-parent - 7.17.1 + 7.18.0-SNAPSHOT 4.0.0 diff --git a/tutorial/gradle/build.gradle b/tutorial/gradle/build.gradle index c13e3adc3..cb34d15d7 100644 --- 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' } ext { diff --git a/tutorial/maven/pom.xml b/tutorial/maven/pom.xml index 5cf6ffcdd..bf31617f6 100644 --- a/tutorial/maven/pom.xml +++ b/tutorial/maven/pom.xml @@ -19,7 +19,7 @@ com.arangodb arangodb-java-driver - 7.17.1 + 7.18.0-SNAPSHOT diff --git a/vst-protocol/pom.xml b/vst-protocol/pom.xml index c86b37b7b..3e9ceb3b9 100644 --- a/vst-protocol/pom.xml +++ b/vst-protocol/pom.xml @@ -8,7 +8,7 @@ ../release-parent com.arangodb release-parent - 7.17.1 + 7.18.0-SNAPSHOT vst-protocol From bb307e710794f9fb757d4a259cb6544df3036814 Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Fri, 25 Apr 2025 14:24:09 +0200 Subject: [PATCH 4/5] ArangoConfigPropertiesImpl.toString() --- .../internal/config/ArangoConfigPropertiesImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java b/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java index 575971e54..e4502d3d8 100644 --- a/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java +++ b/core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java @@ -174,4 +174,11 @@ public Optional getSerdeProviderClass() { return Optional.ofNullable(getProperty(KEY_SERDE_PROVIDER_CLASS)); } + @Override + public String toString() { + return "ArangoConfigPropertiesImpl{" + + "prefix='" + prefix + '\'' + + ", properties=" + properties + + '}'; + } } From d411c332c7330304800742b59f5eb980c9c43640 Mon Sep 17 00:00:00 2001 From: Michele Rastelli Date: Fri, 25 Apr 2025 14:37:47 +0200 Subject: [PATCH 5/5] test fix --- test-functional/src/test/java/com/arangodb/UserAgentTest.java | 2 +- tutorial/gradle/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test-functional/src/test/java/com/arangodb/UserAgentTest.java b/test-functional/src/test/java/com/arangodb/UserAgentTest.java index aa794f069..39e958d64 100644 --- 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.18.0"; + private static final String EXPECTED_VERSION = "7.18.0-SNAPSHOT"; private static final boolean SHADED = Boolean.parseBoolean(System.getProperty("shaded")); diff --git a/tutorial/gradle/build.gradle b/tutorial/gradle/build.gradle index cb34d15d7..e9d2e9132 100644 --- a/tutorial/gradle/build.gradle +++ b/tutorial/gradle/build.gradle @@ -12,7 +12,7 @@ repositories { } dependencies { - implementation 'com.arangodb:arangodb-java-driver:7.18.0' + implementation 'com.arangodb:arangodb-java-driver:7.18.0-SNAPSHOT' } ext {