You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/05/22 15:53:08 UTC
[1/2] git commit: STREAMS-91 | Removed change to hashtag object schema
Repository: incubator-streams
Updated Branches:
refs/heads/master c5142b310 -> 18b358f64
STREAMS-91 | Removed change to hashtag object schema
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/18b358f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/18b358f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/18b358f6
Branch: refs/heads/master
Commit: 18b358f64f954eca5ce42c95920568d8bef05dab
Parents: f4a060e
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Wed May 21 12:28:55 2014 -0500
Committer: mfranklin <mf...@apache.org>
Committed: Thu May 22 09:52:37 2014 -0400
----------------------------------------------------------------------
.../src/main/jsonschema/com/twitter/tweet.json | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/18b358f6/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json b/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json
index 8ad1ab8..8919185 100644
--- a/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json
+++ b/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json
@@ -1,4 +1,3 @@
-
{
"type": "object",
"$schema": "http://json-schema.org/draft-03/schema",
@@ -85,22 +84,11 @@
},
"hashtags": {
"type": "array",
- "items": {
- "type": "object",
- "javaType": "org.apache.streams.twitter.pojo.Hashtag",
- "javaInterfaces": ["java.io.Serializable"],
- "properties": {
- "text": {
- "type": "string"
- },
- "indices": {
- "type": "array",
- "items": [{
- "type": "integer"
- }]
- }
+ "items": [
+ {
+ "type": "string"
}
- }
+ ]
},
"urls": {
"type": "array",
[2/2] git commit: STREAMS-91 | Changed the json schema for the tweet
object in order to remove old Contributor style. Now a contributor simply
consists of a list of longs representing user IDs
Posted by mf...@apache.org.
STREAMS-91 | Changed the json schema for the tweet object in order to remove old Contributor style. Now a contributor simply consists of a list of longs representing user IDs
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/f4a060ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/f4a060ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/f4a060ed
Branch: refs/heads/master
Commit: f4a060ed01dc6d9e494b0dd6028d7db6adf91a5c
Parents: c5142b3
Author: Robert Douglas <rd...@w2odigital.com>
Authored: Wed May 21 12:27:30 2014 -0500
Committer: mfranklin <mf...@apache.org>
Committed: Thu May 22 09:52:37 2014 -0400
----------------------------------------------------------------------
.../src/main/jsonschema/com/twitter/tweet.json | 41 ++++++++++----------
1 file changed, 20 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/f4a060ed/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json b/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json
index 6082fb8..8ad1ab8 100644
--- a/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json
+++ b/streams-contrib/streams-provider-twitter/src/main/jsonschema/com/twitter/tweet.json
@@ -1,3 +1,4 @@
+
{
"type": "object",
"$schema": "http://json-schema.org/draft-03/schema",
@@ -21,24 +22,11 @@
"type": "string"
},
"contributors": {
+ "ignore_malformed": false,
"type": "array",
- "items": {
- "type": "object",
- "javaType" : "org.apache.streams.twitter.pojo.Contributor",
- "javaInterfaces": ["java.io.Serializable"],
- "properties": {
- "id": {
- "ignore_malformed": false,
- "type": "integer"
- },
- "id_str": {
- "type": "string"
- },
- "screen_name": {
- "type": "string"
- }
- }
- }
+ "items": [{
+ "type" : "number"
+ }]
},
"coordinates": {
"type": "object",
@@ -97,11 +85,22 @@
},
"hashtags": {
"type": "array",
- "items": [
- {
- "type": "string"
+ "items": {
+ "type": "object",
+ "javaType": "org.apache.streams.twitter.pojo.Hashtag",
+ "javaInterfaces": ["java.io.Serializable"],
+ "properties": {
+ "text": {
+ "type": "string"
+ },
+ "indices": {
+ "type": "array",
+ "items": [{
+ "type": "integer"
+ }]
+ }
}
- ]
+ }
},
"urls": {
"type": "array",