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 2015/12/01 04:56:15 UTC
[1/2] incubator-streams git commit: resolves STREAMS-382
Repository: incubator-streams
Updated Branches:
refs/heads/master 3e446b90f -> 3d9184cfd
resolves STREAMS-382
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/98e08032
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/98e08032
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/98e08032
Branch: refs/heads/master
Commit: 98e08032767f42febe07fc950ee856327881f930
Parents: daca194
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Nov 17 15:54:12 2015 -0600
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Nov 17 15:54:12 2015 -0600
----------------------------------------------------------------------
.../serializer/util/InstagramActivityUtil.java | 20 ++++++++++----------
.../youtube/serializer/YoutubeActivityUtil.java | 4 ++--
.../src/main/jsonschema/media_link.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/98e08032/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
index f5aaa4e..9d48e3c 100644
--- a/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
+++ b/streams-contrib/streams-provider-instagram/src/main/java/org/apache/streams/instagram/serializer/util/InstagramActivityUtil.java
@@ -174,13 +174,13 @@ public class InstagramActivityUtil {
Image standardResolution = new Image();
if(item.getType().equals("image") && item.getImages() != null) {
ImageData standardResolutionData = item.getImages().getStandardResolution();
- standardResolution.setHeight(new Double((double)standardResolutionData.getImageHeight()));
- standardResolution.setWidth(new Double((double)standardResolutionData.getImageWidth()));
+ standardResolution.setHeight(new Long(standardResolutionData.getImageHeight()));
+ standardResolution.setWidth(new Long(standardResolutionData.getImageWidth()));
standardResolution.setUrl(standardResolutionData.getImageUrl());
} else if(item.getType().equals("video") && item.getVideos() != null) {
VideoData standardResolutionData = item.getVideos().getStandardResolution();
- standardResolution.setHeight(new Double((double)standardResolutionData.getHeight()));
- standardResolution.setWidth(new Double((double)standardResolutionData.getWidth()));
+ standardResolution.setHeight(new Long(standardResolutionData.getHeight()));
+ standardResolution.setWidth(new Long(standardResolutionData.getWidth()));
standardResolution.setUrl(standardResolutionData.getUrl());
}
@@ -220,16 +220,16 @@ public class InstagramActivityUtil {
ActivityObject thumbnailObject = new ActivityObject();
Image thumbnailImage = new Image();
thumbnailImage.setUrl(thumbnail.getImageUrl());
- thumbnailImage.setHeight(new Double((double) thumbnail.getImageHeight()));
- thumbnailImage.setWidth(new Double((double) thumbnail.getImageWidth()));
+ thumbnailImage.setHeight(new Long(thumbnail.getImageHeight()));
+ thumbnailImage.setWidth(new Long(thumbnail.getImageWidth()));
thumbnailObject.setImage(thumbnailImage);
thumbnailObject.setObjectType("image");
ActivityObject lowResolutionObject = new ActivityObject();
Image lowResolutionImage = new Image();
lowResolutionImage.setUrl(lowResolution.getImageUrl());
- lowResolutionImage.setHeight(new Double((double) lowResolution.getImageHeight()));
- lowResolutionImage.setWidth(new Double((double) lowResolution.getImageWidth()));
+ lowResolutionImage.setHeight(new Long(lowResolution.getImageHeight()));
+ lowResolutionImage.setWidth(new Long(lowResolution.getImageWidth()));
lowResolutionObject.setImage(lowResolutionImage);
lowResolutionObject.setObjectType("image");
@@ -256,8 +256,8 @@ public class InstagramActivityUtil {
ActivityObject lowResolutionVideoObject = new ActivityObject();
Image lowResolutionVideoImage = new Image();
lowResolutionVideoImage.setUrl(lowResolutionVideo.getUrl());
- lowResolutionVideoImage.setHeight(new Double((double) lowResolutionVideo.getHeight()));
- lowResolutionVideoImage.setWidth(new Double((double) lowResolutionVideo.getWidth()));
+ lowResolutionVideoImage.setHeight(new Long(lowResolutionVideo.getHeight()));
+ lowResolutionVideoImage.setWidth(new Long(lowResolutionVideo.getWidth()));
lowResolutionVideoObject.setImage(lowResolutionVideoImage);
lowResolutionVideoObject.setObjectType("video");
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/98e08032/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
index 09621e6..482ec04 100644
--- a/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
+++ b/streams-contrib/streams-provider-youtube/src/main/java/com/youtube/serializer/YoutubeActivityUtil.java
@@ -126,8 +126,8 @@ public class YoutubeActivityUtil {
if(thumbnail != null) {
Image image = new Image();
image.setUrl(thumbnail.getUrl());
- image.setHeight(thumbnail.getHeight().doubleValue());
- image.setWidth(thumbnail.getWidth().doubleValue());
+ image.setHeight(thumbnail.getHeight());
+ image.setWidth(thumbnail.getWidth());
activityObject.setImage(image);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/98e08032/streams-pojo/src/main/jsonschema/media_link.json
----------------------------------------------------------------------
diff --git a/streams-pojo/src/main/jsonschema/media_link.json b/streams-pojo/src/main/jsonschema/media_link.json
index 63bf556..b124642 100644
--- a/streams-pojo/src/main/jsonschema/media_link.json
+++ b/streams-pojo/src/main/jsonschema/media_link.json
@@ -18,12 +18,12 @@
},
"height": {
"title": "height",
- "type": "number",
+ "type": "integer",
"description": "A hint to the consumer about the height, in pixels, of the media resource identified by the url property. A media link MAY contain a height property when the target resource is a visual media item such as an image, video or embeddable HTML page."
},
"width": {
"title": "width",
- "type": "number",
+ "type": "integer",
"description": "A hint to the consumer about the width, in pixels, of the media resource identified by the url property. A media link MAY contain a width property when the target resource is a visual media item such as an image, video or embeddable HTML page."
},
"url": {
[2/2] incubator-streams git commit: Merge branch 'STREAMS-382'
Posted by sb...@apache.org.
Merge branch 'STREAMS-382'
* STREAMS-382:
resolves STREAMS-382
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/3d9184cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/3d9184cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/3d9184cf
Branch: refs/heads/master
Commit: 3d9184cfd2145d264ebdf66b06d808ee8b9d1f9a
Parents: 3e446b9 98e0803
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Mon Nov 30 19:36:19 2015 -0600
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Mon Nov 30 19:36:19 2015 -0600
----------------------------------------------------------------------
.../serializer/util/InstagramActivityUtil.java | 20 ++++++++++----------
.../youtube/serializer/YoutubeActivityUtil.java | 4 ++--
.../src/main/jsonschema/media_link.json | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------