Skip to content

Commit 872351b

Browse files
author
mpv1989
committed
Added HTTP with Velocypack content
1 parent 52ef027 commit 872351b

35 files changed

+132
-124
lines changed

‎src/main/java/com/arangodb/ArangoCollection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import com.arangodb.entity.MultiDocumentEntity;
3737
import com.arangodb.internal.ArangoExecutorSync;
3838
import com.arangodb.internal.InternalArangoCollection;
39-
import com.arangodb.internal.velocystream.ConnectionSync;
39+
import com.arangodb.internal.velocystream.internal.ConnectionSync;
4040
import com.arangodb.model.CollectionPropertiesOptions;
4141
import com.arangodb.model.DocumentCreateOptions;
4242
import com.arangodb.model.DocumentDeleteOptions;

‎src/main/java/com/arangodb/ArangoDB.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@
4141
import com.arangodb.internal.CollectionCache;
4242
import com.arangodb.internal.CollectionCache.DBAccess;
4343
import com.arangodb.internal.CommunicationProtocol;
44+
import com.arangodb.internal.DefaultHostHandler;
4445
import com.arangodb.internal.DocumentCache;
46+
import com.arangodb.internal.Host;
4547
import com.arangodb.internal.InternalArangoDB;
4648
import com.arangodb.internal.http.HttpCommunication;
4749
import com.arangodb.internal.http.HttpProtocol;
@@ -50,11 +52,9 @@
5052
import com.arangodb.internal.util.ArangoUtilImpl;
5153
import com.arangodb.internal.velocypack.VPackDocumentModule;
5254
import com.arangodb.internal.velocypack.VPackDriverModule;
53-
import com.arangodb.internal.velocystream.CommunicationSync;
54-
import com.arangodb.internal.velocystream.ConnectionSync;
55-
import com.arangodb.internal.velocystream.DefaultHostHandler;
56-
import com.arangodb.internal.velocystream.Host;
57-
import com.arangodb.internal.velocystream.VelocyStreamProtocol;
55+
import com.arangodb.internal.velocystream.VstCommunicationSync;
56+
import com.arangodb.internal.velocystream.VstProtocol;
57+
import com.arangodb.internal.velocystream.internal.ConnectionSync;
5858
import com.arangodb.model.LogOptions;
5959
import com.arangodb.model.UserCreateOptions;
6060
import com.arangodb.model.UserUpdateOptions;
@@ -346,18 +346,18 @@ public synchronized ArangoDB build() {
346346
final ArangoDeserializer deserializerTemp = deserializer != null ? deserializer
347347
: new ArangoDeserializerImpl(vpackerNull, vpackParser);
348348
return new ArangoDB(
349-
new CommunicationSync.Builder(new DefaultHostHandler(new ArrayList<Host>(hosts))).timeout(timeout)
350-
.user(user).password(password).useSsl(useSsl).sslContext(sslContext).chunksize(chunksize)
351-
.maxConnections(maxConnections),
352-
new HttpCommunication.Builder(new DefaultHostHandler(new ArrayList<Host>(hosts))).timeout(timeout)
353-
.user(user).password(password).useSsl(useSsl).sslContext(sslContext)
349+
new VstCommunicationSync.Builder(new DefaultHostHandler(new ArrayList<Host>(hosts)))
350+
.timeout(timeout).user(user).password(password).useSsl(useSsl).sslContext(sslContext)
351+
.chunksize(chunksize).maxConnections(maxConnections),
352+
new HttpCommunication.Builder(new DefaultHostHandler(new ArrayList<Host>(hosts)), protocol)
353+
.timeout(timeout).user(user).password(password).useSsl(useSsl).sslContext(sslContext)
354354
.maxConnections(maxConnections),
355355
new ArangoUtilImpl(serializerTemp, deserializerTemp), collectionCache, protocol);
356356
}
357357

358358
}
359359

