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/13 01:04:55 UTC

[11/13] git commit: broke channels within Datasift.json out into fragments

broke channels within Datasift.json out into fragments


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/199881d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/199881d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/199881d5

Branch: refs/heads/STREAMS-142
Commit: 199881d547c996fdbde3c07ddb6a28c417d365da
Parents: 4cb20a1
Author: sblackmon <sb...@apache.org>
Authored: Mon Aug 11 18:24:58 2014 -0500
Committer: sblackmon <sb...@apache.org>
Committed: Tue Aug 12 18:04:24 2014 -0500

----------------------------------------------------------------------
 pom.xml                                         |    2 +-
 .../streams-provider-datasift/pom.xml           |    7 +-
 .../streams/datasift/csdl/DatasiftCsdlUtil.java |    6 +-
 .../provider/DatasiftManagedSourceSetup.java    |    5 -
 .../provider/DatasiftStreamConfigurator.java    |    1 -
 .../DatasiftInstagramActivitySerializer.java    |    6 -
 .../main/jsonschema/com/datasift/Datasift.json  | 1226 ------------------
 .../com/datasift/DatasiftConfiguration.json     |  133 --
 .../com/datasift/DatasiftPushConfiguration.json |   17 -
 .../datasift/DatasiftStreamConfiguration.json   |   17 -
 .../com/datasift/DatasiftTwitterUser.json       |   68 -
 .../org/apache/streams/datasift/Datasift.json   |  458 +++++++
 .../streams/datasift/DatasiftConfiguration.json |  133 ++
 .../datasift/DatasiftPushConfiguration.json     |   17 +
 .../datasift/DatasiftStreamConfiguration.json   |   17 +
 .../datasift/facebook/DatasiftFacebook.json     |  120 ++
 .../datasift/instagram/DatasiftInstagram.json   |  178 +++
 .../interaction/DatasiftInteraction.json        |   92 ++
 .../datasift/twitter/DatasiftTwitter.json       |  611 +++++++++
 .../datasift/twitter/DatasiftTwitterUser.json   |   68 +
 20 files changed, 1700 insertions(+), 1482 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 419ef89..5f5d5d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <joda-time.version>2.2</joda-time.version>
         <rave.version>0.22</rave.version>
         <datastax.version>1.0.3</datastax.version>
-        <jsonschema2pojo.version>0.4.1</jsonschema2pojo.version>
+        <jsonschema2pojo.version>0.4.5</jsonschema2pojo.version>
         <jaxb2.version>0.8.3</jaxb2.version>
         <jaxb2-basics.version>0.6.5</jaxb2-basics.version>
         <jaxbutil.version>1.2.6</jaxbutil.version>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/streams-contrib/streams-provider-datasift/pom.xml
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/pom.xml b/streams-contrib/streams-provider-datasift/pom.xml
index b68e261..f2aab08 100644
--- a/streams-contrib/streams-provider-datasift/pom.xml
+++ b/streams-contrib/streams-provider-datasift/pom.xml
@@ -127,12 +127,9 @@
                 <configuration>
                     <addCompileSourceRoot>true</addCompileSourceRoot>
                     <generateBuilders>true</generateBuilders>
-                    <sourcePaths>
-                        <sourcePath>src/main/jsonschema/com/datasift/Datasift.json</sourcePath>
-                        <sourcePath>src/main/jsonschema/com/datasift/DatasiftConfiguration.json</sourcePath>
-                    </sourcePaths>
+                    <sourceDirectory>src/main/jsonschema</sourceDirectory>
                     <outputDirectory>target/generated-sources/jsonschema2pojo</outputDirectory>
-                    <targetPackage>com.datasift</targetPackage>
+                    <targetPackage>org.apache.streams.datasift</targetPackage>
                     <useLongIntegers>true</useLongIntegers>
                     <useJodaDates>true</useJodaDates>
                 </configuration>

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/csdl/DatasiftCsdlUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/csdl/DatasiftCsdlUtil.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/csdl/DatasiftCsdlUtil.java
index e317e51..7ff03fb 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/csdl/DatasiftCsdlUtil.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/csdl/DatasiftCsdlUtil.java
@@ -1,12 +1,12 @@
 package org.apache.streams.datasift.csdl;
 
-import java.util.List;
-import java.util.ListIterator;
-
 import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.ListIterator;
