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 2016/10/12 17:42:07 UTC
[34/38] incubator-streams git commit: Merge branch 'STREAMS-389'
Merge branch 'STREAMS-389'
# Conflicts:
# streams-plugins/pom.xml
# streams-plugins/streams-plugin-scala/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/abc58b42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/abc58b42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/abc58b42
Branch: refs/heads/master
Commit: abc58b42db71cad1a9baad51c7a479e56ca4ab4c
Parents: 8e929eb d9674f7
Author: Steve Blackmon @steveblackmon <sb...@apache.org>
Authored: Wed Oct 12 12:27:15 2016 -0500
Committer: Steve Blackmon @steveblackmon <sb...@apache.org>
Committed: Wed Oct 12 12:27:15 2016 -0500
----------------------------------------------------------------------
pom.xml | 7 +-
streams-config/pom.xml | 2 +-
.../src/main/jsonschema/com/twitter/tweet.json | 6 +-
streams-plugins/pom.xml | 6 +
.../streams-plugin-cassandra/pom.xml | 251 ++++++++++++
.../StreamsCassandraGenerationConfig.java | 81 ++++
.../StreamsCassandraResourceGenerator.java | 366 ++++++++++++++++++
.../StreamsCassandraResourceGeneratorMojo.java | 62 +++
.../src/site/markdown/index.md | 36 ++
...treamsCassandraResourceGeneratorCLITest.java | 52 +++
...reamsCassandraResourceGeneratorMojoTest.java | 78 ++++
.../StreamsCassandraResourceGeneratorTest.java | 80 ++++
.../resources/streams-plugin-cassandra/pom.xml | 76 ++++
.../streams-plugin-elasticsearch/pom.xml | 252 ++++++++++++
.../StreamsElasticsearchGenerationConfig.java | 81 ++++
.../StreamsElasticsearchResourceGenerator.java | 380 +++++++++++++++++++
...reamsElasticsearchResourceGeneratorMojo.java | 72 ++++
.../src/site/markdown/index.md | 38 ++
...msElasticsearchResourceGeneratorCLITest.java | 39 ++
...sElasticsearchResourceGeneratorMojoTest.java | 50 +++
...reamsElasticsearchResourceGeneratorTest.java | 110 ++++++
.../streams-plugin-elasticsearch/pom.xml | 76 ++++
streams-plugins/streams-plugin-hbase/pom.xml | 251 ++++++++++++
.../hbase/StreamsHbaseGenerationConfig.java | 90 +++++
.../hbase/StreamsHbaseResourceGenerator.java | 193 ++++++++++
.../StreamsHbaseResourceGeneratorMojo.java | 71 ++++
.../src/site/markdown/index.md | 40 ++
.../StreamsHbaseResourceGeneratorCLITest.java | 41 ++
.../StreamsHbaseResourceGeneratorMojoTest.java | 65 ++++
.../test/StreamsHbaseResourceGeneratorTest.java | 102 +++++
.../test/resources/streams-plugin-hbase/pom.xml | 77 ++++
streams-plugins/streams-plugin-hive/pom.xml | 251 ++++++++++++
.../hive/StreamsHiveGenerationConfig.java | 83 ++++
.../hive/StreamsHiveResourceGenerator.java | 308 +++++++++++++++
.../hive/StreamsHiveResourceGeneratorMojo.java | 63 +++
.../src/site/markdown/index.md | 40 ++
.../StreamsHiveResourceGeneratorCLITest.java | 41 ++
.../StreamsHiveResourceGeneratorMojoTest.java | 64 ++++
.../test/StreamsHiveResourceGeneratorTest.java | 102 +++++
.../src/test/resources/Tweet.hql | 297 +++++++++++++++
.../src/test/resources/expected/activity.hql | 203 ++++++++++
.../src/test/resources/expected/collection.hql | 47 +++
.../src/test/resources/expected/media_link.hql | 11 +
.../src/test/resources/expected/object.hql | 61 +++
.../resources/expected/objectTypes/place.hql | 79 ++++
.../test/resources/expected/verbs/purchase.hql | 203 ++++++++++
.../test/resources/streams-plugin-hive/pom.xml | 76 ++++
streams-plugins/streams-plugin-pig/pom.xml | 251 ++++++++++++
.../plugins/pig/StreamsPigGenerationConfig.java | 83 ++++
.../pig/StreamsPigResourceGenerator.java | 305 +++++++++++++++
.../pig/StreamsPigResourceGeneratorMojo.java | 61 +++
.../src/site/markdown/index.md | 38 ++
.../StreamsPigResourceGeneratorCLITest.java | 39 ++
.../StreamsPigResourceGeneratorMojoTest.java | 64 ++++
.../test/StreamsPigResourceGeneratorTest.java | 100 +++++
.../src/test/resources/expected/media_link.pig | 1 +
.../resources/expected/objectTypes/file.pig | 1 +
.../expected/objectTypes/photo-album.pig | 1 +
.../test/resources/streams-plugin-pig/pom.xml | 76 ++++
streams-plugins/streams-plugin-pojo/pom.xml | 253 ++++++++++++
.../plugins/StreamsPojoGenerationConfig.java | 68 ++++
.../plugins/StreamsPojoSourceGenerator.java | 75 ++++
.../plugins/StreamsPojoSourceGeneratorMojo.java | 95 +++++
.../src/site/markdown/index.md | 38 ++
.../test/StreamsPojoSourceGeneratorCLITest.java | 43 +++
.../StreamsPojoSourceGeneratorMojoTest.java | 68 ++++
.../test/StreamsPojoSourceGeneratorTest.java | 72 ++++
.../test/resources/streams-plugin-pojo/pom.xml | 131 +++++++
streams-plugins/streams-plugin-scala/pom.xml | 12 +
.../plugins/StreamsScalaSourceGenerator.java | 351 +++++++++++++++++
.../StreamsScalaSourceGeneratorMojo.java | 59 +++
.../src/site/markdown/index.md | 36 ++
.../test/StreamsScalaSourceGeneratorTest.java | 55 +++
streams-pojo/pom.xml | 6 +
streams-runtimes/streams-runtime-local/pom.xml | 2 +-
streams-schemas/pom.xml | 39 ++
.../streams-schema-activitystreams/pom.xml | 82 ++++
.../src/main/jsonschema/activity.json | 108 ++++++
.../src/main/jsonschema/collection.json | 47 +++
.../src/main/jsonschema/media_link.json | 34 ++
.../src/main/jsonschema/object.json | 98 +++++
.../src/main/jsonschema/objectTypes/alert.json | 19 +
.../jsonschema/objectTypes/application.json | 19 +
.../main/jsonschema/objectTypes/article.json | 19 +
.../src/main/jsonschema/objectTypes/audio.json | 19 +
.../src/main/jsonschema/objectTypes/badge.json | 19 +
.../src/main/jsonschema/objectTypes/binary.json | 19 +
.../main/jsonschema/objectTypes/bookmark.json | 19 +
.../main/jsonschema/objectTypes/comment.json | 19 +
.../src/main/jsonschema/objectTypes/device.json | 19 +
.../src/main/jsonschema/objectTypes/event.json | 51 +++
.../src/main/jsonschema/objectTypes/file.json | 25 ++
.../src/main/jsonschema/objectTypes/folder.json | 19 +
.../src/main/jsonschema/objectTypes/game.json | 19 +
.../src/main/jsonschema/objectTypes/group.json | 19 +
.../src/main/jsonschema/objectTypes/image.json | 22 ++
.../src/main/jsonschema/objectTypes/issue.json | 25 ++
.../src/main/jsonschema/objectTypes/job.json | 19 +
.../src/main/jsonschema/objectTypes/list.json | 28 ++
.../src/main/jsonschema/objectTypes/note.json | 19 +
.../src/main/jsonschema/objectTypes/offer.json | 19 +
.../jsonschema/objectTypes/organization.json | 19 +
.../src/main/jsonschema/objectTypes/page.json | 19 +
.../main/jsonschema/objectTypes/permission.json | 36 ++
.../src/main/jsonschema/objectTypes/person.json | 25 ++
.../jsonschema/objectTypes/photo-album.json | 19 +
.../src/main/jsonschema/objectTypes/photo.json | 23 ++
.../src/main/jsonschema/objectTypes/place.json | 39 ++
.../main/jsonschema/objectTypes/playlist.json | 19 +
.../main/jsonschema/objectTypes/process.json | 19 +
.../main/jsonschema/objectTypes/product.json | 25 ++
.../main/jsonschema/objectTypes/property.json | 48 +++
.../main/jsonschema/objectTypes/question.json | 28 ++
.../src/main/jsonschema/objectTypes/review.json | 22 ++
.../src/main/jsonschema/objectTypes/role.json | 25 ++
.../main/jsonschema/objectTypes/service.json | 19 +
.../src/main/jsonschema/objectTypes/song.json | 19 +
.../src/main/jsonschema/objectTypes/status.json | 19 +
.../src/main/jsonschema/objectTypes/task.json | 40 ++
.../src/main/jsonschema/objectTypes/team.json | 19 +
.../src/main/jsonschema/objectTypes/video.json | 19 +
.../src/main/jsonschema/verbs/accept.json | 24 ++
.../src/main/jsonschema/verbs/access.json | 24 ++
.../src/main/jsonschema/verbs/acknowledge.json | 24 ++
.../src/main/jsonschema/verbs/add.json | 24 ++
.../src/main/jsonschema/verbs/agree.json | 24 ++
.../src/main/jsonschema/verbs/append.json | 24 ++
.../src/main/jsonschema/verbs/approve.json | 24 ++
.../src/main/jsonschema/verbs/archive.json | 24 ++
.../src/main/jsonschema/verbs/assign.json | 24 ++
.../src/main/jsonschema/verbs/at.json | 24 ++
.../src/main/jsonschema/verbs/attach.json | 24 ++
.../src/main/jsonschema/verbs/attend.json | 24 ++
.../src/main/jsonschema/verbs/author.json | 24 ++
.../src/main/jsonschema/verbs/authorize.json | 24 ++
.../src/main/jsonschema/verbs/borrow.json | 24 ++
.../src/main/jsonschema/verbs/build.json | 24 ++
.../src/main/jsonschema/verbs/cancel.json | 24 ++
.../src/main/jsonschema/verbs/checkin.json | 24 ++
.../src/main/jsonschema/verbs/close.json | 24 ++
.../src/main/jsonschema/verbs/complete.json | 24 ++
.../src/main/jsonschema/verbs/confirm.json | 24 ++
.../src/main/jsonschema/verbs/consume.json | 24 ++
.../src/main/jsonschema/verbs/create.json | 24 ++
.../src/main/jsonschema/verbs/delete.json | 24 ++
.../src/main/jsonschema/verbs/deliver.json | 24 ++
.../src/main/jsonschema/verbs/deny.json | 24 ++
.../src/main/jsonschema/verbs/disagree.json | 24 ++
.../src/main/jsonschema/verbs/dislike.json | 24 ++
.../src/main/jsonschema/verbs/experience.json | 24 ++
.../src/main/jsonschema/verbs/favorite.json | 24 ++
.../src/main/jsonschema/verbs/find.json | 24 ++
.../jsonschema/verbs/flag-as-inappropriate.json | 24 ++
.../src/main/jsonschema/verbs/follow.json | 24 ++
.../src/main/jsonschema/verbs/give.json | 24 ++
.../src/main/jsonschema/verbs/host.json | 24 ++
.../src/main/jsonschema/verbs/ignore.json | 24 ++
.../src/main/jsonschema/verbs/insert.json | 24 ++
.../src/main/jsonschema/verbs/install.json | 24 ++
.../src/main/jsonschema/verbs/interact.json | 24 ++
.../src/main/jsonschema/verbs/invite.json | 24 ++
.../src/main/jsonschema/verbs/join.json | 24 ++
.../src/main/jsonschema/verbs/leave.json | 24 ++
.../src/main/jsonschema/verbs/like.json | 24 ++
.../src/main/jsonschema/verbs/listen.json | 24 ++
.../src/main/jsonschema/verbs/lose.json | 24 ++
.../src/main/jsonschema/verbs/make-friend.json | 24 ++
.../src/main/jsonschema/verbs/open.json | 24 ++
.../src/main/jsonschema/verbs/play.json | 24 ++
.../src/main/jsonschema/verbs/post.json | 24 ++
.../src/main/jsonschema/verbs/present.json | 24 ++
.../src/main/jsonschema/verbs/purchase.json | 24 ++
.../src/main/jsonschema/verbs/qualify.json | 24 ++
.../src/main/jsonschema/verbs/read.json | 24 ++
.../src/main/jsonschema/verbs/receive.json | 24 ++
.../src/main/jsonschema/verbs/reject.json | 24 ++
.../main/jsonschema/verbs/remove-friend.json | 24 ++
.../src/main/jsonschema/verbs/remove.json | 24 ++
.../src/main/jsonschema/verbs/replace.json | 24 ++
.../main/jsonschema/verbs/request-friend.json | 24 ++
.../src/main/jsonschema/verbs/request.json | 24 ++
.../src/main/jsonschema/verbs/resolve.json | 24 ++
.../src/main/jsonschema/verbs/retract.json | 24 ++
.../src/main/jsonschema/verbs/return.json | 24 ++
.../src/main/jsonschema/verbs/rsvp-maybe.json | 24 ++
.../src/main/jsonschema/verbs/rsvp-no.json | 24 ++
.../src/main/jsonschema/verbs/rsvp-yes.json | 24 ++
.../src/main/jsonschema/verbs/satisfy.json | 24 ++
.../src/main/jsonschema/verbs/save.json | 24 ++
.../src/main/jsonschema/verbs/schedule.json | 24 ++
.../src/main/jsonschema/verbs/search.json | 24 ++
.../src/main/jsonschema/verbs/sell.json | 24 ++
.../src/main/jsonschema/verbs/send.json | 24 ++
.../src/main/jsonschema/verbs/share.json | 24 ++
.../src/main/jsonschema/verbs/sponsor.json | 24 ++
.../src/main/jsonschema/verbs/start.json | 24 ++
.../main/jsonschema/verbs/stop-following.json | 24 ++
.../src/main/jsonschema/verbs/submit.json | 24 ++
.../src/main/jsonschema/verbs/tag.json | 24 ++
.../src/main/jsonschema/verbs/terminate.json | 24 ++
.../src/main/jsonschema/verbs/tie.json | 24 ++
.../src/main/jsonschema/verbs/unfavorite.json | 24 ++
.../src/main/jsonschema/verbs/unlike.json | 24 ++
.../src/main/jsonschema/verbs/unsatisfy.json | 24 ++
.../src/main/jsonschema/verbs/unsave.json | 24 ++
.../src/main/jsonschema/verbs/unshare.json | 24 ++
.../src/main/jsonschema/verbs/update.json | 34 ++
.../src/main/jsonschema/verbs/use.json | 24 ++
.../src/main/jsonschema/verbs/watch.json | 24 ++
.../src/main/jsonschema/verbs/win.json | 24 ++
.../src/main/xmlschema/activity.xsd | 94 +++++
streams-util/pom.xml | 89 ++++-
.../java/org/apache/streams/util/GuidUtils.java | 2 +-
.../org/apache/streams/util/RegexUtils.java | 3 +
.../apache/streams/util/SerializationUtil.java | 3 +-
.../apache/streams/util/schema/FieldType.java | 14 +
.../apache/streams/util/schema/FieldUtil.java | 34 ++
.../apache/streams/util/schema/FileUtil.java | 77 ++++
.../streams/util/schema/GenerationConfig.java | 116 ++++++
.../org/apache/streams/util/schema/Schema.java | 57 +++
.../apache/streams/util/schema/SchemaStore.java | 42 ++
.../streams/util/schema/SchemaStoreImpl.java | 347 +++++++++++++++++
.../apache/streams/util/schema/SchemaUtil.java | 49 +++
.../org/apache/streams/util/schema/URIUtil.java | 30 ++
.../util/schema/test/SchemaOrderingTest.java | 150 ++++++++
.../util/schema/test/SchemaStoreTest.java | 71 ++++
.../src/test/resources/activities/accept.json | 16 +
.../src/test/resources/activities/access.json | 17 +
.../test/resources/activities/acknowledge.json | 16 +
.../src/test/resources/activities/add.json | 21 +
.../src/test/resources/activities/agree.json | 15 +
.../src/test/resources/activities/append.json | 16 +
.../src/test/resources/activities/approve.json | 20 +
.../src/test/resources/activities/archive.json | 15 +
.../src/test/resources/activities/assign.json | 20 +
.../src/test/resources/activities/at.json | 15 +
.../src/test/resources/activities/attach.json | 20 +
.../src/test/resources/activities/attend.json | 15 +
.../src/test/resources/activities/author.json | 15 +
.../test/resources/activities/authorize.json | 23 ++
.../src/test/resources/activities/borrow.json | 21 +
.../src/test/resources/activities/build.json | 16 +
.../src/test/resources/activities/cancel.json | 16 +
.../src/test/resources/activities/checkin.json | 16 +
.../src/test/resources/activities/close.json | 16 +
.../src/test/resources/activities/complete.json | 16 +
.../src/test/resources/activities/confirm.json | 17 +
.../src/test/resources/activities/consume.json | 16 +
.../src/test/resources/activities/create.json | 15 +
.../src/test/resources/activities/delete.json | 16 +
.../src/test/resources/activities/deliver.json | 20 +
.../src/test/resources/activities/deny.json | 23 ++
.../src/test/resources/activities/disagree.json | 30 ++
.../src/test/resources/activities/dislike.json | 15 +
.../test/resources/activities/experience.json | 16 +
.../src/test/resources/activities/favorite.json | 15 +
.../src/test/resources/activities/find.json | 19 +
.../activities/flag-as-inappropriate.json | 24 ++
.../src/test/resources/activities/follow.json | 15 +
.../src/test/resources/activities/give.json | 28 ++
.../src/test/resources/activities/host.json | 15 +
.../src/test/resources/activities/ignore.json | 15 +
.../src/test/resources/activities/insert.json | 19 +
.../src/test/resources/activities/install.json | 18 +
.../src/test/resources/activities/interact.json | 16 +
.../src/test/resources/activities/invite.json | 19 +
.../src/test/resources/activities/join.json | 15 +
.../src/test/resources/activities/leave.json | 15 +
.../src/test/resources/activities/like.json | 22 ++
.../src/test/resources/activities/listen.json | 15 +
.../src/test/resources/activities/lose.json | 15 +
.../test/resources/activities/make-friend.json | 15 +
.../src/test/resources/activities/open.json | 15 +
.../src/test/resources/activities/play.json | 15 +
.../src/test/resources/activities/post.json | 25 ++
.../src/test/resources/activities/present.json | 15 +
.../src/test/resources/activities/purchase.json | 16 +
.../src/test/resources/activities/qualify.json | 15 +
.../src/test/resources/activities/read.json | 16 +
.../src/test/resources/activities/receive.json | 16 +
.../src/test/resources/activities/reject.json | 15 +
.../resources/activities/remove-friend.json | 15 +
.../src/test/resources/activities/remove.json | 23 ++
.../src/test/resources/activities/replace.json | 19 +
.../resources/activities/request-friend.json | 16 +
.../src/test/resources/activities/request.json | 23 ++
.../src/test/resources/activities/resolve.json | 15 +
.../src/test/resources/activities/retract.json | 26 ++
.../src/test/resources/activities/return.json | 19 +
.../test/resources/activities/rsvp-maybe.json | 16 +
.../src/test/resources/activities/rsvp-no.json | 16 +
.../src/test/resources/activities/rsvp-yes.json | 16 +
.../src/test/resources/activities/satisfy.json | 21 +
.../src/test/resources/activities/save.json | 20 +
.../src/test/resources/activities/schedule.json | 15 +
.../src/test/resources/activities/search.json | 21 +
.../src/test/resources/activities/sell.json | 19 +
.../src/test/resources/activities/send.json | 19 +
.../src/test/resources/activities/share.json | 16 +
.../src/test/resources/activities/sponsor.json | 17 +
.../src/test/resources/activities/start.json | 15 +
.../resources/activities/stop-following.json | 15 +
.../src/test/resources/activities/submit.json | 15 +
.../src/test/resources/activities/tag.json | 19 +
.../test/resources/activities/terminate.json | 15 +
.../src/test/resources/activities/tie.json | 24 ++
.../test/resources/activities/unfavorite.json | 15 +
.../src/test/resources/activities/unlike.json | 15 +
.../test/resources/activities/unsatisfy.json | 20 +
.../src/test/resources/activities/unsave.json | 15 +
.../src/test/resources/activities/unshare.json | 15 +
.../src/test/resources/activities/update.json | 15 +
.../src/test/resources/activities/use.json | 15 +
.../src/test/resources/activities/watch.json | 16 +
.../src/test/resources/activities/win.json | 15 +
streams-util/src/test/resources/media_link.json | 7 +
.../src/test/resources/objects/event.json | 18 +
.../src/test/resources/objects/group.json | 16 +
.../src/test/resources/objects/issue.json | 9 +
.../src/test/resources/objects/note.json | 12 +
.../src/test/resources/objects/permission.json | 9 +
.../src/test/resources/objects/place.json | 9 +
.../src/test/resources/objects/task.json | 16 +
.../src/test/resources/objects/video.json | 8 +
324 files changed, 13757 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/abc58b42/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/abc58b42/streams-config/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/abc58b42/streams-pojo/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/abc58b42/streams-runtimes/streams-runtime-local/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/abc58b42/streams-util/pom.xml
----------------------------------------------------------------------