Skip to content

Commit 498d3f8

Browse files
rashtaorashtao
authored
Expose config properties keys (#601)
* deprecated CollectionStatus * exposed configuration properties keys in ArangoConfigProperties * v7.18.0-SNAPSHOT * ArangoConfigPropertiesImpl.toString() * test fix
1 parent 1f741d8 commit 498d3f8

File tree

22 files changed

+70
-38
lines changed

22 files changed

+70
-38
lines changed

‎core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../release-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>release-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>core</name>

‎core/src/main/java/com/arangodb/config/ArangoConfigProperties.java

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,29 @@
1111

1212
public interface ArangoConfigProperties {
1313

14+
//region configuration properties keys
15+
String KEY_HOSTS = "hosts";
16+
String KEY_PROTOCOL = "protocol";
17+
String KEY_USER = "user";
18+
String KEY_PASSWORD = "password";
19+
String KEY_JWT = "jwt";
20+
String KEY_TIMEOUT = "timeout";
21+
String KEY_USE_SSL = "useSsl";
22+
String KEY_VERIFY_HOST = "verifyHost";
23+
String KEY_CHUNK_SIZE = "chunkSize";
24+
String KEY_MAX_CONNECTIONS = "maxConnections";
25+
String KEY_CONNECTION_TTL = "connectionTtl";
26+
String KEY_KEEP_ALIVE_INTERVAL = "keepAliveInterval";
27+
String KEY_ACQUIRE_HOST_LIST = "acquireHostList";
28+
String KEY_ACQUIRE_HOST_LIST_INTERVAL = "acquireHostListInterval";
29+
String KEY_LOAD_BALANCING_STRATEGY = "loadBalancingStrategy";
30+
String KEY_RESPONSE_QUEUE_TIME_SAMPLES = "responseQueueTimeSamples";
31+
String KEY_COMPRESSION = "compression";
32+
String KEY_COMPRESSION_THRESHOLD = "compressionThreshold";
33+
String KEY_COMPRESSION_LEVEL = "compressionLevel";
34+
String KEY_SERDE_PROVIDER_CLASS = "serdeProviderClass";
35+
//endregion
36+
1437
/**
1538
* Reads properties from file arangodb.properties.
1639
* Properties must be prefixed with @{code "arangodb"}, eg. @{code "arangodb.hosts=localhost:8529"}.

‎core/src/main/java/com/arangodb/entity/CollectionEntity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public Boolean getIsSystem() {
6060
return isSystem;
6161
}
6262

63+
@Deprecated
6364
public CollectionStatus getStatus() {
6465
return status;
6566
}

‎core/src/main/java/com/arangodb/entity/CollectionStatus.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/**
2424
* @author Mark Vollmary
2525
*/
26+
@Deprecated
2627
public enum CollectionStatus {
2728

2829
LOADED(3), DELETED(5);

‎core/src/main/java/com/arangodb/internal/config/ArangoConfigPropertiesImpl.java

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private String getProperty(String key) {
6868

6969
@Override
7070
public Optional<List<HostDescription>> getHosts() {
71-
return Optional.ofNullable(getProperty("hosts"))
71+
return Optional.ofNullable(getProperty(KEY_HOSTS))
7272
.map(s -> {
7373
List<HostDescription> hostDescriptions = new ArrayList<>();
7474
String[] hosts = s.split(",");
@@ -81,97 +81,104 @@ public Optional<List<HostDescription>> getHosts() {
8181

8282
@Override
8383
public Optional<Protocol> getProtocol() {
84-
return Optional.ofNullable(getProperty("protocol")).map(Protocol::valueOf);
84+
return Optional.ofNullable(getProperty(KEY_PROTOCOL)).map(Protocol::valueOf);
8585
}
8686

8787
@Override
8888
public Optional<String> getUser() {
89-
return Optional.ofNullable(getProperty("user"));
89+
return Optional.ofNullable(getProperty(KEY_USER));
9090
}
9191

9292
@Override
9393
public Optional<String> getPassword() {
94-
return Optional.ofNullable(getProperty("password"));
94+
return Optional.ofNullable(getProperty(KEY_PASSWORD));
9595
}
9696

9797
@Override
9898
public Optional<String> getJwt() {
99-
return Optional.ofNullable(getProperty("jwt"));
99+
return Optional.ofNullable(getProperty(KEY_JWT));
100100
}
101101

102102
@Override
103103
public Optional<Integer> getTimeout() {
104-
return Optional.ofNullable(getProperty("timeout")).map(Integer::valueOf);
104+
return Optional.ofNullable(getProperty(KEY_TIMEOUT)).map(Integer::valueOf);
105105
}
106106

107107
@Override
108108
public Optional<Boolean> getUseSsl() {
109-
return Optional.ofNullable(getProperty("useSsl")).map(Boolean::valueOf);
109+
return Optional.ofNullable(getProperty(KEY_USE_SSL)).map(Boolean::valueOf);
110110
}
111111

112112
@Override
113113
public Optional<Boolean> getVerifyHost() {
114-
return Optional.ofNullable(getProperty("verifyHost")).map(Boolean::valueOf);
114+
return Optional.ofNullable(getProperty(KEY_VERIFY_HOST)).map(Boolean::valueOf);
115115
}
116116

117117
@Override
118118
public Optional<Integer> getChunkSize() {
119-
return Optional.ofNullable(getProperty("chunkSize")).map(Integer::valueOf);
119+
return Optional.ofNullable(getProperty(KEY_CHUNK_SIZE)).map(Integer::valueOf);
120120
}
121121

122122
@Override
123123
public Optional<Integer> getMaxConnections() {
124-
return Optional.ofNullable(getProperty("maxConnections")).map(Integer::valueOf);
124+
return Optional.ofNullable(getProperty(KEY_MAX_CONNECTIONS)).map(Integer::valueOf);
125125
}
126126

127127
@Override
128128
public Optional<Long> getConnectionTtl() {
129-
return Optional.ofNullable(getProperty("connectionTtl")).map(Long::valueOf);
129+
return Optional.ofNullable(getProperty(KEY_CONNECTION_TTL)).map(Long::valueOf);
130130
}
131131

132132
@Override
133133
public Optional<Integer> getKeepAliveInterval() {
134-
return Optional.ofNullable(getProperty("keepAliveInterval")).map(Integer::valueOf);
134+
return Optional.ofNullable(getProperty(KEY_KEEP_ALIVE_INTERVAL)).map(Integer::valueOf);
135135
}
136136

137137
@Override
138138
public Optional<Boolean> getAcquireHostList() {
139-
return Optional.ofNullable(getProperty("acquireHostList")).map(Boolean::valueOf);
139+
return Optional.ofNullable(getProperty(KEY_ACQUIRE_HOST_LIST)).map(Boolean::valueOf);
140140
}
141141

142142
@Override
143143
public Optional<Integer> getAcquireHostListInterval() {
144-
return Optional.ofNullable(getProperty("acquireHostListInterval")).map(Integer::valueOf);
144+
return Optional.ofNullable(getProperty(KEY_ACQUIRE_HOST_LIST_INTERVAL)).map(Integer::valueOf);
145145
}
146146

147147
@Override
148148
public Optional<LoadBalancingStrategy> getLoadBalancingStrategy() {
149-
return Optional.ofNullable(getProperty("loadBalancingStrategy")).map(LoadBalancingStrategy::valueOf);
149+
return Optional.ofNullable(getProperty(KEY_LOAD_BALANCING_STRATEGY)).map(LoadBalancingStrategy::valueOf);
150150
}
151151

152152
@Override
153153
public Optional<Integer> getResponseQueueTimeSamples() {
154-
return Optional.ofNullable(getProperty("responseQueueTimeSamples")).map(Integer::valueOf);
154+
return Optional.ofNullable(getProperty(KEY_RESPONSE_QUEUE_TIME_SAMPLES)).map(Integer::valueOf);
155155
}
156156

157157
@Override
158158
public Optional<Compression> getCompression() {
159-
return Optional.ofNullable(getProperty("compression")).map(Compression::valueOf);
159+
return Optional.ofNullable(getProperty(KEY_COMPRESSION)).map(Compression::valueOf);
160160
}
161161

162162
@Override
163163
public Optional<Integer> getCompressionThreshold() {
164-
return Optional.ofNullable(getProperty("compressionThreshold")).map(Integer::valueOf);
164+
return Optional.ofNullable(getProperty(KEY_COMPRESSION_THRESHOLD)).map(Integer::valueOf);
165165
}
166166

167167
@Override
168168
public Optional<Integer> getCompressionLevel() {
169-
return Optional.ofNullable(getProperty("compressionLevel")).map(Integer::valueOf);
169+
return Optional.ofNullable(getProperty(KEY_COMPRESSION_LEVEL)).map(Integer::valueOf);
170170
}
171171

172172
@Override
173173
public Optional<String> getSerdeProviderClass() {
174-
return Optional.ofNullable(getProperty("serdeProviderClass"));
174+
return Optional.ofNullable(getProperty(KEY_SERDE_PROVIDER_CLASS));
175175
}
176176

177+
@Override
178+
public String toString() {
179+
return "ArangoConfigPropertiesImpl{" +
180+
"prefix='" + prefix + '\'' +
181+
", properties=" + properties +
182+
'}';
183+
}
177184
}

‎driver/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../release-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>release-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>arangodb-java-driver</name>

‎http-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../release-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>release-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>http-protocol</name>

‎jackson-serde-json/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../release-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>release-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>jackson-serde-json</name>

‎jackson-serde-vpack/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../release-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>release-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>jackson-serde-vpack</name>

‎jsonb-serde/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../release-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>release-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>jsonb-serde</name>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.arangodb</groupId>
77
<artifactId>arangodb-java-driver-parent</artifactId>
8-
<version>7.17.1</version>
8+
<version>7.18.0-SNAPSHOT</version>
99
<inceptionYear>2016</inceptionYear>
1010
<modules>
1111
<module>release-parent</module>

‎release-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.arangodb</groupId>
88
<artifactId>arangodb-java-driver-parent</artifactId>
9-
<version>7.17.1</version>
9+
<version>7.18.0-SNAPSHOT</version>
1010
</parent>
1111
<packaging>pom</packaging>
1212

‎shaded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../release-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>release-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>arangodb-java-driver-shaded</name>

‎test-functional/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../test-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>test-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>test-functional</artifactId>

‎test-functional/src/test/java/com/arangodb/UserAgentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class UserAgentTest extends BaseJunit5 {
1212

13-
private static final String EXPECTED_VERSION = "7.17.1";
13+
private static final String EXPECTED_VERSION = "7.18.0-SNAPSHOT";
1414

1515
private static final boolean SHADED = Boolean.parseBoolean(System.getProperty("shaded"));
1616

‎test-non-functional/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../test-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>test-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>test-non-functional</artifactId>

‎test-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.arangodb</groupId>
99
<artifactId>arangodb-java-driver-parent</artifactId>
10-
<version>7.17.1</version>
10+
<version>7.18.0-SNAPSHOT</version>
1111
</parent>
1212
<packaging>pom</packaging>
1313

‎test-perf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<relativePath>../test-parent</relativePath>
88
<groupId>com.arangodb</groupId>
99
<artifactId>test-parent</artifactId>
10-
<version>7.17.1</version>
10+
<version>7.18.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>test-perf</artifactId>

‎test-resilience/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<relativePath>../test-parent</relativePath>
77
<groupId>com.arangodb</groupId>
88
<artifactId>test-parent</artifactId>
9-
<version>7.17.1</version>
9+
<version>7.18.0-SNAPSHOT</version>
1010
</parent>
1111
<modelVersion>4.0.0</modelVersion>
1212

‎tutorial/gradle/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ repositories {
1212
}
1313

1414
dependencies {
15-
implementation 'com.arangodb:arangodb-java-driver:7.17.1'
15+
implementation 'com.arangodb:arangodb-java-driver:7.18.0-SNAPSHOT'
1616
}
1717

1818
ext {

‎tutorial/maven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>com.arangodb</groupId>
2121
<artifactId>arangodb-java-driver</artifactId>
22-
<version>7.17.1</version>
22+
<version>7.18.0-SNAPSHOT</version>
2323
</dependency>
2424
</dependencies>
2525

‎vst-protocol/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../release-parent</relativePath>
99
<groupId>com.arangodb</groupId>
1010
<artifactId>release-parent</artifactId>
11-
<version>7.17.1</version>
11+
<version>7.18.0-SNAPSHOT</version>
1212
</parent>
1313

1414
<name>vst-protocol</name>

0 commit comments

Comments
 (0)