+
 public class DatasiftCsdlUtil {
 
 	private static final Logger log = LoggerFactory

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/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
index 9e2f99e..4939180 100644
--- 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
@@ -1,15 +1,11 @@
 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.fasterxml.jackson.databind.ObjectMapper;
-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.apache.streams.datasift.managed.StreamsManagedSource;
@@ -20,7 +16,6 @@ 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.

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/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 07716a1..b9d31ff 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
@@ -23,7 +23,6 @@ import com.typesafe.config.Config;
 import com.typesafe.config.ConfigRenderOptions;
 import org.apache.streams.datasift.DatasiftConfiguration;
 import org.apache.streams.datasift.util.StreamsDatasiftMapper;
-import org.apache.streams.jackson.StreamsJacksonMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializer.java
index 4149fe3..cb44df2 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInstagramActivitySerializer.java
@@ -21,22 +21,16 @@ package org.apache.streams.datasift.serializer;
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import org.apache.streams.data.util.RFC3339Utils;
 import org.apache.streams.datasift.Datasift;
 import org.apache.streams.datasift.instagram.From;
 import org.apache.streams.datasift.instagram.Instagram;
-import org.apache.streams.datasift.interaction.Interaction;
 import org.apache.streams.instagram.serializer.util.InstagramActivityUtil;
 import org.apache.streams.pojo.json.Activity;
 import org.apache.streams.pojo.json.Actor;
 import org.apache.streams.pojo.json.Image;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
deleted file mode 100644
index 0c21302..0000000
--- a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/Datasift.json
+++ /dev/null
@@ -1,1226 +0,0 @@
-{
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-03/schema",
-    "javaType": "org.apache.streams.datasift.Datasift",
-    "properties": {
-        "blog": {
-            "javaType": "org.apache.streams.datasift.blog.Blog",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "author": {
-                    "type": "object",
-                    "javaType": "org.apache.streams.datasift.blog.BlogAuthor",
-                    "dynamic": "true",
-                    "properties": {
-                        "link": {
-                            "type": "string"
-                        },
-                        "name": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "content": {
-                    "type": "string"
-                },
-                "contenttype": {
-                    "type": "string"
-                },
-                "created_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "domain": {
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "link": {
-                    "type": "string"
-                },
-                "title": {
-                    "type": "string"
-                },
-                "type": {
-                    "type": "string"
-                }
-            }
-        },
-        "demographic": {
-            "dynamic": "true",
-            "properties": {
-                "gender": {
-                    "type": "string"
-                }
-            }
-        },
-        "facebook": {
-            "javaType": "org.apache.streams.datasift.config.Facebook",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "application": {
-                    "type": "string"
-                },
-                "author": {
-                    "javaType": "org.apache.streams.datasift.config.Author",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "avatar": {
-                            "type": "string"
-                        },
-                        "id": {
-                            "type": "string"
-                        },
-                        "link": {
-                            "type": "string"
-                        },
-                        "name": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "created_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "likes": {
-                    "javaType": "org.apache.streams.datasift.config.Likes",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "count": {
-                            "type": "integer"
-                        },
-                        "ids": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "names": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        }
-                    }
-                },
-                "message": {
-                    "type": "string"
-                },
-                "source": {
-                    "type": "string"
-                },
-                "to": {
-                    "javaType": "org.apache.streams.datasift.config.To",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "ids": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "names": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        }
-                    }
-                },
-                "type": {
-                    "type": "string"
-                }
-            }
-        },
-        "instagram": {
-            "javaType": "org.apache.streams.datasift.instagram.Instagram",
-            "type": "object",
-            "properties": {
-                "caption": {
-                    "type": "object",
-                    "properties": {
-                        "created_time": {
-                            "type": "number"
-                        },
-                        "id": {
-                            "type": "string"
-                        },
-                        "text": {
-                            "type": "string"
-                        },
-                        "from": {
-                            "type": "object",
-                            "properties": {
-                                "full_name": {
-                                    "type": "array",
-                                    "items": [
-                                        {
-                                            "type": "string"
-                                        }
-                                    ]
-                                },
-                                "id": {
-                                    "type": "string"
-                                },
-                                "profile_picture": {
-                                    "type": "string"
-                                },
-                                "username": {
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    }
-                },
-                "created_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "from": {
-                    "javaType": "org.apache.streams.datasift.instagram.From",
-                    "type": "object",
-                    "properties": {
-                        "full_name": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "id": {
-                            "type": "string"
-                        },
-                        "profile_picture": {
-                            "type": "string"
-                        },
-                        "username": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "id": {
-                    "type": "string"
-                },
-                "images": {
-                    "type": "object",
-                    "properties": {
-                        "low_resolution": {
-                            "type": "object"
-                        },
-                        "standard_resolution": {
-                            "type": "object"
-                        },
-                        "thumbnail": {
-                            "type": "object"
-                        }
-                    }
-                },
-                "media": {
-                    "javaType": "org.apache.streams.datasift.instagram.Media",
-                    "type": "object",
-                    "properties": {
-                        "caption": {
-                            "type": "string"
-                        },
-                        "created_time": {
-                            "type": "number"
-                        },
-                        "filter": {
-                            "type": "string"
-                        },
-                        "id": {
-                            "type": "string"
-                        },
-                        "image": {
-                            "type": "string"
-                        },
-                        "link": {
-                            "type": "string"
-                        },
-                        "tags": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        },
-                        "type": {
-                            "type": "string"
-                        },
-                        "username": {
-                            "type": "string"
-                        },
-                        "video": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "tags": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "type": {
-                    "type": "string"
-                }
-            }
-        },
-        "interaction": {
-            "javaType": "org.apache.streams.datasift.interaction.Interaction",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "author": {
-                    "javaType": "org.apache.streams.datasift.interaction.Author",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "avatar": {
-                            "type": "string"
-                        },
-                        "id": {
-                            "type": "integer"
-                        },
-                        "link": {
-                            "type": "string"
-                        },
-                        "name": {
-                            "type": "string"
-                        },
-                        "username": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "content": {
-                    "type": "string"
-                },
-                "contenttype": {
-                    "type": "string"
-                },
-                "created_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "geo": {
-                    "javaType": "org.apache.streams.datasift.interaction.Geo",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "latitude": {
-                            "type": "number"
-                        },
-                        "longitude": {
-                            "type": "number"
-                        }
-                    }
-                },
-                "id": {
-                    "type": "string"
-                },
-                "link": {
-                    "type": "string"
-                },
-                "received_at": {
-                    "type": "long"
-                },
-                "subtype": {
-                    "type": "string"
-                },
-                "schema": {
-                    "dynamic": "true",
-                    "properties": {
-                        "version": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "source": {
-                    "type": "string"
-                },
-                "subtype": {
-                    "type": "string"
-                },
-                "tags": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "title": {
-                    "type": "string"
-                },
-                "type": {
-                    "type": "string"
-                }
-            }
-        },
-        "klout": {
-            "javaType": "org.apache.streams.datasift.klout.Klout",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "score": {
-                    "type": "integer"
-                }
-            }
-        },
-        "language": {
-            "javaType": "org.apache.streams.datasift.interaction.Language",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "confidence": {
-                    "type": "integer"
-                },
-                "tag": {
-                    "type": "string"
-                },
-                "tag_extended": {
-                    "type": "string"
-                }
-            }
-        },
-        "links": {
-            "javaType": "org.apache.streams.datasift.interaction.Links",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "code": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "integer"
-                        }
-                    ]
-                },
-                "created_at": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "hops": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "meta": {
-                    "dynamic": "true",
-                    "javaType": "org.apache.streams.datasift.interaction.Meta",
-                    "type": "object",
-                    "properties": {
-                        "charset": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "content_type": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "description": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "keywords": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "lang": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "opengraph": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "javaType": "org.apache.streams.datasift.interaction.meta.OpenGraph",
-                                    "type": "object",
-                                    "dynamic": "true",
-                                    "properties": {
-                                        "description": {
-                                            "type": "string"
-                                        },
-                                        "image": {
-                                            "type": "string"
-                                        },
-                                        "site_name": {
-                                            "type": "string"
-                                        },
-                                        "title": {
-                                            "type": "string"
-                                        },
-                                        "type": {
-                                            "type": "string"
-                                        },
-                                        "url": {
-                                            "type": "string"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        "twitter": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "javaType": "org.apache.streams.datasift.interaction.meta.Twitter",
-                                    "type": "object",
-                                    "dynamic": "true",
-                                    "properties": {
-                                        "card": {
-                                            "type": "string"
-                                        },
-                                        "creator": {
-                                            "type": "string"
-                                        },
-                                        "description": {
-                                            "type": "string"
-                                        },
-                                        "image": {
-                                            "type": "string"
-                                        },
-                                        "player": {
-                                            "type": "string"
-                                        },
-                                        "player_height": {
-                                            "type": "string"
-                                        },
-                                        "player_width": {
-                                            "type": "string"
-                                        },
-                                        "site": {
-                                            "type": "string"
-                                        },
-                                        "title": {
-                                            "type": "string"
-                                        },
-                                        "url": {
-                                            "type": "string"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                },
-                "normalized_url": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "retweet_count": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "long"
-                        }
-                    ]
-                },
-                "title": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "url": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                }
-            }
-        },
-        "salience": {
-            "javaType": "org.apache.streams.datasift.salience.Salience",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "content": {
-                    "javaType": "org.apache.streams.datasift.salience.content.Content",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "entities": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "javaType": "org.apache.streams.datasift.salience.content.Entities",
-                                    "type": "object",
-                                    "dynamic": "true",
-                                    "properties": {
-                                        "about": {
-                                            "type": "integer"
-                                        },
-                                        "confident": {
-                                            "type": "integer"
-                                        },
-                                        "evidence": {
-                                            "type": "integer"
-                                        },
-                                        "label": {
-                                            "type": "string"
-                                        },
-                                        "name": {
-                                            "type": "string"
-                                        },
-                                        "sentiment": {
-                                            "type": "integer"
-                                        },
-                                        "themes": {
-                                            "type": "string"
-                                        },
-                                        "type": {
-                                            "type": "string"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        "sentiment": {
-                            "type": "integer"
-                        }
-                    }
-                },
-                "title": {
-                    "javaType": "org.apache.streams.datasift.salience.title.Title",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "entities": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "javaType": "org.apache.streams.datasift.salience.title.Entities",
-                                    "type": "object",
-                                    "dynamic": "true",
-                                    "properties": {
-                                        "about": {
-                                            "type": "integer"
-                                        },
-                                        "confident": {
-                                            "type": "integer"
-                                        },
-                                        "evidence": {
-                                            "type": "integer"
-                                        },
-                                        "label": {
-                                            "type": "string"
-                                        },
-                                        "name": {
-                                            "type": "string"
-                                        },
-                                        "sentiment": {
-                                            "type": "integer"
-                                        },
-                                        "themes": {
-                                            "type": "string"
-                                        },
-                                        "type": {
-                                            "type": "string"
-                                        }
-                                    }
-                                }
-                            ]
-                        },
-                        "sentiment": {
-                            "type": "integer"
-                        }
-                    }
-                }
-            }
-        },
-        "trends": {
-            "javaType": "org.apache.streams.datasift.trends.Trends",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "content": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "source": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "type": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                }
-            }
-        },
-        "twitter": {
-            "javaType": "org.apache.streams.datasift.twitter.Twitter",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "created_at": {
-                    "type": "string"
-                },
-                "display_urls": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "domains": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "filter_level": {
-                    "type": "string"
-                },
-                "geo": {
-                    "javaType": "org.apache.streams.datasift.twitter.Geo",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "latitude": {
-                            "type": "number"
-                        },
-                        "longitude": {
-                            "type": "number"
-                        }
-                    }
-                },
-                "hashtags": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "id": {
-                    "type": "string"
-                },
-                "in_reply_to_screen_name": {
-                    "type": "string"
-                },
-                "in_reply_to_status_id": {
-                    "type": "string"
-                },
-                "in_reply_to_user_id": {
-                    "type": "string"
-                },
-                "lang": {
-                    "type": "string"
-                },
-                "links": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "media": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "javaType": "org.apache.streams.datasift.twitter.Media",
-                            "type": "object",
-                            "dynamic": "true",
-                            "properties": {
-                                "display_url": {
-                                    "type": "string"
-                                },
-                                "expanded_url": {
-                                    "type": "string"
-                                },
-                                "id": {
-                                    "type": "integer"
-                                },
-                                "id_str": {
-                                    "type": "string"
-                                },
-                                "media_url": {
-                                    "type": "string"
-                                },
-                                "media_url_https": {
-                                    "type": "string"
-                                },
-                                "sizes": {
-                                    "dynamic": "true",
-                                    "properties": {
-                                        "large": {
-                                            "dynamic": "true",
-                                            "properties": {
-                                                "h": {
-                                                    "type": "integer"
-                                                },
-                                                "resize": {
-                                                    "type": "string"
-                                                },
-                                                "w": {
-                                                    "type": "integer"
-                                                }
-                                            }
-                                        },
-                                        "medium": {
-                                            "dynamic": "true",
-                                            "properties": {
-                                                "h": {
-                                                    "type": "integer"
-                                                },
-                                                "resize": {
-                                                    "type": "string"
-                                                },
-                                                "w": {
-                                                    "type": "integer"
-                                                }
-                                            }
-                                        },
-                                        "small": {
-                                            "dynamic": "true",
-                                            "properties": {
-                                                "h": {
-                                                    "type": "integer"
-                                                },
-                                                "resize": {
-                                                    "type": "string"
-                                                },
-                                                "w": {
-                                                    "type": "integer"
-                                                }
-                                            }
-                                        },
-                                        "thumb": {
-                                            "dynamic": "true",
-                                            "properties": {
-                                                "h": {
-                                                    "type": "integer"
-                                                },
-                                                "resize": {
-                                                    "type": "string"
-                                                },
-                                                "w": {
-                                                    "type": "integer"
-                                                }
-                                            }
-                                        }
-                                    }
-                                },
-                                "source_status_id": {
-                                    "type": "integer"
-                                },
-                                "source_status_id_str": {
-                                    "type": "string"
-                                },
-                                "type": {
-                                    "type": "string"
-                                },
-                                "url": {
-                                    "type": "string"
-                                }
-                            }
-                        }
-                    ]
-                },
-                "mention_ids": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "mentions": {
-                    "type": "array",
-                    "items": [
-                        {
-                            "type": "string"
-                        }
-                    ]
-                },
-                "place": {
-                    "javaType": "org.apache.streams.datasift.twitter.Place",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "attributes": {
-                            "dynamic": "true",
-                            "properties": {
-                                "street_address": {
-                                    "type": "string"
-                                }
-                            }
-                        },
-                        "country": {
-                            "type": "string"
-                        },
-                        "country_code": {
-                            "type": "string"
-                        },
-                        "full_name": {
-                            "type": "string"
-                        },
-                        "id": {
-                            "type": "string"
-                        },
-                        "name": {
-                            "type": "string"
-                        },
-                        "place_type": {
-                            "type": "string"
-                        },
-                        "url": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "retweet": {
-                    "javaType": "org.apache.streams.datasift.twitter.Retweet",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "count": {
-                            "type": "integer"
-                        },
-                        "created_at": {
-                            "type": "string"
-                        },
-                        "domains": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "hashtags": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "id": {
-                            "type": "string"
-                        },
-                        "lang": {
-                            "type": "string"
-                        },
-                        "links": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "media": {
-                            "dynamic": "true",
-                            "properties": {
-                                "display_url": {
-                                    "type": "string"
-                                },
-                                "expanded_url": {
-                                    "type": "string"
-                                },
-                                "id": {
-                                    "type": "integer"
-                                },
-                                "id_str": {
-                                    "type": "string"
-                                },
-                                "media_url": {
-                                    "type": "string"
-                                },
-                                "media_url_https": {
-                                    "type": "string"
-                                },
-                                "sizes": {
-                                    "dynamic": "true",
-                                    "properties": {
-                                        "large": {
-                                            "dynamic": "true",
-                                            "properties": {
-                                                "h": {
-                                                    "type": "integer"
-                                                },
-                                                "resize": {
-                                                    "type": "string"
-                                                },
-                                                "w": {
-                                                    "type": "integer"
-                                                }
-                                            }
-                                        },
-                                        "medium": {
-                                            "dynamic": "true",
-                                            "properties": {
-                                                "h": {
-                                                    "type": "integer"
-                                                },
-                                                "resize": {
-                                                    "type": "string"
-                                                },
-                                                "w": {
-                                                    "type": "integer"
-                                                }
-                                            }
-                                        },
-                                        "small": {
-                                            "dynamic": "true",
-                                            "properties": {
-                                                "h": {
-                                                    "type": "integer"
-                                                },
-                                                "resize": {
-                                                    "type": "string"
-                                                },
-                                                "w": {
-                                                    "type": "integer"
-                                                }
-                                            }
-                                        },
-                                        "thumb": {
-                                            "dynamic": "true",
-                                            "properties": {
-                                                "h": {
-                                                    "type": "integer"
-                                                },
-                                                "resize": {
-                                                    "type": "string"
-                                                },
-                                                "w": {
-                                                    "type": "integer"
-                                                }
-                                            }
-                                        }
-                                    }
-                                },
-                                "source_status_id": {
-                                    "type": "integer"
-                                },
-                                "source_status_id_str": {
-                                    "type": "string"
-                                },
-                                "type": {
-                                    "type": "string"
-                                },
-                                "url": {
-                                    "type": "string"
-                                }
-                            }
-                        },
-                        "mention_ids": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "integer"
-                                }
-                            ]
-                        },
-                        "mentions": {
-                            "type": "array",
-                            "items": [
-                                {
-                                    "type": "string"
-                                }
-                            ]
-                        },
-                        "source": {
-                            "type": "string"
-                        },
-                        "text": {
-                            "type": "string"
-                        },
-                        "user": {
-                            "type": "DatasiftTwitterUser",
-                            "$ref": "./DatasiftTwitterUser.json"
-                        }
-                    }
-                },
-                "retweeted": {
-                    "javaType": "org.apache.streams.datasift.twitter.Retweeted",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "created_at": {
-                            "type": "string"
-                        },
-                        "geo": {
-                            "dynamic": "true",
-                            "properties": {
-                                "latitude": {
-                                    "type": "number"
-                                },
-                                "longitude": {
-                                    "type": "number"
-                                }
-                            }
-                        },
-                        "id": {
-                            "type": "string"
-                        },
-                        "place": {
-                            "dynamic": "true",
-                            "properties": {
-                                "attributes": {
-                                    "type": "object",
-                                    "dynamic": "true"
-                                },
-                                "country": {
-                                    "type": "string"
-                                },
-                                "country_code": {
-                                    "type": "string"
-                                },
-                                "full_name": {
-                                    "type": "string"
-                                },
-                                "id": {
-                                    "type": "string"
-                                },
-                                "name": {
-                                    "type": "string"
-                                },
-                                "place_type": {
-                                    "type": "string"
-                                },
-                                "url": {
-                                    "type": "string"
-                                }
-                            }
-                        },
-                        "source": {
-                            "type": "string"
-                        },
-                        "user": {
-                            "type": "DatasiftTwitterUser",
-                            "$ref": "./DatasiftTwitterUser.json"
-                        }
-                    }
-                },
-                "source": {
-                    "type": "string"
-                },
-                "text": {
-                    "type": "string"
-                },
-                "user": {
-                    "type": "DatasiftTwitterUser",
-                    "$ref": "./DatasiftTwitterUser.json"
-                }
-            }
-        },
-        "youtube": {
-            "javaType": "org.apache.streams.datasift.youtube.YouTube",
-            "type": "object",
-            "dynamic": "true",
-            "properties": {
-                "author": {
-                    "javaType": "org.apache.streams.datasift.youtube.Author",
-                    "type": "object",
-                    "dynamic": "true",
-                    "properties": {
-                        "link": {
-                            "type": "string"
-                        },
-                        "name": {
-                            "type": "string"
-                        }
-                    }
-                },
-                "commentslink": {
-                    "type": "string"
-                },
-                "content": {
-                    "type": "string"
-                },
-                "contenttype": {
-                    "type": "string"
-                },
-                "created_at": {
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "title": {
-                    "type": "string"
-                },
-                "type": {
-                    "type": "string"
-                },
-                "videolink": {
-                    "type": "string"
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/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
deleted file mode 100644
index 9a0f027..0000000
--- a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftConfiguration.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-03/schema",
-    "id": "#",
-    "javaType": "org.apache.streams.datasift.DatasiftConfiguration",
-    "javaInterfaces": [
-        "java.io.Serializable"
-    ],
-    "properties": {
-        "apiKey": {
-            "type": "string"
-        },
-        "userName": {
-            "type": "string"
-        },
-        "streamHash": {
-            "type": "array",
-            "minItems": 0,
-            "items": {
-                "type": "string"
-            }
-        },
-        "streamCsdl": {
-            "type": "array",
-            "minItems": 0,
-            "items": {
-                "type": "string"
-            }
-        },
-        "managedSources": {
-            "type": "array",
-            "minItems": 0,
-            "items": {
-                "javaType": "org.apache.streams.datasift.managed.StreamsManagedSource",
-                "type": "object",
-                "properties": {
-                    "auth": {
-                        "type": "array",
-                        "items": {
-                            "javaType": "org.apache.streams.datasift.managed.StreamsManagedSourceAuth",
-                            "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.StreamsManagedSourceParams",
-                        "type": "object",
-                        "properties": {
-                            "comments": {
-                                "type": "boolean"
-                            },
-                            "likes": {
-                                "type": "boolean"
-                            }
-                        }
-                    },
-                    "resources": {
-                        "type": "array",
-                        "items": [
-                            {
-                                "javaType": "org.apache.streams.datasift.managed.StreamsManagedSourceResource",
-                                "type": "object",
-                                "properties": {
-                                    "parameters": {
-                                        "type": "object",
-                                        "properties": {
-                                            "distance": {
-                                                "type": "number"
-                                            },
-                                            "exact_match": {
-                                                "type": "string"
-                                            },
-                                            "foursq": {
-                                                "type": "string"
-                                            },
-                                            "lat": {
-                                                "type": "number"
-                                            },
-                                            "lng": {
-                                                "type": "number"
-                                            },
-                                            "type": {
-                                                "type": "string",
-                                                "enum" : ["user", "tag", "area", "location", "popular"]
-                                            },
-                                            "usermeta": {
-                                                "type": "string"
-                                            },
-                                            "value": {
-                                                "type": "number"
-                                            }
-                                        }
-                                    },
-                                    "resource_id": {
-                                        "type": "string"
-                                    }
-                                }
-                            }
-                        ]
-                    },
-                    "source_type": {
-                        "type": "string",
-                        "enum" : ["facebook_page", "googleplus", "instagram", "yammer"]
-                    },
-                    "status": {
-                        "type": "string"
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftPushConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftPushConfiguration.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftPushConfiguration.json
deleted file mode 100644
index bb65ef0..0000000
--- a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftPushConfiguration.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-03/schema",
-    "id": "#",
-    "javaType" : "org.apache.streams.datasift.DatasiftPushConfiguration",
-    "extends": {"$ref":"DatasiftConfiguration.json"},
-    "javaInterfaces": ["java.io.Serializable"],
-    "properties": {
-        "streamHash": {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-                "type": "string"
-            }
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftStreamConfiguration.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftStreamConfiguration.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftStreamConfiguration.json
deleted file mode 100644
index 91a9974..0000000
--- a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftStreamConfiguration.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-03/schema",
-    "id": "#",
-    "javaType" : "org.apache.streams.datasift.DatasiftStreamConfiguration",
-    "extends": {"$ref":"DatasiftConfiguration.json"},
-    "javaInterfaces": ["java.io.Serializable"],
-    "properties": {
-        "streamHash": {
-            "type": "array",
-            "minItems": 1,
-            "items": {
-                "type": "string"
-            }
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftTwitterUser.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftTwitterUser.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftTwitterUser.json
deleted file mode 100644
index 3be49ff..0000000
--- a/streams-contrib/streams-provider-datasift/src/main/jsonschema/com/datasift/DatasiftTwitterUser.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "type": "object",
-    "$schema": "http://json-schema.org/draft-03/schema",
-    "javaType": "org.apache.streams.datasift.twitter.DatasiftTwitterUser",
-    "properties": {
-        "created_at": {
-            "type": "string",
-            "format": "date-time"
-        },
-        "description": {
-            "type": "string"
-        },
-        "favourites_count": {
-            "type": "integer"
-        },
-        "followers_count": {
-            "type": "integer"
-        },
-        "friends_count": {
-            "type": "integer"
-        },
-        "geo_enabled": {
-            "type": "boolean"
-        },
-        "id": {
-            "type": "integer"
-        },
-        "id_str": {
-            "type": "string"
-        },
-        "lang": {
-            "type": "string"
-        },
-        "listed_count": {
-            "type": "integer"
-        },
-        "location": {
-            "type": "string"
-        },
-        "name": {
-            "type": "string"
-        },
-        "profile_image_url": {
-            "type": "string"
-        },
-        "profile_image_url_https": {
-            "type": "string"
-        },
-        "screen_name": {
-            "type": "string"
-        },
-        "statuses_count": {
-            "type": "integer"
-        },
-        "time_zone": {
-            "type": "string"
-        },
-        "url": {
-            "type": "string"
-        },
-        "utc_offset": {
-            "type": "integer"
-        },
-        "verified": {
-            "type": "boolean"
-        }
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/199881d5/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/Datasift.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/Datasift.json b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/Datasift.json
new file mode 100644
index 0000000..d336d73
--- /dev/null
+++ b/streams-contrib/streams-provider-datasift/src/main/jsonschema/org/apache/streams/datasift/Datasift.json
@@ -0,0 +1,458 @@
+{
+    "type": "object",
+    "$schema": "http://json-schema.org/draft-03/schema",
+    "javaType": "org.apache.streams.datasift.Datasift",
+    "properties": {
+        "blog": {
+            "javaType": "org.apache.streams.datasift.blog.Blog",
+            "type": "object",
+            "dynamic": "true",
+            "properties": {
+                "author": {
+                    "type": "object",
+                    "javaType": "org.apache.streams.datasift.blog.BlogAuthor",
+                    "dynamic": "true",
+                    "properties": {
+                        "link": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "content": {
+                    "type": "string"
+                },
+                "contenttype": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "string",
+                    "format": "date-time"
+                },
+                "domain": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "link": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            }
+        },
+        "demographic": {
+            "dynamic": "true",
+            "properties": {
+                "gender": {
+                    "type": "string"
+                }
+            }
+        },
+        "facebook": {
+            "type": "object",
+            "$ref": "facebook/DatasiftFacebook.json"
+        },
+        "instagram": {
+            "type": "object",
+            "$ref": "instagram/DatasiftInstagram.json"
+        },
+        "interaction": {
+            "type": "object",
+            "$ref": "interaction/DatasiftInteraction.json"
+        },
+        "klout": {
+            "javaType": "org.apache.streams.datasift.interaction.Klout",
+            "type": "object",
+            "dynamic": "true",
+            "properties": {
+                "score": {
+                    "type": "integer"
+                }
+            }
+        },
+        "language": {
+            "javaType": "org.apache.streams.datasift.language.Language",
+            "type": "object",
+            "dynamic": "true",
+            "properties": {
+                "confidence": {
+                    "type": "integer"
+                },
+                "tag": {
+                    "type": "string"
+                },
+                "tag_extended": {
+                    "type": "string"
+                }
+            }
+        },
+        "links": {
+            "javaType": "org.apache.streams.datasift.links.Links",
+            "type": "object",
+            "dynamic": "true",
+            "properties": {
+                "code": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "integer"
+                        }
+                    ]
+                },
+                "created_at": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "string"
+                        }
+                    ]
+                },
+                "hops": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "string"
+                        }
+                    ]
+                },
+                "meta": {
+                    "dynamic": "true",
+                    "javaType": "org.apache.streams.datasift.links.Meta",
+                    "type": "object",
+                    "properties": {
+                        "charset": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "content_type": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "description": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "keywords": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "lang": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "type": "string"
+                                }
+                            ]
+                        },
+                        "opengraph": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "javaType": "org.apache.streams.datasift.interaction.meta.OpenGraph",
+                                    "type": "object",
+                                    "dynamic": "true",
+                                    "properties": {
+                                        "description": {
+                                            "type": "string"
+                                        },
+                                        "image": {
+                                            "type": "string"
+                                        },
+                                        "site_name": {
+                                            "type": "string"
+                                        },
+                                        "title": {
+                                            "type": "string"
+                                        },
+                                        "type": {
+                                            "type": "string"
+                                        },
+                                        "url": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            ]
+                        },
+                        "twitter": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "javaType": "org.apache.streams.datasift.interaction.meta.Twitter",
+                                    "type": "object",
+                                    "dynamic": "true",
+                                    "properties": {
+                                        "card": {
+                                            "type": "string"
+                                        },
+                                        "creator": {
+                                            "type": "string"
+                                        },
+                                        "description": {
+                                            "type": "string"
+                                        },
+                                        "image": {
+                                            "type": "string"
+                                        },
+                                        "player": {
+                                            "type": "string"
+                                        },
+                                        "player_height": {
+                                            "type": "string"
+                                        },
+                                        "player_width": {
+                                            "type": "string"
+                                        },
+                                        "site": {
+                                            "type": "string"
+                                        },
+                                        "title": {
+                                            "type": "string"
+                                        },
+                                        "url": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            ]
+                        }
+                    }
+                },
+                "normalized_url": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "string"
+                        }
+                    ]
+                },
+                "retweet_count": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "long"
+                        }
+                    ]
+                },
+                "title": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "string"
+                        }
+                    ]
+                },
+                "url": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "string"
+                        }
+                    ]
+                }
+            }
+        },
+        "salience": {
+            "javaType": "org.apache.streams.datasift.salience.Salience",
+            "type": "object",
+            "dynamic": "true",
+            "properties": {
+                "content": {
+                    "javaType": "org.apache.streams.datasift.salience.content.Content",
+                    "type": "object",
+                    "dynamic": "true",
+                    "properties": {
+                        "entities": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "javaType": "org.apache.streams.datasift.salience.content.Entities",
+                                    "type": "object",
+                                    "dynamic": "true",
+                                    "properties": {
+                                        "about": {
+                                            "type": "integer"
+                                        },
+                                        "confident": {
+                                            "type": "integer"
+                                        },
+                                        "evidence": {
+                                            "type": "integer"
+                                        },
+                                        "label": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "sentiment": {
+                                            "type": "integer"
+                                        },
+                                        "themes": {
+                                            "type": "string"
+                                        },
+                                        "type": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            ]
+                        },
+                        "sentiment": {
+                            "type": "integer"
+                        }
+                    }
+                },
+                "title": {
+                    "javaType": "org.apache.streams.datasift.salience.title.Title",
+                    "type": "object",
+                    "dynamic": "true",
+                    "properties": {
+                        "entities": {
+                            "type": "array",
+                            "items": [
+                                {
+                                    "javaType": "org.apache.streams.datasift.salience.title.Entities",
+                                    "type": "object",
+                                    "dynamic": "true",
+                                    "properties": {
+                                        "about": {
+                                            "type": "integer"
+                                        },
+                                        "confident": {
+                                            "type": "integer"
+                                        },
+                                        "evidence": {
+                                            "type": "integer"
+                                        },
+                                        "label": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "sentiment": {
+                                            "type": "integer"
+                                        },
+                                        "themes": {
+                                            "type": "string"
+                                        },
+                                        "type": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            ]
+                        },
+                        "sentiment": {
+                            "type": "integer"
+                        }
+                    }
+                }
+            }
+        },
+        "trends": {
+            "javaType": "org.apache.streams.datasift.trends.Trends",
+            "type": "object",
+            "dynamic": "true",
+            "properties": {
+                "content": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "string"
+                        }
+                    ]
+                },
+                "source": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "string"
+                        }
+                    ]
+                },
+                "type": {
+                    "type": "array",
+                    "items": [
+                        {
+                            "type": "string"
+                        }
+                    ]
+                }
+            }
+        },
+        "twitter": {
+            "type": "object",
+            "$ref": "twitter/DatasiftTwitter.json"
+        },
+        "youtube": {
+            "javaType": "org.apache.streams.datasift.youtube.YouTube",
+            "type": "object",
+            "dynamic": "true",
+            "properties": {
+                "author": {
+                    "javaType": "org.apache.streams.datasift.youtube.Author",
+                    "type": "object",
+                    "dynamic": "true",
+                    "properties": {
+                        "link": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "commentslink": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                },
+                "contenttype": {
+                    "type": "string"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "videolink": {
+                    "type": "string"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file