Merge branch 'master' into invalid_headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/1766f34c Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/1766f34c Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/1766f34c Branch: refs/heads/invalid_headers Commit: 1766f34c4b524166b18fc10e53f3066436691eb5 Parents: b8f36f7 2c12724 Author: Matt Franklin <mfrank...@apache.org> Authored: Mon Oct 17 16:06:12 2016 -0400 Committer: Matt Franklin <mfrank...@apache.org> Committed: Mon Oct 17 16:06:12 2016 -0400 ---------------------------------------------------------------------- .../converter/BaseDocumentClassifier.java | 3 - .../test/data/InstagramActivitySerDeIT.java | 131 +++++++++++++++++++ .../twitter/test/InstagramActivitySerDeIT.java | 131 ------------------- .../converter/TwitterDocumentClassifier.java | 5 +- .../utils/TwitterActivityConvertersTest.java | 60 +++++++-- .../TwitterActivityObjectsConvertersTest.java | 21 ++- streams-pojo/pom.xml | 1 + .../jackson/StreamsDateTimeDeserializer.java | 13 +- .../streams/jackson/StreamsJacksonMapper.java | 42 +++++- .../pojo/StreamsJacksonMapperConfiguration.json | 22 ++++ .../src/main/jsonschema/activity.json | 2 +- .../src/main/jsonschema/collection.json | 2 +- .../src/main/jsonschema/media_link.json | 2 +- .../src/main/jsonschema/object.json | 2 +- .../src/main/jsonschema/objectTypes/alert.json | 2 +- .../jsonschema/objectTypes/application.json | 2 +- .../main/jsonschema/objectTypes/article.json | 2 +- .../src/main/jsonschema/objectTypes/audio.json | 2 +- .../src/main/jsonschema/objectTypes/badge.json | 2 +- .../src/main/jsonschema/objectTypes/binary.json | 2 +- .../main/jsonschema/objectTypes/bookmark.json | 2 +- .../main/jsonschema/objectTypes/comment.json | 2 +- .../src/main/jsonschema/objectTypes/device.json | 2 +- .../src/main/jsonschema/objectTypes/event.json | 2 +- .../src/main/jsonschema/objectTypes/file.json | 2 +- .../src/main/jsonschema/objectTypes/folder.json | 2 +- .../src/main/jsonschema/objectTypes/game.json | 2 +- .../src/main/jsonschema/objectTypes/group.json | 2 +- .../src/main/jsonschema/objectTypes/image.json | 2 +- .../src/main/jsonschema/objectTypes/issue.json | 2 +- .../src/main/jsonschema/objectTypes/job.json | 2 +- .../src/main/jsonschema/objectTypes/list.json | 2 +- .../src/main/jsonschema/objectTypes/note.json | 2 +- .../src/main/jsonschema/objectTypes/offer.json | 2 +- .../jsonschema/objectTypes/organization.json | 2 +- .../src/main/jsonschema/objectTypes/page.json | 2 +- .../main/jsonschema/objectTypes/permission.json | 2 +- .../src/main/jsonschema/objectTypes/person.json | 2 +- .../jsonschema/objectTypes/photo-album.json | 2 +- .../src/main/jsonschema/objectTypes/photo.json | 2 +- .../src/main/jsonschema/objectTypes/place.json | 2 +- .../main/jsonschema/objectTypes/playlist.json | 2 +- .../main/jsonschema/objectTypes/process.json | 2 +- .../main/jsonschema/objectTypes/product.json | 2 +- .../main/jsonschema/objectTypes/property.json | 2 +- .../main/jsonschema/objectTypes/question.json | 2 +- .../src/main/jsonschema/objectTypes/review.json | 2 +- .../src/main/jsonschema/objectTypes/role.json | 2 +- .../main/jsonschema/objectTypes/service.json | 2 +- .../src/main/jsonschema/objectTypes/song.json | 2 +- .../src/main/jsonschema/objectTypes/status.json | 2 +- .../src/main/jsonschema/objectTypes/task.json | 2 +- .../src/main/jsonschema/objectTypes/team.json | 2 +- .../src/main/jsonschema/objectTypes/video.json | 2 +- .../src/main/jsonschema/verbs/accept.json | 2 +- .../src/main/jsonschema/verbs/access.json | 2 +- .../src/main/jsonschema/verbs/acknowledge.json | 2 +- .../src/main/jsonschema/verbs/add.json | 2 +- .../src/main/jsonschema/verbs/agree.json | 2 +- .../src/main/jsonschema/verbs/append.json | 2 +- .../src/main/jsonschema/verbs/approve.json | 2 +- .../src/main/jsonschema/verbs/archive.json | 2 +- .../src/main/jsonschema/verbs/assign.json | 2 +- .../src/main/jsonschema/verbs/at.json | 2 +- .../src/main/jsonschema/verbs/attach.json | 2 +- .../src/main/jsonschema/verbs/attend.json | 2 +- .../src/main/jsonschema/verbs/author.json | 2 +- .../src/main/jsonschema/verbs/authorize.json | 2 +- .../src/main/jsonschema/verbs/borrow.json | 2 +- .../src/main/jsonschema/verbs/build.json | 2 +- .../src/main/jsonschema/verbs/cancel.json | 2 +- .../src/main/jsonschema/verbs/checkin.json | 2 +- .../src/main/jsonschema/verbs/close.json | 2 +- .../src/main/jsonschema/verbs/complete.json | 2 +- .../src/main/jsonschema/verbs/confirm.json | 2 +- .../src/main/jsonschema/verbs/consume.json | 2 +- .../src/main/jsonschema/verbs/create.json | 2 +- .../src/main/jsonschema/verbs/delete.json | 2 +- .../src/main/jsonschema/verbs/deliver.json | 2 +- .../src/main/jsonschema/verbs/deny.json | 2 +- .../src/main/jsonschema/verbs/disagree.json | 2 +- .../src/main/jsonschema/verbs/dislike.json | 2 +- .../src/main/jsonschema/verbs/experience.json | 2 +- .../src/main/jsonschema/verbs/favorite.json | 2 +- .../src/main/jsonschema/verbs/find.json | 2 +- .../jsonschema/verbs/flag-as-inappropriate.json | 2 +- .../src/main/jsonschema/verbs/follow.json | 2 +- .../src/main/jsonschema/verbs/give.json | 2 +- .../src/main/jsonschema/verbs/host.json | 2 +- .../src/main/jsonschema/verbs/ignore.json | 2 +- .../src/main/jsonschema/verbs/insert.json | 2 +- .../src/main/jsonschema/verbs/install.json | 2 +- .../src/main/jsonschema/verbs/interact.json | 2 +- .../src/main/jsonschema/verbs/invite.json | 2 +- .../src/main/jsonschema/verbs/join.json | 2 +- .../src/main/jsonschema/verbs/leave.json | 2 +- .../src/main/jsonschema/verbs/like.json | 2 +- .../src/main/jsonschema/verbs/listen.json | 2 +- .../src/main/jsonschema/verbs/lose.json | 2 +- .../src/main/jsonschema/verbs/make-friend.json | 2 +- .../src/main/jsonschema/verbs/open.json | 2 +- .../src/main/jsonschema/verbs/play.json | 2 +- .../src/main/jsonschema/verbs/post.json | 2 +- .../src/main/jsonschema/verbs/present.json | 2 +- .../src/main/jsonschema/verbs/purchase.json | 2 +- .../src/main/jsonschema/verbs/qualify.json | 2 +- .../src/main/jsonschema/verbs/read.json | 2 +- .../src/main/jsonschema/verbs/receive.json | 2 +- .../src/main/jsonschema/verbs/reject.json | 2 +- .../main/jsonschema/verbs/remove-friend.json | 2 +- .../src/main/jsonschema/verbs/remove.json | 2 +- .../src/main/jsonschema/verbs/replace.json | 2 +- .../main/jsonschema/verbs/request-friend.json | 2 +- .../src/main/jsonschema/verbs/request.json | 2 +- .../src/main/jsonschema/verbs/resolve.json | 2 +- .../src/main/jsonschema/verbs/retract.json | 2 +- .../src/main/jsonschema/verbs/return.json | 2 +- .../src/main/jsonschema/verbs/rsvp-maybe.json | 2 +- .../src/main/jsonschema/verbs/rsvp-no.json | 2 +- .../src/main/jsonschema/verbs/rsvp-yes.json | 2 +- .../src/main/jsonschema/verbs/satisfy.json | 2 +- .../src/main/jsonschema/verbs/save.json | 2 +- .../src/main/jsonschema/verbs/schedule.json | 2 +- .../src/main/jsonschema/verbs/search.json | 2 +- .../src/main/jsonschema/verbs/sell.json | 2 +- .../src/main/jsonschema/verbs/send.json | 2 +- .../src/main/jsonschema/verbs/share.json | 2 +- .../src/main/jsonschema/verbs/sponsor.json | 2 +- .../src/main/jsonschema/verbs/start.json | 2 +- .../main/jsonschema/verbs/stop-following.json | 2 +- .../src/main/jsonschema/verbs/submit.json | 2 +- .../src/main/jsonschema/verbs/tag.json | 2 +- .../src/main/jsonschema/verbs/terminate.json | 2 +- .../src/main/jsonschema/verbs/tie.json | 2 +- .../src/main/jsonschema/verbs/unfavorite.json | 2 +- .../src/main/jsonschema/verbs/unlike.json | 2 +- .../src/main/jsonschema/verbs/unsatisfy.json | 2 +- .../src/main/jsonschema/verbs/unsave.json | 2 +- .../src/main/jsonschema/verbs/unshare.json | 2 +- .../src/main/jsonschema/verbs/update.json | 2 +- .../src/main/jsonschema/verbs/use.json | 2 +- .../src/main/jsonschema/verbs/watch.json | 2 +- .../src/main/jsonschema/verbs/win.json | 2 +- 143 files changed, 406 insertions(+), 289 deletions(-) ----------------------------------------------------------------------
