Skip to content

Commit 91af9e3

Browse files
author
mpv1989
committed
added dependency java-velocypack-module-jdk8
1 parent d2dcc50 commit 91af9e3

File tree

7 files changed

+32
-309
lines changed

7 files changed

+32
-309
lines changed

ChangeLog

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ v4.1.11 (2017-03-xx)
44
* added convenience methods (ArangoCollection.getIndex(String), .deleteIndex(key))
55
* fixed exception handling in Connection (issue #110)
66
* added connection pooling (issue #103)
7+
* extracted VelocyPack implementation to https://github.com/arangodb/java-velocypack
8+
* added dependency java-velocypack-module-jdk8
79

810
v4.1.10 (2017-02-22)
911
---------------------------

pom.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,11 @@
2222

2323
<properties>
2424
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
25-
<arangodb-java-driver.version>${project.version}</arangodb-java-driver.version>
2625
<logback-classic.version>1.1.3</logback-classic.version>
2726
<hamcrest-all.version>1.3</hamcrest-all.version>
2827
<junit.version>4.12</junit.version>
28+
<arangodb-java-driver.version>${project.version}</arangodb-java-driver.version>
29+
<arangodb.velocypack.module.jdk8.version>1.0.0</arangodb.velocypack.module.jdk8.version>
2930
</properties>
3031

3132
<developers>
@@ -200,6 +201,10 @@
200201
<groupId>com.arangodb</groupId>
201202
<artifactId>arangodb-java-driver</artifactId>
202203
</dependency>
204+
<dependency>
205+
<groupId>com.arangodb</groupId>
206+
<artifactId>velocypack-module-jdk8</artifactId>
207+
</dependency>
203208
<dependency>
204209
<groupId>ch.qos.logback</groupId>
205210
<artifactId>logback-classic</artifactId>
@@ -224,6 +229,11 @@
224229
<artifactId>arangodb-java-driver</artifactId>
225230
<version>${arangodb-java-driver.version}</version>
226231
</dependency>
232+
<dependency>
233+
<groupId>com.arangodb</groupId>
234+
<artifactId>velocypack-module-jdk8</artifactId>
235+
<version>${arangodb.velocypack.module.jdk8.version}</version>
236+
</dependency>
227237
<dependency>
228238
<groupId>ch.qos.logback</groupId>
229239
<artifactId>logback-classic</artifactId>

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

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
import com.arangodb.internal.CollectionCache.DBAccess;
4242
import com.arangodb.internal.DocumentCache;
4343
import com.arangodb.internal.InternalArangoDB;
44-
import com.arangodb.internal.velocypack.VPackConfigure;
45-
import com.arangodb.internal.velocypack.VPackConfigureAsync;
44+
import com.arangodb.internal.velocypack.VPackDriverModule;
4645
import com.arangodb.internal.velocystream.Communication;
4746
import com.arangodb.internal.velocystream.CommunicationAsync;
4847
import com.arangodb.internal.velocystream.CommunicationSync;
@@ -61,9 +60,11 @@
6160
import com.arangodb.velocypack.VPackInstanceCreator;
6261
import com.arangodb.velocypack.VPackJsonDeserializer;
6362
import com.arangodb.velocypack.VPackJsonSerializer;
63+
import com.arangodb.velocypack.VPackModule;
6464
import com.arangodb.velocypack.VPackParser;
6565
import com.arangodb.velocypack.VPackSerializer;
6666
import com.arangodb.velocypack.ValueType;
67+
import com.arangodb.velocypack.module.jdk8.VPackJdk8Module;
6768
import com.arangodb.velocystream.Request;
6869
import com.arangodb.velocystream.Response;
6970

@@ -86,15 +87,16 @@ public static class Builder {
8687
private Integer maxConnections;
8788
private final VPack.Builder vpackBuilder;
8889
private final CollectionCache collectionCache;
89-
private final VPackParser vpackParser;
90+
private final VPackParser.Builder vpackParser;
9091

9192
public Builder() {
9293
super();
9394
vpackBuilder = new VPack.Builder();
9495
collectionCache = new CollectionCache();
95-
vpackParser = new VPackParser();
96-
VPackConfigure.configure(vpackBuilder, vpackParser, collectionCache);
97-
VPackConfigureAsync.configure(vpackBuilder);
96+
vpackParser = new VPackParser.Builder();
97+
vpackBuilder.registerModule(new VPackDriverModule(collectionCache));
98+
vpackParser.registerModule(new VPackDriverModule(collectionCache));
99+
vpackBuilder.registerModule(new VPackJdk8Module());
98100
host = new Host(ArangoDBConstants.DEFAULT_HOST, ArangoDBConstants.DEFAULT_PORT);
99101
hosts = new ArrayList<>();
100102
loadProperties(ArangoDBAsync.class.getResourceAsStream(DEFAULT_PROPERTY_FILE));
@@ -264,13 +266,23 @@ public <T extends Annotation> Builder annotationFieldNaming(
264266
return this;
265267
}
266268

269+
public Builder registerModule(final VPackModule module) {
270+
vpackBuilder.registerModule(module);
271+
return this;
272+
}
273+
274+
public Builder registerModules(final VPackModule... modules) {
275+
vpackBuilder.registerModules(modules);
276+
return this;
277+
}
278+
267279
public ArangoDBAsync build() {
268280
if (hosts.isEmpty()) {
269281
hosts.add(host);
270282
}
271283
final HostHandler hostHandler = new DefaultHostHandler(hosts);
272284
return new ArangoDBAsync(asyncBuilder(hostHandler), vpackBuilder.build(),
273-
vpackBuilder.serializeNullValues(true).build(), vpackParser, collectionCache,
285+
vpackBuilder.serializeNullValues(true).build(), vpackParser.build(), collectionCache,
274286
syncBuilder(hostHandler));
275287
}
276288

src/main/java/com/arangodb/internal/velocypack/VPackConfigureAsync.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/main/java/com/arangodb/internal/velocypack/VPackDeserializersAsync.java

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/main/java/com/arangodb/internal/velocypack/VPackSerializersAsync.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)