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/08/28 21:26:53 UTC
[08/15] git commit: easier to use existing jackson-annotated beans
easier to use existing jackson-annotated beans
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/e6380ceb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/e6380ceb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/e6380ceb
Branch: refs/heads/master
Commit: e6380cebed7f4ce8d211cc7e2e73d0080041cc71
Parents: 6381dc9
Author: sblackmon <sb...@w2odigital.com>
Authored: Fri Aug 8 14:50:27 2014 -0500
Committer: sblackmon <sb...@apache.org>
Committed: Tue Aug 12 18:04:23 2014 -0500
----------------------------------------------------------------------
.../provider/DatasiftManagedSourceSetup.java | 69 ++++++++++++++
.../provider/DatasiftStreamConfigurator.java | 10 ++-
.../provider/DatasiftStreamProvider.java | 2 +-
.../com/datasift/DatasiftConfiguration.json | 94 +-------------------
4 files changed, 79 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e6380ceb/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftManagedSourceSetup.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftManagedSourceSetup.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftManagedSourceSetup.java
new file mode 100644
index 0000000..6e648e7
--- /dev/null
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftManagedSourceSetup.java
@@ -0,0 +1,69 @@
+package org.apache.streams.datasift.provider;
+
+import com.datasift.client.DataSiftClient;
+import com.datasift.client.FutureData;
+import com.datasift.client.managedsource.ManagedSource;
+import com.datasift.client.managedsource.ManagedSourceList;
+import com.datasift.client.managedsource.sources.DataSource;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import org.apache.streams.StreamsConfiguration;
+import org.apache.streams.config.StreamsConfigurator;
+import org.apache.streams.datasift.DatasiftConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by sblackmon on 8/8/14.
+ */
+public class DatasiftManagedSourceSetup implements Runnable {
+
+ private final static Logger LOGGER = LoggerFactory.getLogger(DatasiftStreamProvider.class);
+
+ private static DatasiftConfiguration config = DatasiftStreamConfigurator.detectConfiguration(StreamsConfigurator.config);
+
+ DataSiftClient client;
+ Map<String, ManagedSource> currentManagedSourceMap = Maps.newHashMap();
+ List<ManagedSource> updatedManagedSourceList;
+
+ public static void main(String[] args) {
+ DatasiftManagedSourceSetup job = new DatasiftManagedSourceSetup();
+ (new Thread(job)).start();
+ }
+
+ @Override
+ public void run() {
+
+ setup();
+
+ current();
+
+ updatedManagedSourceList = config.getManagedSources();
+
+ for( ManagedSource source : updatedManagedSourceList ) {
+ ManagedSource current = currentManagedSourceMap.get( source.getId() );
+ ManagedSource updated = client.managedSource().update(current.getName(), (DataSource) source, current).sync();
+ }
+
+ }
+
+ public void setup() {
+ client = DatasiftStreamProvider.getNewClient(config.getUserName(), config.getApiKey());
+ }
+
+ public void current() {
+ ManagedSourceList managedSources = client.managedSource().get().sync();
+ Iterator<ManagedSource> managedSourceIterator = managedSources.iterator();
+ while( managedSourceIterator.hasNext() ) {
+ ManagedSource source = managedSourceIterator.next();
+ currentManagedSourceMap.put(source.getId(), source);
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e6380ceb/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamConfigurator.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamConfigurator.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamConfigurator.java
index 7025d39..5726b4f 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamConfigurator.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamConfigurator.java
@@ -34,8 +34,14 @@ public class DatasiftStreamConfigurator {
public static DatasiftConfiguration detectConfiguration(Config datasift) {
- DatasiftConfiguration datasiftConfiguration;
- datasiftConfiguration = StreamsJacksonMapper.getInstance().convertValue(datasift.root().render(ConfigRenderOptions.concise()), DatasiftConfiguration.class);
+ DatasiftConfiguration datasiftConfiguration = null;
+
+ try {
+ datasiftConfiguration = mapper.readValue(datasift.root().render(ConfigRenderOptions.concise()), DatasiftConfiguration.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ LOGGER.warn("Could not parse datasiftConfiguration");
+ }
return datasiftConfiguration;
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e6380ceb/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamProvider.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamProvider.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamProvider.java
index 8ed1443..c3f5ea3 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamProvider.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/provider/DatasiftStreamProvider.java
@@ -128,7 +128,7 @@ public class DatasiftStreamProvider implements StreamsProvider {
* @param apiKey
* @return
*/
- protected DataSiftClient getNewClient(String userName, String apiKey) {
+ protected static DataSiftClient getNewClient(String userName, String apiKey) {
return new DataSiftClient(new DataSiftConfig(userName, apiKey));
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/e6380ceb/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftConfiguration.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftConfiguration.json
index ae9daa6..e024f43 100644
--- a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftConfiguration.json
+++ b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftConfiguration.json
@@ -31,100 +31,8 @@
"type": "array",
"minItems": 0,
"items": {
- "javaType": "org.apache.streams.datasift.managed.ManagedSource",
"type": "object",
- "properties": {
- "auth": {
- "type": "array",
- "items": {
- "javaType": "org.apache.streams.datasift.managed.ManagedSourceAuth",
- "type": "object",
- "properties": {
- "identity_id": {
- "type": "string"
- },
- "parameters": {
- "type": "object",
- "properties": {
- "value": {
- "type": "string"
- }
- }
- }
- }
- }
- },
- "created_at": {
- "type": "number"
- },
- "id": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "parameters": {
- "javaType": "org.apache.streams.datasift.managed.ManagedSourceParameters",
- "type": "object",
- "properties": {
- "comments": {
- "type": "boolean"
- },
- "likes": {
- "type": "boolean"
- }
- }
- },
- "resources": {
- "type": "array",
- "items": [
- {
- "javaType": "org.apache.streams.datasift.managed.ManagedSourceResource",
- "type": "object",
- "properties": {
- "parameters": {
- "type": "object",
- "properties": {
- "distance": {
- "type": "string"
- },
- "exact_match": {
- "type": "string"
- },
- "foursq": {
- "type": "string"
- },
- "lat": {
- "type": "string"
- },
- "lng": {
- "type": "string"
- },
- "type": {
- "type": "string"
- },
- "usermeta": {
- "type": "string"
- },
- "value": {
- "type": "number"
- }
- }
- },
- "resource_id": {
- "type": "string"
- }
- }
- }
- ]
- },
- "source_type": {
- "type": "string"
- },
- "status": {
- "type": "string"
- }
- }
+ "javaType": "com.datasift.client.managedsource.ManagedSource"
}
}
}