8000 Fix missing methods · MladenMitev/arangodb-java-driver@86fb37c · GitHub
[go: up one dir, main page]
Skip to content

Commit 86fb37c

Browse files
author
mpv1989
committed
Fix missing methods
- fixed missing `ArangoDatabase.util() : ArangoSerialization` - fixed missing `ArangoCollection.util() : ArangoSerialization` - fixed missing `ArangoGraph.util() : ArangoSerialization` - fixed missing `ArangoVertexCollection.util() : ArangoSerialization` - fixed missing `ArangoEdgeCollection.util() : ArangoSerialization`
1 parent 784bce5 commit 86fb37c

9 files changed

+64
-26
lines changed

‎ChangeLog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
1818

1919
Change field `name` in `ArangoCollection` after rename so that future requests through the instance will be made with the new collection name.
2020

21+
- fixed missing `ArangoDatabase.util() : ArangoSerialization`
22+
- fixed missing `ArangoCollection.util() : ArangoSerialization`
23+
- fixed missing `ArangoGraph.util() : ArangoSerialization`
24+
- fixed missing `ArangoVertexCollection.util() : ArangoSerialization`
25+
- fixed missing `ArangoEdgeCollection.util() : ArangoSerialization`
26+
27+
2128
## [4.6.0] - 2018-07-02
2229

2330
### Added

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
* @see <a href="https://docs.arangodb.com/current/HTTP/Collection/">Documents API Documentation</a>
5555
* @author Mark Vollmary
5656
*/
57-
public interface ArangoCollection {
57+
public interface ArangoCollection extends ArangoSerializationAccessor {
5858

5959
/**
6060
* The the handler of the database the collection is within

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.arangodb.internal.net.HostResolver;
4545
import com.arangodb.internal.util.ArangoDeserializerImpl;
4646
import com.arangodb.internal.util.ArangoSerializationFactory;
47-
import com.arangodb.internal.util.ArangoSerializationFactory.Serializer;
4847
import com.arangodb.internal.util.ArangoSerializerImpl;
4948
import com.arangodb.internal.util.DefaultArangoSerialization;
5049
import com.arangodb.internal.velocystream.VstCommunicationSync;
@@ -66,7 +65,6 @@
6665
import com.arangodb.velocypack.VPackParser;
6766
import com.arangodb.velocypack.VPackParserModule;
6867
import com.arangodb.velocypack.VPackSerializer;
69-
import com.arangodb.velocypack.VPackSlice;
7068
import com.arangodb.velocypack.ValueType;
7169
import com.arangodb.velocystream.Request;
7270
import com.arangodb.velocystream.Response;
@@ -85,7 +83,7 @@
8583
*
8684
* @author Mark Vollmary
8785
*/
88-
public interface ArangoDB {
86+
public interface ArangoDB extends ArangoSerializationAccessor {
8987

9088
/**
9189
* Builder class to build an instance of {@link ArangoDB}.
@@ -895,21 +893,4 @@ public synchronized ArangoDB build() {
895893
*/
896894
ArangoDB _setCursorInitializer(ArangoCursorInitializer cursorInitializer);
897895

898-
/**
899-
* Returns driver internal serialization API for serializing and deserializing Java POJOs to/from {@link VPackSlice}
900-
*
901-
* @return ArangoSerialization
902-
*/
903-
ArangoSerialization util();
904-
905-
/**
906-
* Returns serialization API for serializing and deserializing Java POJOs to/from {@link VPackSlice} by the given
907-
* type
908-
*
909-
* @param serializer
910-
* type of serializer
911-
* @return ArangoSerialization
912-
*/
913-
ArangoSerialization util(Serializer serializer);
914-
915896
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
* @see <a href="https://docs.arangodb.com/current/HTTP/AqlQuery/">Query API Documentation</a>
5757
* @author Mark Vollmary
5858
*/
59-
public interface ArangoDatabase {
59+
public interface ArangoDatabase extends ArangoSerializationAccessor {
6060

6161
/**
6262
* Return the main entry point for the ArangoDB driver

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Edges.html">API Documentation</a>
3535
* @author Mark Vollmary
3636
*/
37-
public interface ArangoEdgeCollection {
37+
public interface ArangoEdgeCollection extends ArangoSerializationAccessor {
3838

3939
/**
4040
* The the handler of the named graph the edge collection is within

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

Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/">API Documentation</a>
3333
* @author Mark Vollmary
3434
*/
35-
public interface ArangoGraph {
35+
public interface ArangoGraph extends ArangoSerializationAccessor {
3636

3737
/**
3838
* The the handler of the database the named graph is within
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*
2929
* @author Mark Vollmary
3030
*/
31-
public interface ArangoRoute {
31+
public interface ArangoRoute extends ArangoSerializationAccessor {
3232

3333
/**
3434
* Returns a new {@link ArangoRoute} instance for the given path (relative to the current route) that can be used to
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* DISCLAIMER
3+
*
4+
* Copyright 2018 ArangoDB GmbH, Cologne, Germany
5+
*
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*
18+
* Copyright holder is ArangoDB GmbH, Cologne, Germany
19+
*/
20+
21+
package com.arangodb;
22+
23+
import com.arangodb.internal.util.ArangoSerializationFactory.Serializer;
24+
import com.arangodb.util.ArangoSerialization;
25+
import com.arangodb.velocypack.VPackSlice;
26+
27+
/**
28+
* @author Mark Vollmary
29+
*
30+
*/
31+
public interface ArangoSerializationAccessor {
32+
33+
/**
34+
* Returns driver internal serialization API for serializing and deserializing Java POJOs to/from {@link VPackSlice}
35+
*
36+
* @return ArangoSerialization
37+
*/
38+
ArangoSerialization util();
39+
40+
/**
41+
* Returns serialization API for serializing and deserializing Java POJOs to/from {@link VPackSlice} by the given
42+
* type
43+
*
44+
* @param serializer
45+
* type of serializer
46+
* @return ArangoSerialization
47+
*/
48+
ArangoSerialization util(Serializer serializer);
49+
50+
}
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* @see <a href="https://docs.arangodb.com/current/HTTP/Gharial/Vertices.html">API Documentation</a>
3535
* @author Mark Vollmary
3636
*/
37-
public interface ArangoVertexCollection {
37+
public interface ArangoVertexCollection extends ArangoSerializationAccessor {
3838

3939
/**
4040
* The the handler of the named graph the edge collection is within