You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/11/23 21:12:10 UTC
[25/28] incubator-streams git commit: graph config fix
graph config fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/89c2d694
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/89c2d694
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/89c2d694
Branch: refs/heads/master
Commit: 89c2d694825023a8732f6d5f0558aa23e34ac3b1
Parents: b4a0fd7
Author: Steve Blackmon <sb...@w2odigital.com>
Authored: Sun Nov 23 13:36:45 2014 -0600
Committer: Steve Blackmon <sb...@w2odigital.com>
Committed: Sun Nov 23 13:36:45 2014 -0600
----------------------------------------------------------------------
.../main/java/org/apache/streams/graph/GraphPersistWriter.java | 3 ++-
.../org/apache/streams/graph/GraphWriterConfiguration.json | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/89c2d694/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphPersistWriter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphPersistWriter.java b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphPersistWriter.java
index 352bc68..9183a72 100644
--- a/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphPersistWriter.java
+++ b/streams-contrib/streams-persist-graph/src/main/java/org/apache/streams/graph/GraphPersistWriter.java
@@ -28,6 +28,7 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.http.util.EntityUtils;
import org.apache.streams.components.http.HttpPersistWriterConfiguration;
import org.apache.streams.components.http.persist.SimpleHTTPPostPersistWriter;
+import org.apache.streams.config.ComponentConfigurator;
import org.apache.streams.config.StreamsConfigurator;
import org.apache.streams.core.StreamsDatum;
import org.apache.streams.graph.neo4j.CypherGraphUtil;
@@ -59,7 +60,7 @@ public class GraphPersistWriter extends SimpleHTTPPostPersistWriter {
protected final ReadWriteLock lock = new ReentrantReadWriteLock();
public GraphPersistWriter() {
- this(GraphConfigurator.detectWriterConfiguration(StreamsConfigurator.config.getConfig("blueprints")));
+ this(new ComponentConfigurator<GraphWriterConfiguration>(GraphWriterConfiguration.class).detectConfiguration(StreamsConfigurator.config.getConfig("graph")));
}
public GraphPersistWriter(GraphWriterConfiguration configuration) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/89c2d694/streams-contrib/streams-persist-graph/src/main/jsonschema/org/apache/streams/graph/GraphWriterConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-graph/src/main/jsonschema/org/apache/streams/graph/GraphWriterConfiguration.json b/streams-contrib/streams-persist-graph/src/main/jsonschema/org/apache/streams/graph/GraphWriterConfiguration.json
index 918c66b..1e059d8 100644
--- a/streams-contrib/streams-persist-graph/src/main/jsonschema/org/apache/streams/graph/GraphWriterConfiguration.json
+++ b/streams-contrib/streams-persist-graph/src/main/jsonschema/org/apache/streams/graph/GraphWriterConfiguration.json
@@ -11,7 +11,7 @@
"javaType": "org.apache.streams.graph.GraphVertexWriterConfiguration"
},
"edges": {
- "type": "string",
+ "type": "object",
"javaType": "org.apache.streams.graph.GraphEdgeWriterConfiguration"
}
}