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/09/10 20:50:18 UTC
[3/4] incubator-streams git commit: changes existing modules to use
Singleton access method for ExtensionUtil
changes existing modules to use Singleton access method for ExtensionUtil
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/cc5d316f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/cc5d316f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/cc5d316f
Branch: refs/heads/master
Commit: cc5d316f5ce5a43fa529cbaa062ede49e2631e14
Parents: 4bec4a9
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Aug 25 15:02:22 2015 -0500
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Aug 25 15:02:22 2015 -0500
----------------------------------------------------------------------
.../components/http/processor/SimpleHTTPGetProcessor.java | 2 +-
.../components/http/processor/SimpleHTTPPostProcessor.java | 2 +-
.../streams/elasticsearch/processor/PercolateTagProcessor.java | 4 +---
.../org/apache/streams/peoplepattern/AccountTypeProcessor.java | 2 +-
.../org/apache/streams/peoplepattern/DemographicsProcessor.java | 2 +-
.../apache/streams/regex/AbstractRegexExtensionExtractor.java | 2 +-
.../java/org/apache/streams/regex/RegexHashtagExtractorTest.java | 2 +-
.../java/org/apache/streams/regex/RegexMentionExtractorTest.java | 2 +-
.../datasift/serializer/DatasiftInstagramActivitySerializer.java | 2 +-
.../serializer/DatasiftInteractionActivitySerializer.java | 4 ++--
.../datasift/serializer/DatasiftTwitterActivitySerializer.java | 4 ++--
.../apache/streams/facebook/serializer/FacebookActivityUtil.java | 2 +-
.../src/main/java/com/gplus/api/GPlusActivitySerializer.java | 2 +-
.../src/main/java/com/reddit/api/RedditActivitySerializer.java | 2 +-
.../google/gmail/provider/GMailMessageActivitySerializer.java | 2 +-
.../com/google/gplus/serializer/util/GooglePlusActivityUtil.java | 2 +-
.../streams/instagram/serializer/util/InstagramActivityUtil.java | 4 ++--
.../main/java/org/apache/streams/data/util/MoreoverUtils.java | 4 ++--
.../streams/sysomos/conversion/SysomosBeatActivityConverter.java | 2 +-
.../main/java/com/youtube/serializer/YoutubeActivityUtil.java | 2 +-
20 files changed, 24 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java
index 670b8b5..3f5a5c4 100644
--- a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java
+++ b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPGetProcessor.java
@@ -181,7 +181,7 @@ public class SimpleHTTPGetProcessor implements StreamsProcessor {
ActivityObject extensionEntity = getEntityToExtend(rootDocument);
- ExtensionUtil.addExtension(extensionEntity, this.configuration.getExtension(), extensionFragment);
+ ExtensionUtil.getInstance().addExtension(extensionEntity, this.configuration.getExtension(), extensionFragment);
rootDocument = setEntityToExtend(rootDocument, extensionEntity);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java
index 761b7bf..f0ba2fd 100644
--- a/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java
+++ b/streams-components/streams-http/src/main/java/org/apache/streams/components/http/processor/SimpleHTTPPostProcessor.java
@@ -193,7 +193,7 @@ public class SimpleHTTPPostProcessor implements StreamsProcessor {
ActivityObject extensionEntity = getEntityToExtend(rootDocument);
- ExtensionUtil.addExtension(extensionEntity, this.configuration.getExtension(), extensionFragment);
+ ExtensionUtil.getInstance().addExtension(extensionEntity, this.configuration.getExtension(), extensionFragment);
rootDocument = setEntityToExtend(rootDocument, extensionEntity);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java
index 32ff131..d1de6f9 100644
--- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java
+++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/PercolateTagProcessor.java
@@ -182,11 +182,9 @@ public class PercolateTagProcessor implements StreamsProcessor {
}
protected void appendMatches(ArrayNode tagArray, Activity activity) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
- extensions.put(TAGS_EXTENSION, tagArray);
+ ExtensionUtil.getInstance().addExtension(activity, TAGS_EXTENSION, tagArray);
- activity.setAdditionalProperty(ActivityUtil.EXTENSION_PROPERTY, extensions);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java
index d30922e..bac96bf 100644
--- a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java
+++ b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/AccountTypeProcessor.java
@@ -64,7 +64,7 @@ public class AccountTypeProcessor extends SimpleHTTPGetProcessor {
Activity activity = mapper.convertValue(entry.getDocument(), Activity.class);
Actor actor = activity.getActor();
ActivityObject actorObject = mapper.convertValue(actor, ActivityObject.class);
- String username = (String) ExtensionUtil.getExtension(actorObject, "screenName");
+ String username = (String) ExtensionUtil.getInstance().getExtension(actorObject, "screenName");
Map<String, String> params = Maps.newHashMap();
params.put("id", actor.getId());
params.put("name", actor.getDisplayName());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java
index 68016b8..238685d 100644
--- a/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java
+++ b/streams-contrib/streams-processor-peoplepattern/src/main/java/org/apache/streams/peoplepattern/DemographicsProcessor.java
@@ -64,7 +64,7 @@ public class DemographicsProcessor extends SimpleHTTPGetProcessor {
Activity activity = mapper.convertValue(entry.getDocument(), Activity.class);
Actor actor = activity.getActor();
ActivityObject actorObject = mapper.convertValue(actor, ActivityObject.class);
- String username = (String) ExtensionUtil.getExtension(actorObject, "screenName");
+ String username = (String) ExtensionUtil.getInstance().getExtension(actorObject, "screenName");
Map<String, String> params = Maps.newHashMap();
params.put("id", actor.getId());
params.put("name", actor.getDisplayName());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
index e2be262..e4fa0e0 100644
--- a/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
+++ b/streams-contrib/streams-processor-regex/src/main/java/org/apache/streams/regex/AbstractRegexExtensionExtractor.java
@@ -117,7 +117,7 @@ public abstract class AbstractRegexExtensionExtractor<T> implements StreamsProce
@SuppressWarnings("unchecked")
protected Collection<T> ensureTargetObject(Activity activity) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
Set<T> hashtags;
if(extensions.containsKey(extensionKey) && extensions.get(extensionKey) != null) {
hashtags = Sets.newHashSet((Iterable<T>) extensions.get(extensionKey));
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java
index e4f2257..2de4aa8 100644
--- a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java
+++ b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexHashtagExtractorTest.java
@@ -67,7 +67,7 @@ public class RegexHashtagExtractorTest {
List<StreamsDatum> result = new RegexHashtagExtractor().process(datum);
assertThat(result.size(), is(equalTo(1)));
Activity output = (Activity)result.get(0).getDocument();
- Set<String> extracted = (Set) ExtensionUtil.ensureExtensions(output).get(RegexHashtagExtractor.EXTENSION_KEY);
+ Set<String> extracted = (Set) ExtensionUtil.getInstance().ensureExtensions(output).get(RegexHashtagExtractor.EXTENSION_KEY);
Sets.SetView<String> diff = Sets.difference(extracted, hashtags);
assertThat(diff.size(), is(equalTo(0)));
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java
index 8aa6561..c7778a8 100644
--- a/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java
+++ b/streams-contrib/streams-processor-regex/src/test/java/org/apache/streams/regex/RegexMentionExtractorTest.java
@@ -76,7 +76,7 @@ public class RegexMentionExtractorTest {
List<StreamsDatum> result = new RegexMentionsExtractor().process(datum);
assertThat(result.size(), is(equalTo(1)));
Activity output = (Activity)result.get(0).getDocument();
- Set<String> extracted = (Set) ExtensionUtil.ensureExtensions(output).get(RegexMentionsExtractor.EXTENSION_KEY);
+ Set<String> extracted = (Set) ExtensionUtil.getInstance().ensureExtensions(output).get(RegexMentionsExtractor.EXTENSION_KEY);
Sets.SetView<String> diff = Sets.difference(extracted, mentions);
assertThat(diff.size(), is(equalTo(0)));
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/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 03d6735..1ed805d 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
@@ -98,7 +98,7 @@ public class DatasiftInstagramActivitySerializer extends DatasiftInteractionActi
}
public void addInstagramExtensions(Activity activity, Instagram instagram) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
List<String> hashTags;
if(instagram.getMedia() != null) {
hashTags = instagram.getMedia().getTags();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java
index b506820..79bf940 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftInteractionActivitySerializer.java
@@ -127,7 +127,7 @@ public class DatasiftInteractionActivitySerializer implements ActivitySerializer
}
public static void addDatasiftExtension(Activity activity, Datasift datasift) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
extensions.put("datasift", datasift);
}
@@ -230,7 +230,7 @@ public class DatasiftInteractionActivitySerializer implements ActivitySerializer
}
public static void addLocationExtension(Activity activity, Interaction interaction) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
Map<String, Object> location = new HashMap<String, Object>();
Map<String, Double> coordinates = new HashMap<String, Double>();
coordinates.put("latitude", interaction.getGeo().getLatitude());
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializer.java b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializer.java
index 8242da9..cbd29dd 100644
--- a/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializer.java
+++ b/streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTwitterActivitySerializer.java
@@ -179,7 +179,7 @@ public class DatasiftTwitterActivitySerializer extends DatasiftInteractionActivi
}
public void addLocationExtension(Activity activity, Twitter twitter) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
Map<String, Object> location = Maps.newHashMap();
double[] coordiantes = new double[] { twitter.getGeo().getLongitude(), twitter.getGeo().getLatitude() };
Map<String, Object> coords = Maps.newHashMap();
@@ -191,7 +191,7 @@ public class DatasiftTwitterActivitySerializer extends DatasiftInteractionActivi
public void addTwitterExtensions(Activity activity, Twitter twitter, Interaction interaction) {
Retweet retweet = twitter.getRetweet();
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
List<String> hashTags = Lists.newLinkedList();
List<Object> hts = Lists.newLinkedList();
if(twitter.getHashtags() != null) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
index 8821006..7c945a7 100644
--- a/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
+++ b/streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/serializer/FacebookActivityUtil.java
@@ -216,7 +216,7 @@ public class FacebookActivityUtil {
*/
public static void buildExtensions(Activity activity, Post post) {
ObjectMapper mapper = StreamsJacksonMapper.getInstance();
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
if(post.getLikes() != null && post.getLikes().size() > 0) {
Map<String, Object> likes = Maps.newHashMap();
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java b/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java
index b1f0ae0..8b04d26 100644
--- a/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java
+++ b/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/main/java/com/gplus/api/GPlusActivitySerializer.java
@@ -74,7 +74,7 @@ public class GPlusActivitySerializer implements ActivitySerializer<String> {
Activity activity = new Activity();
try {
activity = jsonMapper.readValue(fixedObject.toString(), Activity.class);
- Map<String, Object> extension = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extension = ExtensionUtil.getInstance().ensureExtensions(activity);
extension.put("likes", fixedObject.getJSONObject("object").getJSONObject("plusoners").get("totalItems"));
extension.put("rebroadcast", fixedObject.getJSONObject("object").getJSONObject("resharers").get("totalItems"));
} catch( Exception e ) {
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java b/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java
index 73b326e..d715629 100644
--- a/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java
+++ b/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/main/java/com/reddit/api/RedditActivitySerializer.java
@@ -82,7 +82,7 @@ public class RedditActivitySerializer implements ActivitySerializer<String> {
Activity activity = new Activity();
try {
activity = jsonMapper.readValue(fixedObject.toString(), Activity.class);
- Map<String, Object> extension = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extension = ExtensionUtil.getInstance().ensureExtensions(activity);
if (fixedObject.names().toString().contains("object")){
if (fixedObject.getJSONObject("object").names().toString().contains("statistics")){
if (fixedObject.getJSONObject("object").getJSONObject("statistics").names().toString().contains("upVotes")){
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
index 3eaac41..7592bab 100644
--- a/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
+++ b/streams-contrib/streams-provider-google/google-gmail/src/main/java/com/google/gmail/provider/GMailMessageActivitySerializer.java
@@ -170,7 +170,7 @@ public class GMailMessageActivitySerializer implements ActivitySerializer<GmailM
}
public static void addGMailExtension(Activity activity, GmailMessage gmailMessage) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
extensions.put("gmail", gmailMessage);
}
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
index c8ef01e..7f2a134 100644
--- a/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
+++ b/streams-contrib/streams-provider-google/google-gplus/src/main/java/com/google/gplus/serializer/util/GooglePlusActivityUtil.java
@@ -149,7 +149,7 @@ public class GooglePlusActivityUtil {
* @param gPlusActivity
*/
private static void addGPlusExtensions(Activity activity, com.google.api.services.plus.model.Activity gPlusActivity) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
com.google.api.services.plus.model.Activity.PlusObject object = gPlusActivity.getObject();
extensions.put("googlePlus", gPlusActivity);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/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 3e5099b..f5aaa4e 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
@@ -284,7 +284,7 @@ public class InstagramActivityUtil {
* @param item the object to use as the source
*/
public static void addLocationExtension(Activity activity, MediaFeedData item) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
if(item.getLocation() != null) {
Map<String, Object> coordinates = new HashMap<String, Object>();
@@ -322,7 +322,7 @@ public class InstagramActivityUtil {
* @param item
*/
public static void addInstagramExtensions(Activity activity, MediaFeedData item) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
addLocationExtension(activity, item);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
index 9b2cc3f..0424875 100644
--- a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
+++ b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
@@ -119,7 +119,7 @@ public class MoreoverUtils {
}
public static void addLocationExtension(Activity activity, Source value) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
String country = value.getLocation().getCountryCode() == null ? value.getLocation().getCountry() : value.getLocation().getCountryCode();
if (country != null) {
Map<String, Object> location = new HashMap<String, Object>();
@@ -129,7 +129,7 @@ public class MoreoverUtils {
}
public static void addLanguageExtension(Activity activity, Article value) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
String language = value.getLanguage();
if (language != null) {
extensions.put(LANGUAGE_EXTENSION, language);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
index 1733057..a86259e 100644
--- a/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
+++ b/streams-contrib/streams-provider-sysomos/src/main/java/org/apache/streams/sysomos/conversion/SysomosBeatActivityConverter.java
@@ -50,7 +50,7 @@ public class SysomosBeatActivityConverter {
converted.setUrl(beat.getLink());
converted.setActor(new Actor());
Map<String, BeatApi.BeatResponse.Beat.Tag> mappedTags = mapTags(beat);
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(converted);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(converted);
extensions.put("keywords", beat.getContent());
setLocation(beat, extensions);
setObject(beat, converted);
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/cc5d316f/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 0474567..09621e6 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
@@ -144,7 +144,7 @@ public class YoutubeActivityUtil {
* @param video
*/
private static void addYoutubeExtensions(Activity activity, Video video) {
- Map<String, Object> extensions = ExtensionUtil.ensureExtensions(activity);
+ Map<String, Object> extensions = ExtensionUtil.getInstance().ensureExtensions(activity);
extensions.put("youtube", video);