You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/07/17 18:32:50 UTC
[5/6] incubator-tinkerpop git commit: Add a user count function to
the CredentialGraph DSL.
Add a user count function to the CredentialGraph DSL.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/33521afe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/33521afe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/33521afe
Branch: refs/heads/auth
Commit: 33521afec7fd14fbb2ef0a80a4812fb6cc74ca6f
Parents: e199955
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jul 17 10:32:38 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jul 17 10:32:38 2015 -0400
----------------------------------------------------------------------
.../server/auth/groovy/plugin/CredentialGraph.java | 16 ++++++++++++++++
.../auth/groovy/plugin/CredentialGraphTest.java | 11 +++++++++++
2 files changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/33521afe/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraph.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraph.java
index a0d1516..d5d8b65 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraph.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraph.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.mindrot.jbcrypt.BCrypt;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.drop;
@@ -100,6 +101,21 @@ public class CredentialGraph {
}
/**
+ * Get a count of the number of users in the database.
+ */
+ public long countUsers() {
+ if (supportsTransactions) graph.tx().rollback();
+ return g.V().hasLabel(VERTEX_LABEL_USER).count().next();
+ }
+
+ @Override
+ public String toString() {
+ return "CredentialGraph{" +
+ "graph=" + graph +
+ '}';
+ }
+
+ /**
* Wrap up any {@link Graph} instance in the {@code CredentialGraph} DSL.
*/
public static CredentialGraph credentials(final Graph graph) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/33521afe/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraphTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraphTest.java
index 2ef270e..e8d5b9c 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraphTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/auth/groovy/plugin/CredentialGraphTest.java
@@ -94,6 +94,17 @@ public class CredentialGraphTest {
assertNull(credentials(graph).findUser("stephanie"));
}
+ @Test
+ public void shouldCountUsers() {
+ assertThat(graph.vertices().hasNext(), is(false));
+ credentials(graph).createUser("marko", "secret");
+ credentials(graph).createUser("stephen", "secret");
+ credentials(graph).createUser("daniel", "secret");
+ assertThat(graph.vertices().hasNext(), is(true));
+
+ assertEquals(3, credentials(graph).countUsers());
+ }
+
@Test(expected = IllegalStateException.class)
public void shouldThrowIfFindingMultipleUsers() {
assertThat(graph.vertices().hasNext(), is(false));