360-
public ArangoDB(final CommunicationSync.Builder vstBuilder, final HttpCommunication.Builder httpBuilder,
360+
public ArangoDB(final VstCommunicationSync.Builder vstBuilder, final HttpCommunication.Builder httpBuilder,
361361
final ArangoSerialization util, final CollectionCache collectionCache, final Protocol protocol) {
362362
super(new ArangoExecutorSync(createProtocol(vstBuilder, httpBuilder, util, collectionCache, protocol), util,
363363
new DocumentCache()), util);
@@ -371,7 +371,7 @@ public ArangoDatabase db(final String name) {
371371
}
372372

373373
private static CommunicationProtocol createProtocol(
374-
final CommunicationSync.Builder vstBuilder,
374+
final VstCommunicationSync.Builder vstBuilder,
375375
final HttpCommunication.Builder httpBuilder,
376376
final ArangoSerialization util,
377377
final CollectionCache collectionCache,
@@ -381,10 +381,10 @@ private static CommunicationProtocol createProtocol(
381381
}
382382

383383
private static CommunicationProtocol createVST(
384-
final CommunicationSync.Builder builder,
384+
final VstCommunicationSync.Builder builder,
385385
final ArangoSerialization util,
386386
final CollectionCache collectionCache) {
387-
return new VelocyStreamProtocol(builder.build(util, collectionCache));
387+
return new VstProtocol(builder.build(util, collectionCache));
388388
}
389389

390390
private static CommunicationProtocol createHTTP(

‎src/main/java/com/arangodb/ArangoDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import com.arangodb.internal.CommunicationProtocol;
4343
import com.arangodb.internal.DocumentCache;
4444
import com.arangodb.internal.InternalArangoDatabase;
45-
import com.arangodb.internal.velocystream.ConnectionSync;
45+
import com.arangodb.internal.velocystream.internal.ConnectionSync;
4646
import com.arangodb.model.AqlFunctionCreateOptions;
4747
import com.arangodb.model.AqlFunctionDeleteOptions;
4848
import com.arangodb.model.AqlFunctionGetOptions;

‎src/main/java/com/arangodb/ArangoEdgeCollection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.arangodb.entity.EdgeUpdateEntity;
2828
import com.arangodb.internal.ArangoExecutorSync;
2929
import com.arangodb.internal.InternalArangoEdgeCollection;
30-
import com.arangodb.internal.velocystream.ConnectionSync;
30+
import com.arangodb.internal.velocystream.internal.ConnectionSync;
3131
import com.arangodb.model.DocumentReadOptions;
3232
import com.arangodb.model.EdgeCreateOptions;
3333
import com.arangodb.model.EdgeDeleteOptions;

‎src/main/java/com/arangodb/ArangoGraph.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.arangodb.entity.GraphEntity;
2727
import com.arangodb.internal.ArangoExecutorSync;
2828
import com.arangodb.internal.InternalArangoGraph;
29-
import com.arangodb.internal.velocystream.ConnectionSync;
29+
import com.arangodb.internal.velocystream.internal.ConnectionSync;
3030
import com.arangodb.velocystream.Response;
3131

3232
/**

‎src/main/java/com/arangodb/ArangoVertexCollection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.arangodb.entity.VertexUpdateEntity;
2828
import com.arangodb.internal.ArangoExecutorSync;
2929
import com.arangodb.internal.InternalArangoVertexCollection;
30-
import com.arangodb.internal.velocystream.ConnectionSync;
30+
import com.arangodb.internal.velocystream.internal.ConnectionSync;
3131
import com.arangodb.model.DocumentReadOptions;
3232
import com.arangodb.model.VertexCreateOptions;
3333
import com.arangodb.model.VertexDeleteOptions;

‎src/main/java/com/arangodb/Protocol.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
*
2626
*/
2727
public enum Protocol {
28-
VST, HTTP, HTTP_WITH_JSON, HTTP_WITH_VPACK // TODO
28+
VST, HTTP_JSON, HTTP_VPACK
2929
}

‎src/main/java/com/arangodb/internal/ArangoExecuteable.java

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

2121
package com.arangodb.internal;
2222

23-
import com.arangodb.internal.velocystream.Connection;
23+
import com.arangodb.internal.velocystream.internal.Connection;
2424
import com.arangodb.util.ArangoSerialization;
2525

2626
/**

‎src/main/java/com/arangodb/internal/velocystream/DefaultHostHandler.java renamed to ‎src/main/java/com/arangodb/internal/DefaultHostHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright holder is ArangoDB GmbH, Cologne, Germany
1919
*/
2020

21-
package com.arangodb.internal.velocystream;
21+
package com.arangodb.internal;
2222

2323
import java.util.List;
2424

‎src/main/java/com/arangodb/internal/velocystream/Host.java renamed to ‎src/main/java/com/arangodb/internal/Host.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright holder is ArangoDB GmbH, Cologne, Germany
1919
*/
2020

21-
package com.arangodb.internal.velocystream;
21+
package com.arangodb.internal;
2222

2323
/**
2424
* @author Mark - mark at arangodb.com

‎src/main/java/com/arangodb/internal/velocystream/HostHandler.java renamed to ‎src/main/java/com/arangodb/internal/HostHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* Copyright holder is ArangoDB GmbH, Cologne, Germany
1919
*/
2020

21-
package com.arangodb.internal.velocystream;
21+
package com.arangodb.internal;
2222

2323
/**
2424
* @author Mark - mark at arangodb.com

‎src/main/java/com/arangodb/internal/InternalArangoCollection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import com.arangodb.entity.IndexEntity;
3636
import com.arangodb.entity.MultiDocumentEntity;
3737
import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
38-
import com.arangodb.internal.velocystream.Connection;
38+
import com.arangodb.internal.velocystream.internal.Connection;
3939
import com.arangodb.model.CollectionPropertiesOptions;
4040
import com.arangodb.model.CollectionRenameOptions;
4141
import com.arangodb.model.DocumentCreateOptions;

‎src/main/java/com/arangodb/internal/InternalArangoDB.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
import com.arangodb.entity.ServerRole;
3232
import com.arangodb.entity.UserEntity;
3333
import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
34-
import com.arangodb.internal.velocystream.Connection;
35-
import com.arangodb.internal.velocystream.Host;
34+
import com.arangodb.internal.velocystream.internal.Connection;
3635
import com.arangodb.model.DBCreateOptions;
3736
import com.arangodb.model.LogOptions;
3837
import com.arangodb.model.OptionsBuilder;

‎src/main/java/com/arangodb/internal/InternalArangoDatabase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import com.arangodb.entity.QueryTrackingPropertiesEntity;
3535
import com.arangodb.entity.TraversalEntity;
3636
import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
37-
import com.arangodb.internal.velocystream.Connection;
37+
import com.arangodb.internal.velocystream.internal.Connection;
3838
import com.arangodb.model.AqlFunctionCreateOptions;
3939
import com.arangodb.model.AqlFunctionDeleteOptions;
4040
import com.arangodb.model.AqlFunctionGetOptions;

‎src/main/java/com/arangodb/internal/InternalArangoEdgeCollection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.arangodb.entity.EdgeEntity;
2828
import com.arangodb.entity.EdgeUpdateEntity;
2929
import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
30-
import com.arangodb.internal.velocystream.Connection;
30+
import com.arangodb.internal.velocystream.internal.Connection;
3131
import com.arangodb.model.DocumentReadOptions;
3232
import com.arangodb.model.EdgeCreateOptions;
3333
import com.arangodb.model.EdgeDeleteOptions;

‎src/main/java/com/arangodb/internal/InternalArangoGraph.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.arangodb.entity.EdgeDefinition;
2626
import com.arangodb.entity.GraphEntity;
2727
import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
28-
import com.arangodb.internal.velocystream.Connection;
28+
import com.arangodb.internal.velocystream.internal.Connection;
2929
import com.arangodb.model.OptionsBuilder;
3030
import com.arangodb.model.VertexCollectionCreateOptions;
3131
import com.arangodb.velocypack.Type;

‎src/main/java/com/arangodb/internal/InternalArangoVertexCollection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.arangodb.entity.VertexEntity;
2828
import com.arangodb.entity.VertexUpdateEntity;
2929
import com.arangodb.internal.ArangoExecutor.ResponseDeserializer;
30-
import com.arangodb.internal.velocystream.Connection;
30+
import com.arangodb.internal.velocystream.internal.Connection;
3131
import com.arangodb.model.DocumentReadOptions;
3232
import com.arangodb.model.VertexCreateOptions;
3333
import com.arangodb.model.VertexDeleteOptions;

0 commit comments

Comments
 (0)