8000 Merge branch 'devel' of github.com:arangodb/arangodb-java-driver into… · anderick/arangodb-java-driver@f12c9e5 · GitHub
[go: up one dir, main page]

Skip to content

Commit f12c9e5

Browse files
author
a-brandt
committed
Merge branch 'devel' of github.com:arangodb/arangodb-java-driver into devel
2 parents 6008025 + 965488d commit f12c9e5

File tree

4 files changed

+25
-16
lines changed

4 files changed

+25
-16
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,9 @@
181181
</dependencies>
182182

183183
<scm>
184-
<url>https://github.com/tamtam180/arangodb-java-driver</url>
185-
<connection>scm:git:git://github.com/tamtam180/arangodb-java-driver.git</connection>
186-
<developerConnection>scm:git:git://github.com/tamtam180/arangodb-java-driver.git</developerConnection>
184+
<url>https://github.com/arangodb/arangodb-java-driver</url>
185+
<connection>scm:git:git://github.com/arangodb/arangodb-java-driver.git</connection>
186+
<developerConnection>scm:git:git://github.com/arangodb/arangodb-java-driver.git</developerConnection>
187187
</scm>
188188

189189
</project>

src/main/java/com/arangodb/ArangoDriver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1763,7 +1763,7 @@ public GraphEntity createGraph(String graphName, Boolean waitForSync) throws Ara
17631763
}
17641764

17651765
/**
1766-
* list all Graphs of the default database
1766+
* Creates a list of all available graphs of the default database.
17671767
*
17681768
* @return GraphsEntity
17691769
* @throws ArangoException
@@ -1773,7 +1773,7 @@ public GraphsEntity getGraphs() throws ArangoException {
17731773
}
17741774

17751775
/**
1776-
* get graph object by name
1776+
* Get graph object by name
17771777
*
17781778
* @param graphName
17791779
* @return GraphEntity

src/main/java/com/arangodb/InternalGraphDriver.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ GraphEntity createGraph(
3030
GraphEntity createGraph(String databaseName, String documentKey, String vertices, String edges, Boolean waitForSync)
3131
throws ArangoException;
3232

33+
/**
34+
* Creates a list of all available graphs of the default database
35+
* databaseName.
36+
*
37+
* @param databaseName
38+
* @return GraphsEntity
39+
* @throws ArangoException
40+
*/
3341
GraphsEntity getGraphs(String databaseName) throws ArangoException;
3442

3543
GraphEntity getGraph(String databaseName, String graphName) throws ArangoException;

src/test/java/com/arangodb/ArangoTestSuite.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,25 @@
2323
import com.arangodb.util.StringJoinTest;
2424

2525
/**
26-
* 全ての単体テストを実行する。
26+
* Starts all unit tests
27+
*
2728
* @author tamtam180 - kirscheless at gmail.com
29+
* @author gschwab
2830
*
2931
*/
3032
@RunWith(Suite.class)
3133
@SuiteClasses({
32-
33-
// Utils Test
34+
35+
// Utils Test
3436
StringJoinTest.class,
3537

3638
// Drivers Test
3739
ArangoConfigureTest.class,
3840
ArangoDriverAuthTest.class,
3941
NegativeTest.class,
4042

41-
//PrimitiveDocumentTest.class,
42-
43+
// PrimitiveDocumentTest.class,
44+
4345
ArangoDriverDatabaseTest.class,
4446
ArangoDriverDatabaseAndUserTest.class,
4547

@@ -51,13 +53,13 @@
5153
ArangoDriverCollectionTest.class,
5254
ArangoDriverCursorTest.class,
5355
ArangoDriverCursorResultSetTest.class,
54-
56+
5557
ArangoDriverIndexTest.class,
5658
ArangoDriverAdminTest.class,
5759
ArangoDriverSimpleTest.class,
5860
ArangoDriverImportTest.class,
59-
//ArangoDriverSimpleGeoTest.class,
60-
//ArangoDriverKeyValueTest.class,
61+
// ArangoDriverSimpleGeoTest.class,
62+
// ArangoDriverKeyValueTest.class,
6163
ArangoDriverGraphTest.class,
6264
ArangoDriverGraphVertexTest.class,
6365
ArangoDriverGraphVertexReplaceTest.class,
@@ -71,9 +73,8 @@
7173
ArangoDriverThreadSafeTest.class,
7274
ArangoDriverReplicationTest.class,
7375
ArangoDriverReplicationTestScenario1.class
74-
76+
7577
})
7678
public class ArangoTestSuite {
77-
78-
79+
7980
}

0 commit comments

Comments
 (0)
0