[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15971060#comment-15971060
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
This is merged - no problems getting it to master.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
> Fix For: 3.2.5
>
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15971059#comment-15971059
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user asfgit closed the pull request at:
https://github.com/apache/tinkerpop/pull/569
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15970966#comment-15970966
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
I'll work on this one today as soon assuming I get caught up on all missed
emails and such. I sense the merge to master won't be trivial, but we'll see.
Anyway, this one should close out soon.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15967745#comment-15967745
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dkuppitz commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Feel free to merge this PR @pluradj. The @spmallette bot is currently being
rebooted / is on vacation ;).
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15967692#comment-15967692
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on the issue:
https://github.com/apache/tinkerpop/pull/569
deferring the merge to you @spmallette since you had taken the lead on the
review, but i'm happy to handle it
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15967680#comment-15967680
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on the issue:
https://github.com/apache/tinkerpop/pull/569
@spmallette isn't a bot ;)
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15967677#comment-15967677
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Has this been missed by the ASF bot? I see 3 `VOTE: +1`s
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15962740#comment-15962740
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dkuppitz commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Well done.
VOTE: +1
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15959054#comment-15959054
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Using the GitHub review seems to have made my vote disappear...
Successful `docker/build.sh -t -i -n`. Verified docs and javadocs. Solid
work on this @dpitera.
VOTE: +1
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15959039#comment-15959039
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r109934781
--- Diff: docs/src/reference/gremlin-applications.asciidoc ---
@@ -1075,6 +1075,7 @@ The following table describes the various
configuration options that Gremlin Ser
|authentication.className |The fully qualified classname of an
`Authenticator` implementation to use. If this setting is not present, then
authentication is effectively disabled. |`AllowAllAuthenticator`
|authentication.config |A `Map` of configuration settings to be passes to
the `Authenticator` when it is constructed. The settings available are
dependent on the implementation. |_none_
|channelizer |The fully qualified classname of the `Channelizer`
implementation to use. A `Channelizer` is a "channel initializer" which
Gremlin Server uses to define the type of processing pipeline to use. By
allowing different `Channelizer` implementations, Gremlin Server can support
different communication protocols (e.g. Websockets, Java NIO, etc.).
|`WebSocketChannelizer`
+|graphManager |The fully qualified classname of the `GraphManager`
implementation to use. A `GraphManager` is a class that adheres to the
Tinkerpop `GraphManager` interface, allowing custom implementations for storing
and managing graph references, as well as defining custom methods to open and
close graphs instantiations. It is important to note that the Tinkerpop Http
and WebSocketChannelizers auto-commit and auto-rollback based on the graphs
stored in the graphManager upon script execution completion.
|`DefaultGraphManager`
--- End diff --
TinkerPop -- can fix case on commit
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15953726#comment-15953726
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Ran Gremlin Server integration tests locally to success - VOTE +1
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15950100#comment-15950100
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
IT tests passed!
```
[INFO] Reactor Summary:
[INFO]
[INFO] Apache TinkerPop .. SUCCESS
[1:31.220s]
[INFO] Apache TinkerPop :: Gremlin Shaded SUCCESS [12.183s]
[INFO] Apache TinkerPop :: Gremlin Core .. SUCCESS
[1:15.039s]
[INFO] Apache TinkerPop :: Gremlin Test .. SUCCESS [9.752s]
[INFO] Apache TinkerPop :: Gremlin Groovy SUCCESS
[2:50.074s]
[INFO] Apache TinkerPop :: Gremlin Groovy Test ... SUCCESS [5.952s]
[INFO] Apache TinkerPop :: TinkerGraph Gremlin ... SUCCESS
[4:44.315s]
[INFO] Apache TinkerPop :: Gremlin Benchmark . SUCCESS [10.434s]
[INFO] Apache TinkerPop :: Gremlin Driver SUCCESS [15.460s]
[INFO] Apache TinkerPop :: Neo4j Gremlin . SUCCESS [4.899s]
[INFO] Apache TinkerPop :: Gremlin Server SUCCESS
[16:15.318s]
[INFO] Apache TinkerPop :: Gremlin Python SUCCESS [19.874s]
[INFO] Apache TinkerPop :: Hadoop Gremlin SUCCESS
[11:05.683s]
[INFO] Apache TinkerPop :: Spark Gremlin . SUCCESS
[22:49.909s]
[INFO] Apache TinkerPop :: Giraph Gremlin SUCCESS
[2:21:03.271s]
[INFO] Apache TinkerPop :: Gremlin Console ... SUCCESS
[2:56.000s]
[INFO] Apache TinkerPop :: Gremlin Archetype . SUCCESS [0.175s]
[INFO] Apache TinkerPop :: Archetype - TinkerGraph ... SUCCESS [28.255s]
[INFO] Apache TinkerPop :: Archetype - Server SUCCESS [13.480s]
[INFO]
[INFO] BUILD SUCCESS
[INFO]
[INFO] Total time: 3:26:32.403s
[INFO] Finished at: Thu Mar 30 22:40:41 UTC 2017
[INFO] Final Memory: 103M/771M
[INFO]
```
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15949211#comment-15949211
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
> I think we want the behavior to generally be a "replace" and thus
"putTraversalSource()" and "putGraph()" seem like better names.
+1
> This has developed into a really nice pull request. Your effort on it is
appreciated.
Thank you sir. Your outstanding review is also very much appreciated.
I just pushed new code with all requested changes; once the TravisCI and
Docker IT tests pass, I will post again for hopefully the final review.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15948990#comment-15948990
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
I've finished playing around with my dummy implementation. Just one weird
thing that wasn't easy to see without actually working with the API -
`addTraversalSource()` and `addGraph()` aren't really "adds" - they are "puts"
as calling them more than once will act as a "replace" operation if the key
already exists. I think we want the behavior to generally be a "replace" and
thus "putTraversalSource()" and "putGraph()" seem like better names. I suppose
if an implementation wanted to limit that ability to only "adds" then the
naming with "put" still makes sense as we can see with the use of `Map.put()`
in unmodifiable collections.
I see some other odds/ends that could use a tweak or two, but I'll just
handle those things after merging as I think you have the meat of this PR in
place now once you address those other comments I've made. Please confirm that
you've done a final build with integration tests after all these changes to
make sure it's all solid. At that point, I expect we can get committers to
review/vote.
This has developed into a really nice pull request. Your effort on it is
appreciated.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15948824#comment-15948824
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108893957
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,101 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Function;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * @Deprecated This returns a {@link Map} that should be immutable.
Please refer to
+ * getGraphNames() for replacement.
+ *
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+@Deprecated
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get a {@link Set} of {@link String} graphNames corresponding to
names stored in the graph's
+ * reference tracker.
+ */
+public Set getGraphNames();
+/**
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
+ */
+public Graph getGraph(final String gName);
+
+/**
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map}
*/
-public Map getGraphs() {
-return graphs;
-}
+public void addGraph(final String gName, final Graph g);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
--- End diff --
I think you just need to deprecate `getTraversalSources()` and include
`remo
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15947915#comment-15947915
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108790250
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,101 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Function;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * @Deprecated This returns a {@link Map} that should be immutable.
Please refer to
+ * getGraphNames() for replacement.
+ *
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+@Deprecated
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get a {@link Set} of {@link String} graphNames corresponding to
names stored in the graph's
+ * reference tracker.
+ */
+public Set getGraphNames();
+/**
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
+ */
+public Graph getGraph(final String gName);
+
+/**
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map}
*/
-public Map getGraphs() {
-return graphs;
-}
+public void addGraph(final String gName, final Graph g);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
--- End diff --
ha. I haven't quite wrapped my head around the expected use of
`traversalSource
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15947898#comment-15947898
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108788582
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,101 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Function;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * @Deprecated This returns a {@link Map} that should be immutable.
Please refer to
+ * getGraphNames() for replacement.
+ *
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+@Deprecated
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get a {@link Set} of {@link String} graphNames corresponding to
names stored in the graph's
+ * reference tracker.
+ */
+public Set getGraphNames();
+/**
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
+ */
+public Graph getGraph(final String gName);
+
+/**
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map}
*/
-public Map getGraphs() {
-return graphs;
-}
+public void addGraph(final String gName, final Graph g);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
--- End diff --
It occurred to me while implementing `GraphManager` that `TraversalSource`
o
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15947716#comment-15947716
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
I'm going to do some additional testing with my own `GraphManager`
implementation just to see how it all feels. Anyway, I think this is firming up
pretty nicely - getting pretty close to being able to call for a final review.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15947712#comment-15947712
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108760283
--- Diff:
gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManagerTest.java
---
@@ -0,0 +1,109 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.junit.Test;
+
+import javax.script.Bindings;
+import java.util.Map;
+import java.util.Set;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class DefaultGraphManagerTest {
--- End diff --
Would you mind adding appropriate tests for the code in `openGraph()`? Not
sure if there's other methods/code branches that require testing or not, but
perhaps give that a review now that we've better settled the API.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15947700#comment-15947700
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108759155
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,101 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Function;
+public interface GraphManager {
--- End diff --
Since we don't really have any dev docs for how to implement a
`GraphManager` could you please add some javadoc here to describe what this
interface is for and why someone would implement it?
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943964#comment-15943964
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera closed the pull request at:
https://github.com/apache/tinkerpop/pull/569
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943965#comment-15943965
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
GitHub user dpitera reopened a pull request:
https://github.com/apache/tinkerpop/pull/569
TINKERPOP-1438: GraphManager becomes a customizable interface
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dpitera/tinkerpop TINKERPOP-1438
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/tinkerpop/pull/569.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #569
commit 1f2cfa04bfb5c6758aecb2ff69a4a7942c1701f0
Author: Benjamin Anderson
Date: 2016-08-20T05:33:16Z
Replace GraphManager with interface
This enabled settings-based customization of the GraphManager
implementation class, allowing implementors to customize the behavior of
the GraphManager.
commit 67471d13b5fa05d19d51f117a95530a81011f792
Author: dpitera
Date: 2016-11-21T18:01:47Z
GraphManager support opening of specific graphs
This changeset allows an implementor to open a specific graph. One may
use this concept to implement a dynamic graph cache.
Furthermore, to ensure that rebindings work as intended, i.e. the list
of graphs returned to the HttpGremlinEndpointHandler, or "open graphs",
must include the to-be-rebound-graph. This changeset includes a change
to return these rebound graphs specifically.
Similar story as above for the WebSockets class, StandardOpProcessor.
Similar story for sessions, SessionOpProcessor.
Furthermore, the serializers at server boot only need to be aware of the
graphs defined in the settings object, so the relevant change here is in
AbstractChannelizer.
Furthermore:
To encourage a GraphManager implementation whose modification of the
Map object aligns more closely with accepted "Getter and
Setter" design patterns, we update the adding of graphs to the
GraphManager Map by calling the new `addGraph(String, Graph)` rather
than publicly editting it with a call to `getGraphs().put(String,
Graph)`.
Also added `addTraversalSource(String, TraversalSource) for same
reasons.
Also, updated BasicGraphManager according to the new specifications.
commit 4f9f90b995aacba344d0b4c54ef2600f66fcbb48
Author: dpitera
Date: 2017-03-15T19:31:45Z
Allow for custom graph instantiations/closings
This allows an implementor to supply a custom openGraph function to
return a newly instantiated graph object, and similarly do the same to
close a graph object, while doing so through the graphManager for
reference tracking.
commit 32374d9442229930b2713a35ec4c44aadff6c732
Author: dpitera
Date: 2017-03-15T19:34:09Z
Update docs acc. to GraphManager changes
commit 8aa66e19037ace4443d19c90591b5a86fea09cfa
Author: dpitera
Date: 2017-03-16T15:32:47Z
Update code according to PR comments/suggestions
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943712#comment-15943712
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Pushed changes according to previous round of comments. Please re-review
whenever you get a chance.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943441#comment-15943441
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108197676
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
*/
-public Map getGraphs() {
-return graphs;
-}
+public Graph getGraph(final String gName);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
+ */
+public void addGraph(final String gName, final Graph g);
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
+
+/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+public TraversalSource getTraversalSource(final String tsName);
/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-final
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943437#comment-15943437
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108197184
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
*/
-public Map getGraphs() {
-return graphs;
-}
+public Graph getGraph(final String gName);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
+ */
+public void addGraph(final String gName, final Graph g);
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
+
+/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+public TraversalSource getTraversalSource(final String tsName);
/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-final
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943348#comment-15943348
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108182233
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
--- End diff --
ok - thanks for being patient on this. i knew this was going to be a gnarly
pull request. it's one of the reasons i've sorta left this issue alone.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943343#comment-15943343
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108180988
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
*/
-public Map getGraphs() {
-return graphs;
-}
+public Graph getGraph(final String gName);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
+ */
+public void addGraph(final String gName, final Graph g);
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
+
+/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+public TraversalSource getTraversalSource(final String tsName);
/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-fi
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943330#comment-15943330
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108179063
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
--- End diff --
> Seems like we would want to use GraphManager to enforce the logic of the
implementation, thus getGraphs() should go away?
Agreed.
I am confused by your suggestion to "lessen the breaking change", but I'll
give a stab at what I think you meant, and we can reiterate
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943321#comment-15943321
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108176975
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
*/
-public Map getGraphs() {
-return graphs;
-}
+public Graph getGraph(final String gName);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
+ */
+public void addGraph(final String gName, final Graph g);
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
+
+/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+public TraversalSource getTraversalSource(final String tsName);
/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-final
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943311#comment-15943311
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108175942
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
*/
-public Map getGraphs() {
-return graphs;
-}
+public Graph getGraph(final String gName);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
+ */
+public void addGraph(final String gName, final Graph g);
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
+
+/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+public TraversalSource getTraversalSource(final String tsName);
/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-final
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15943313#comment-15943313
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r108175970
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,210 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15938380#comment-15938380
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r107677257
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
*/
-public Map getGraphs() {
-return graphs;
-}
+public Graph getGraph(final String gName);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
+ */
+public void addGraph(final String gName, final Graph g);
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
+
+/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+public TraversalSource getTraversalSource(final String tsName);
/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-fi
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15938318#comment-15938318
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r107671911
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
*/
-public Map getGraphs() {
-return graphs;
-}
+public Graph getGraph(final String gName);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
+ */
+public void addGraph(final String gName, final Graph g);
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
+
+/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+public TraversalSource getTraversalSource(final String tsName);
/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-fi
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15938305#comment-15938305
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r107668704
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,210 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and th
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15938301#comment-15938301
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r107668046
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,98 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
+public Map getGraphs();
--- End diff --
So, now we have `getGraphs()` which returns the `Map` of graph names and
`Graph` instances but then we also expose get/put/remove operations that just
manipulate that same `Map`. That seems like it needs more thought. In other
words, why do:
```java
manager.addGraph("graph", new TinkerGraph());
manager.getGraph("graph");
```
if I can also do:
```java
manager.getGraphs().put("graph",new TinkerGraph());
manager.getGraphs().get("graph");
```
By offering two approaches to do the same thing we open the possibility to
error. If a `GraphManager` implementation adds logic to `addGraph()` (or
related method) then that logic can simply be bypassed by directly manipulating
the `Map` via `getGraphs()`.
Seems like we would want to use `GraphManager` to enforce the logic of the
implementation, thus `getGraphs()` should go away? Perhaps to lessen the
breaking change for 3.2.x it is simply deprecated with some additional javadoc
that states that the method is expected to return an umodifiable `Map`? replace
that method with `Set getGraphNames()` so you could iterate over that
to get all the `Graph` instances or maybe have `GraphManager` implement
`Iterable` so you could `foreach` and get an `iterator()`? and then finally
replace all internal usage of `getGraphs()` so that it can safely be removed on
the master branch.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15936354#comment-15936354
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
I've been really focused on some other things the last few days. Expected
to focus on pull requests today (which are stacking up). Of course, the one I
started with has me all hung up. Hoping to make my rounds to all of them today,
including this one.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15936346#comment-15936346
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
@spmallette No rush, just checking in. Have you thought about this anymore?
I had addressed some of your questions
[here](https://github.com/apache/tinkerpop/pull/569#discussion_r106475154) and
I have pushed code addressing feedback.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928472#comment-15928472
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106480663
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928441#comment-15928441
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106475154
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928417#comment-15928417
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106471272
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and th
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928386#comment-15928386
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106467302
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928360#comment-15928360
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106464105
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928345#comment-15928345
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106462086
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928340#comment-15928340
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106460712
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and th
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928331#comment-15928331
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106459384
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928321#comment-15928321
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106454863
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928320#comment-15928320
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106456922
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public final Map getGraphs() {
+return graphs;
+}
+
+public final Graph getGraph(final String gName) {
+return graphs.get(gName);
+}
+
+public final void addGraph(final String gName, final Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the v
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928319#comment-15928319
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
@spmallette Updated with your suggestions; only thing i have not addressed
is `closeGraph()` versus `removeGraph()`.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928144#comment-15928144
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106428624
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,87 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
-
+public Map getGraphs();
+
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
+ */
+public Graph getGraph(String gName);
+
+/**
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
*/
-public Map getGraphs() {
-return graphs;
-}
+public void addGraph(String gName, Graph g);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+
+public TraversalSource getTraversalSource(String tsName);
+/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-final Bind
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928096#comment-15928096
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106424001
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public Map getGraphs() {
+return graphs;
+}
+
+public Graph getGraph(String gName) {
+return graphs.get(gName);
+}
+
+public void addGraph(String gName, Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
+ * {@li
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928110#comment-15928110
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106425058
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public Map getGraphs() {
+return graphs;
+}
+
+public Graph getGraph(String gName) {
+return graphs.get(gName);
+}
+
+public void addGraph(String gName, Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
+ * {@li
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928100#comment-15928100
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106424327
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,87 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
-
+public Map getGraphs();
+
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
+ */
+public Graph getGraph(String gName);
+
+/**
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
*/
-public Map getGraphs() {
-return graphs;
-}
+public void addGraph(String gName, Graph g);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+
+public TraversalSource getTraversalSource(String tsName);
+/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-final Binding
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928025#comment-15928025
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
I think I'm done with this round of comments. I suspect I might have a few
more yet about the `GraphManager` interface itself - still rolling some ideas
around in my mind on it.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928023#comment-15928023
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106415356
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public Map getGraphs() {
+return graphs;
+}
+
+public Graph getGraph(String gName) {
+return graphs.get(gName);
+}
+
+public void addGraph(String gName, Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
+ * {
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15928005#comment-15928005
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106413754
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,87 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
-
+public Map getGraphs();
+
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
+ */
+public Graph getGraph(String gName);
+
+/**
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
*/
-public Map getGraphs() {
-return graphs;
-}
+public void addGraph(String gName, Graph g);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Get a list of the {@link TraversalSource} instances and their
binding names
*
* @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
* {@link TraversalSource} itself
*/
-public Map getTraversalSources() {
-return traversalSources;
-}
+public Map getTraversalSources();
/**
+ * Get {@link TraversalSource} instance whose name matches {@link
tsName}
+ *
+ * @return {@link TraversalSource} if exists, else null
+ */
+
+public TraversalSource getTraversalSource(String tsName);
+/**
* Get the {@link Graph} and {@link TraversalSource} list as a set of
bindings.
*/
-public Bindings getAsBindings() {
-final Bind
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15927992#comment-15927992
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106412544
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/DefaultGraphManager.java
---
@@ -0,0 +1,201 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class DefaultGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public DefaultGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public Map getGraphs() {
+return graphs;
+}
+
+public Graph getGraph(String gName) {
+return graphs.get(gName);
+}
+
+public void addGraph(String gName, Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
+ * {
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15927973#comment-15927973
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106410916
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
---
@@ -100,9 +101,28 @@ public ServerGremlinExecutor(final Settings settings,
final ExecutorService grem
*/
public ServerGremlinExecutor(final Settings settings, final
ExecutorService gremlinExecutorService,
final T scheduledExecutorService, final
Class scheduleExecutorServiceClass,
- final GraphManager graphManager) {
+ GraphManager graphManager) {
this.settings = settings;
+if (null == graphManager) {
--- End diff --
looks like there's some indentation problems in the following lines of
code. should be four spaces between the curly brackets.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15927970#comment-15927970
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106410530
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,87 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
-
+public Map getGraphs();
+
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
+ */
+public Graph getGraph(String gName);
--- End diff --
Looks like you're still missing a bunch of "final" declarations. I would
normally just handle them for you at merge, but you have a pretty large PR
going here, so it would be helpful if you got them all for us.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15927968#comment-15927968
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106410060
--- Diff: CHANGELOG.asciidoc ---
@@ -47,6 +47,9 @@ TinkerPop 3.2.5 (Release Date: NOT OFFICIALLY RELEASED
YET)
* Improved error handling of compilation failures for very large or highly
parameterized script sent to Gremlin Server.
* Fixed a bug in `RangeByIsCountStrategy` that changed the meaning of
inner traversals.
* Improved Gremlin-Python Driver implementation by adding a threaded
client with basic connection pooling and support for pluggable websocket
clients.
+* Changed GraphManager from a final class implementation to an interface.
--- End diff --
minor formatting thing - make sure that class/interface/code names have the
backtick around them so that they format properly when the asciidoc is
generated. you might want to look at the other docs you wrote as you missed a
few instances there as well.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15926954#comment-15926954
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
GitHub user dpitera reopened a pull request:
https://github.com/apache/tinkerpop/pull/569
TINKERPOP-1438: GraphManager becomes a customizable interface
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dpitera/tinkerpop TINKERPOP-1438
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/tinkerpop/pull/569.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #569
commit 7b20ce78be5205bb9a0bec29435d77e0084dd647
Author: Benjamin Anderson
Date: 2016-08-20T05:33:16Z
Replace GraphManager with interface
This enabled settings-based customization of the GraphManager
implementation class, allowing implementors to customize the behavior of
the GraphManager.
commit f9f3010889851b126437d1bd8f98e0a3f99ac9ba
Author: dpitera
Date: 2016-11-21T18:01:47Z
GraphManager support opening of specific graphs
This changeset allows an implementor to open a specific graph. One may
use this concept to implement a dynamic graph cache.
Furthermore, to ensure that rebindings work as intended, i.e. the list
of graphs returned to the HttpGremlinEndpointHandler, or "open graphs",
must include the to-be-rebound-graph. This changeset includes a change
to return these rebound graphs specifically.
Similar story as above for the WebSockets class, StandardOpProcessor.
Similar story for sessions, SessionOpProcessor.
Furthermore, the serializers at server boot only need to be aware of the
graphs defined in the settings object, so the relevant change here is in
AbstractChannelizer.
Furthermore:
To encourage a GraphManager implementation whose modification of the
Map object aligns more closely with accepted "Getter and
Setter" design patterns, we update the adding of graphs to the
GraphManager Map by calling the new `addGraph(String, Graph)` rather
than publicly editting it with a call to `getGraphs().put(String,
Graph)`.
Also added `addTraversalSource(String, TraversalSource) for same
reasons.
Also, updated BasicGraphManager according to the new specifications.
commit 1119f811c1cc91b286e514365501a01beaeaeaec
Author: dpitera
Date: 2017-03-15T19:31:45Z
Allow for custom graph instantiations/closings
This allows an implementor to supply a custom openGraph function to
return a newly instantiated graph object, and similarly do the same to
close a graph object, while doing so through the graphManager for
reference tracking.
commit 4cb5a771ac78187d438cb453d212787de5579e60
Author: dpitera
Date: 2017-03-15T19:34:09Z
Update docs acc. to GraphManager changes
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15926953#comment-15926953
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera closed the pull request at:
https://github.com/apache/tinkerpop/pull/569
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15926877#comment-15926877
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
> and I have mailed the dev list.
scratch that-- failed to send lol
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15926875#comment-15926875
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
I have updated my PR with both of your guys' comments, and I have mailed
the dev list.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15926722#comment-15926722
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106248061
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/BasicGraphManager.java
---
@@ -0,0 +1,186 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.server.util;
+
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
+import org.apache.tinkerpop.gremlin.server.GraphManager;
+import org.apache.tinkerpop.gremlin.server.GremlinServer;
+import org.apache.tinkerpop.gremlin.server.Settings;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Transaction;
+import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
+import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.script.Bindings;
+import javax.script.SimpleBindings;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+/**
+ * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
+ * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
+ * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
+ * initialization scripts construct them.
+ */
+public final class BasicGraphManager implements GraphManager {
+private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
+
+private final Map graphs = new ConcurrentHashMap<>();
+private final Map traversalSources = new
ConcurrentHashMap<>();
+
+/**
+ * Create a new instance using the {@link Settings} from Gremlin
Server.
+ */
+public BasicGraphManager(final Settings settings) {
+settings.graphs.entrySet().forEach(e -> {
+try {
+final Graph newGraph = GraphFactory.open(e.getValue());
+graphs.put(e.getKey(), newGraph);
+logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
+} catch (RuntimeException re) {
+logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
+e.getKey(), e.getValue(), re.getMessage()), re);
+if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
+}
+});
+}
+
+/**
+ * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
+ * configuration file.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ */
+public Map getGraphs() {
+return graphs;
+}
+
+public Graph getGraph(String gName) {
+return graphs.get(gName);
+}
+
+public void addGraph(String gName, Graph g) {
+graphs.put(gName, g);
+}
+
+/**
+ * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
+ * initialization scripts.
+ *
+ * @return a {@link Map} where the key is the name of the {@link
TraversalSource} and the value is the
+ * {@link Tra
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15926531#comment-15926531
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on a diff in the pull request:
https://github.com/apache/tinkerpop/pull/569#discussion_r106217616
--- Diff:
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java
---
@@ -21,139 +21,82 @@
import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.script.Bindings;
-import javax.script.SimpleBindings;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Predicate;
-
-/**
- * Holder for {@link Graph} and {@link TraversalSource} instances
configured for the server to be passed to script
- * engine bindings. The {@link Graph} instances are read from the {@link
Settings} for Gremlin Server as defined in
- * the configuration file. The {@link TraversalSource} instances are
rebound to the {@code GraphManager} once
- * initialization scripts construct them.
- */
-public final class GraphManager {
-private static final Logger logger =
LoggerFactory.getLogger(GremlinServer.class);
-
-private final Map graphs = new ConcurrentHashMap<>();
-private final Map traversalSources = new
ConcurrentHashMap<>();
+import java.util.function.Supplier;
+public interface GraphManager {
/**
- * Create a new instance using the {@link Settings} from Gremlin
Server.
+ * Get a list of the {@link Graph} instances and their binding names
+ *
+ * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
*/
-public GraphManager(final Settings settings) {
-settings.graphs.entrySet().forEach(e -> {
-try {
-final Graph newGraph = GraphFactory.open(e.getValue());
-graphs.put(e.getKey(), newGraph);
-logger.info("Graph [{}] was successfully configured via
[{}].", e.getKey(), e.getValue());
-} catch (RuntimeException re) {
-logger.warn(String.format("Graph [%s] configured at [%s]
could not be instantiated and will not be available in Gremlin Server.
GraphFactory message: %s",
-e.getKey(), e.getValue(), re.getMessage()), re);
-if (re.getCause() != null) logger.debug("GraphFactory
exception", re.getCause());
-}
-});
-}
-
+public Map getGraphs();
+
/**
- * Get a list of the {@link Graph} instances and their binding names
as defined in the Gremlin Server
- * configuration file.
+ * Get {@link Graph} instance whose name matches {@link gName}
*
- * @return a {@link Map} where the key is the name of the {@link
Graph} and the value is the {@link Graph} itself
+ * @return {@link Graph} if exists, else null
*/
-public Map getGraphs() {
-return graphs;
-}
+public Graph getGraph(String gName);
/**
- * Get a list of the {@link TraversalSource} instances and their
binding names as defined by Gremlin Server
- * initialization scripts.
+ * Add {@link Graph} g with name {@link String} gName to
+ * {@link Map} returned by call to getGraphs()
+ */
+public void addGraph(String gName, Graph g);
--- End diff --
seems like `removeGraph(String)` or `removeGraph(Graph)` would be useful
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassi
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15905329#comment-15905329
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
yeah - that's an obvious truth @pluradj . Normally we wouldn't allow such a
change on `tp32` because it does immediately make people's code not compile if
they used that class in that way but this class is fairly internal. If someone
is using it they likely know what they are doing. @dpitera I tend to agree that
this is outside the scope of what would need to remain compatible. That said, I
think you will have to add an entry to the upgrade docs (i guess the user
section???) about this breaking change and just mention how they go about
fixing it (i.e. use the `DefaultGraphManager`). We'll probably also want to
send a quick email to the dev list to just alert everyone to a break to make
sure no one is buggin' about that. Finally, the JIRA issue will need the
"breaking" label added to it.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15905324#comment-15905324
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
> It would break if somebody was calling on new GraphManager(Settings)
If someone were doing this, it would mean they have had to reconstruct a
`Settings` object, which would be different than that instantiated inside the
`GremlinServer` and I would argue this is _outside the scope_ of something we
need to be compatible with, i.e. using a modified version of Tinkerpop, or
using it in an unexpected way. What are your thoughts here?
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15905302#comment-15905302
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on the issue:
https://github.com/apache/tinkerpop/pull/569
It would break if somebody was calling on `new GraphManager(Settings)`. You
could change the interface to `IGraphManager` and have `GraphManager` implement
it.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15905295#comment-15905295
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
> Therefore, i am not sure who would have been able to make use of the
graphManager themselves without using a modified version of tinkerpop.
You would be surprised by what folks manage to make use of in their code.
If it's public, people will use it. :smile: anyway, i mostly wanted to be sure
we don't introduce any compile time breaks when folks go to use 3.2.5.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15905268#comment-15905268
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
> Does this change introduce any compile-time breaking changes for anyone
who has depended on the GraphManager class (or other things you've modified)?
I believe the answer is no (in the non-mutated use of pure tinkerpop)
because:
1. The previous implementation's graphManager instantiation could only be
retrieved by two places:
1. The
[ServerGremlinExecutor](https://github.com/apache/tinkerpop/blob/ad51fb24eb4d621763f6b3c02029daa54e7dc20d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java#L202)
which is only accessible through the
[GremlinServer](https://github.com/apache/tinkerpop/blob/c5b9680e70d696d000b945abbd72a3b8a3f97256/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java#L328)
which users do not have access to the instantiation unless they have modified
their implementor's logic to define its own "GremlinServer" and not use
Tinkerpop's
2. The
[Context](https://github.com/apache/tinkerpop/blob/4293eb333dfbf3aea19cd326f9f3d13619ac0b54/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Context.java#L80)
which also is instantiated by the same graphManager pulled from the
servergremlinexecutor, and the Context class is final (and thus cannot be
extended) and there is no way to retrieve that `Context` in the code.
Therefore, i am not sure who would have been able to make use of the
graphManager themselves without using a modified version of tinkerpop.
> Can you elaborate on the usage of openGraph()
The `addGraph()` and `getGraph()` are to act as modifiers to the object
holding the graph references, while `opengraph()` allows for a mechanism by
which to instantiate a graph dynamically through the graphManager (and thus
allow for reference tracking of it) that is not currently in said
graphManager's reference tracking object. The use of a `Supplier` here allows
for the implementor to define his/her own custom function by which to
instantiate the graph
> If it stays on tp32 I may have to ask you to provide a second pull
request to master that can also be evaluated as part of a second review/vote.
I would say once we get this one merged, then we can open the PR on master,
but I would like to get it into the next release as well
> it will likely take a some time and iterations to get through before we
can get it merged
Sounds good. I usually prefer quality to expediency. When I get around to
fixing up some of your requests, I will leave a comment here saying I have
pushed new code.
Thanks for your review. Let me know if you have more questions!
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15904971#comment-15904971
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Nice to see that all the tests are passing. Thanks for doing that.
I've given this a quick review and have a few top-level comments:
* Note that our code style is to explicitly use `final` for all variable
declarations that require it - i think we make exceptions on exceptions in
catch blocks and the var declaration of a `for()` loop, but that's about it. I
think you've missed a few of those.
* Could you please rename `BasicGraphManager` to `DefaultGraphManager`? We
only use the term "Basic" in one other class naming, so it's a bit of an
anomaly compared to "Default".
* Does this change introduce any compile-time breaking changes for anyone
who has depended on the `GraphManager` class (or other things you've
modified)? I'm wondering if this is a change better suited for the master
branch and 3.3.0. If it stays on `tp32` I may have to ask you to provide a
second pull request to master that can also be evaluated as part of a second
review/vote.
* The addition of `addGraph()` is nice.
* Can you elaborate on the usage of `openGraph()` - I think I get it, but
it's not clear to me based on the javadoc/default implementation
* Please add a entry (or more) to CHANGELOG for these updates.
* Please update the reference documentation to include your new Gremlin
Server configuration option here:
http://tinkerpop.apache.org/docs/current/reference/#_configuring_2 - not sure
how much you need to write here. Users of `GraphManager` have likely dug pretty
deep into the code and will see how it works. Perhaps include a link to the
javadoc for `GraphManager` and beef up the class javadoc there so that
implementers know what to do.
Just a bit of warning - from my perspective, this is a fairly involved pull
request you've started (and thanks!) so it will likely take a some time and
iterations to get through before we can get it merged.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15903740#comment-15903740
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user okram commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Congrats on doing your first full integration test! Hope you stick around
to help out on TinkerPop.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15903737#comment-15903737
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Integration tests finished successfully:
```
[INFO] Reactor Summary:
[INFO]
[INFO] Apache TinkerPop .. SUCCESS
[8:43.526s]
[INFO] Apache TinkerPop :: Gremlin Shaded SUCCESS [21.090s]
[INFO] Apache TinkerPop :: Gremlin Core .. SUCCESS
[1:14.775s]
[INFO] Apache TinkerPop :: Gremlin Test .. SUCCESS [12.833s]
[INFO] Apache TinkerPop :: Gremlin Groovy SUCCESS
[3:02.384s]
[INFO] Apache TinkerPop :: Gremlin Groovy Test ... SUCCESS [6.146s]
[INFO] Apache TinkerPop :: TinkerGraph Gremlin ... SUCCESS
[4:27.224s]
[INFO] Apache TinkerPop :: Gremlin Benchmark . SUCCESS [6.937s]
[INFO] Apache TinkerPop :: Gremlin Driver SUCCESS [12.051s]
[INFO] Apache TinkerPop :: Neo4j Gremlin . SUCCESS
[23:50.255s]
[INFO] Apache TinkerPop :: Gremlin Server SUCCESS
[17:12.591s]
[INFO] Apache TinkerPop :: Gremlin Python SUCCESS [49.683s]
[INFO] Apache TinkerPop :: Hadoop Gremlin SUCCESS
[9:23.200s]
[INFO] Apache TinkerPop :: Spark Gremlin . SUCCESS
[21:27.122s]
[INFO] Apache TinkerPop :: Giraph Gremlin SUCCESS
[2:21:10.655s]
[INFO] Apache TinkerPop :: Gremlin Console ... SUCCESS
[3:01.607s]
[INFO] Apache TinkerPop :: Gremlin Archetype . SUCCESS [0.134s]
[INFO] Apache TinkerPop :: Archetype - TinkerGraph ... SUCCESS
[1:12.427s]
[INFO] Apache TinkerPop :: Archetype - Server SUCCESS [12.415s]
[INFO]
[INFO] BUILD SUCCESS
[INFO]
[INFO] Total time: 3:56:48.949s
[INFO] Finished at: Thu Mar 09 19:35:00 UTC 2017
[INFO] Final Memory: 109M/701M
[INFO]
```
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15901866#comment-15901866
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
we can rely on travis as a good basic health check for a PR, but ultimately
a full integration test is run on just about everything. at this stage of your
PR, i'm mostly interested in the workings of the gremlin-server and
gremlin-console integration tests, but making sure your system can do a run of
everything isn't a bad idea.
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15901858#comment-15901858
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
Thanks Jason! Reading/running now
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15901849#comment-15901849
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user pluradj commented on the issue:
https://github.com/apache/tinkerpop/pull/569
No, it is mentioned here
http://tinkerpop.apache.org/docs/3.2.4/dev/developer/#_contributing_code_changes
Devs often use Docker for to run it `docker/build.sh -t -i -n`
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15901841#comment-15901841
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user dpitera commented on the issue:
https://github.com/apache/tinkerpop/pull/569
> have you run the full integration test suite to success on this?
Was that not run by the CI build
[here](https://travis-ci.org/apache/tinkerpop/builds/208345874)
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15901695#comment-15901695
]
ASF GitHub Bot commented on TINKERPOP-1438:
---
Github user spmallette commented on the issue:
https://github.com/apache/tinkerpop/pull/569
thanks for submitting this. i didn't realize you'd get something out so
quickly. before i dig too deeply into this have you run the full integration
test suite to success on this?
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15898066#comment-15898066
]
David Pitera commented on TINKERPOP-1438:
-
Hey as it turns out I've opened a PR that already addresses all of these
concerns.
The PR is here: https://github.com/apache/tinkerpop/pull/569/files
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
[jira] [Commented] (TINKERPOP-1438) Consider GraphManager as an interface
[
https://issues.apache.org/jira/browse/TINKERPOP-1438?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15898062#comment-15898062
]
David Pitera commented on TINKERPOP-1438:
-
Copying over from the issue I created:
Currently, Tinkerpop uses the
[GraphManager](https://github.com/apache/tinkerpop/blob/master/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GraphManager.java)
to handle graph management and store references to graph objects.
I propose that we change the graphManager in three ways:
1. The graphManager should be an interface, and the existing functionality
should be moved into a `BasicGraphManager`. This allows the implementor to
design their own graph manager so suit their graph management needs.
Furthermore, this will need to allow the implementor to supply a graphManager
class in the YAML, so the
[Settings](https://github.com/apache/tinkerpop/blob/master/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java)
must support a graphmanager, which of course can default to the
`BasicGraphManager`.
2. We define additional methods on the interface to improve how the
graphManager is used in existing Tinkerpop code. For example,
[here](https://github.com/apache/tinkerpop/blob/master/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java#L156)
we mutate an object directly outside the scope of a getter or setter on said
object.
3. We define additional methods on the interface to allow for custom graph
opening implementation:
// Implementation that allows for custom graph-opening implementations.
public Graph openGraph(String graphName, Supplier supplier);
> Consider GraphManager as an interface
> -
>
> Key: TINKERPOP-1438
> URL: https://issues.apache.org/jira/browse/TINKERPOP-1438
> Project: TinkerPop
> Issue Type: Improvement
> Components: server
>Affects Versions: 3.2.2
>Reporter: stephen mallette
>Priority: Minor
> Labels: breaking
>
> If {{GraphManager}} were an interface it would make embedding Gremlin Server
> easier as {{Graph}} instances could be more easily supplied by the host
> application. In doing this, It also might be good to force a
> {{TraversalSource}} to be referred to by both the {{Graph}} name and
> {{TraversalSource}} name.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
