Repository: incubator-streams Updated Branches: refs/heads/master 19f69e5ae -> c7490d3b6
resolves STREAMS-393 Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/296861a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/296861a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/296861a6 Branch: refs/heads/master Commit: 296861a6626e25cc7e755dd8d6bdef03cda13e1c Parents: 7da029d Author: Steve Blackmon (@steveblackmon) <sblack...@apache.org> Authored: Fri Dec 11 12:02:14 2015 -0600 Committer: Steve Blackmon (@steveblackmon) <sblack...@apache.org> Committed: Fri Dec 11 12:02:14 2015 -0600 ---------------------------------------------------------------------- .../processor/PercolateTagProcessor.java | 5 ++-- .../filebuffer/FileBufferPersistReader.java | 2 +- .../org/apache/streams/tika/TikaProcessor.java | 3 +-- .../streams/urls/LinkHelperFunctionsTest.java | 26 +++++++++++--------- .../com/datasift/test/DatasiftSerDeTest.java | 1 - .../facebook/test/FacebookActivitySerDeIT.java | 3 +-- .../facebook/test/FacebookPageSerDeIT.java | 3 +-- .../facebook/test/FacebookPostSerDeIT.java | 3 +-- .../test/FacebookEDCAsActivityTest.java | 2 +- .../facebook/test/FacebookEDCSerDeTest.java | 2 +- .../flickr/test/FlickrEDCAsActivityTest.java | 2 +- .../gnip/flickr/test/FlickrEDCSerDeTest.java | 2 +- .../com/gplus/api/GPlusEDCAsActivityTest.java | 5 ++-- .../reddit/api/RedditEDCAsActivityJSONTest.java | 5 ++-- .../java/com/gnip/test/YouTubeEDCSerDeTest.java | 2 +- .../com/gnip/test/YoutubeEDCAsActivityTest.java | 2 +- .../twitter/test/InstagramActivitySerDeIT.java | 7 ++---- .../data/MoreoverJsonActivitySerializer.java | 6 ++++- .../streams/data/util/MoreoverTestUtil.java | 7 ++++-- .../rss/test/SyndEntryActivitySerializerIT.java | 13 +++++----- .../converter/util/TwitterActivityUtil.java | 6 ++++- .../twitter/test/TwitterObjectMapperIT.java | 3 +-- .../test/processors/DoNothingProcessor.java | 6 ++++- .../PassthroughDatumCounterProcessor.java | 8 ++++-- .../local/test/writer/DoNothingWriter.java | 6 ++++- .../local/test/writer/SystemOutWriter.java | 6 ++++- 26 files changed, 78 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/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 850fb15..7792f0d 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 @@ -27,12 +27,11 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import org.apache.streams.core.StreamsDatum; import org.apache.streams.core.StreamsProcessor; -import org.apache.streams.data.util.ActivityUtil; -import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.elasticsearch.ElasticsearchClientManager; import org.apache.streams.elasticsearch.ElasticsearchConfiguration; import org.apache.streams.elasticsearch.ElasticsearchWriterConfiguration; import org.apache.streams.jackson.StreamsJacksonMapper; +import org.apache.streams.pojo.extensions.ExtensionUtil; import org.apache.streams.pojo.json.Activity; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; @@ -270,7 +269,7 @@ public class PercolateTagProcessor implements StreamsProcessor { BulkResponse response = this.bulkBuilder.execute().actionGet(); for(BulkItemResponse r : response.getItems()) { if(r.isFailed()) { - System.out.println(r.getId()+"\t"+r.getFailureMessage()); + LOGGER.error("{}\t{}", r.getId(), r.getFailureMessage()); } } return !response.hasFailures(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java b/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java index bdf950c..39eb853 100644 --- a/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java +++ b/streams-contrib/streams-persist-filebuffer/src/main/java/org/apache/streams/filebuffer/FileBufferPersistReader.java @@ -97,7 +97,7 @@ public class FileBufferPersistReader implements StreamsPersistReader, Serializab ByteArrayInputStream bais = new ByteArrayInputStream(bytes); BufferedReader buf = new BufferedReader(new InputStreamReader(bais)); String s = buf.readLine(); - System.out.println(s); + LOGGER.debug(s); write(new StreamsDatum(s)); queueFile.remove(); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java b/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java index bd93d88..6d66165 100644 --- a/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java +++ b/streams-contrib/streams-processor-tika/src/main/java/org/apache/streams/tika/TikaProcessor.java @@ -59,7 +59,6 @@ public class TikaProcessor implements StreamsProcessor Activity activity; - System.out.println( STREAMS_ID + " processing " + entry.getDocument().getClass()); // get list of shared urls if( entry.getDocument() instanceof Activity) { @@ -83,7 +82,7 @@ public class TikaProcessor implements StreamsProcessor // for each for( String link : outputLinks ) { - System.out.println( "pulling " + link); + LOGGER.debug( "pulling {}", link); try { StreamsDatum outputDatum = expandLink(link, entry); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java b/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java index 5175201..12f9848 100644 --- a/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java +++ b/streams-contrib/streams-processor-urls/src/test/java/org/apache/streams/urls/LinkHelperFunctionsTest.java @@ -19,6 +19,8 @@ package org.apache.streams.urls; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Date; @@ -28,6 +30,8 @@ import static junit.framework.Assert.assertTrue; public class LinkHelperFunctionsTest { + private static final Logger LOGGER = LoggerFactory.getLogger(LinkHelperFunctionsTest.class); + @Test public void testIsURL() { assertTrue(LinkResolverHelperFunctions.isURL("http://goo.gl/wSrHDA")); @@ -70,9 +74,9 @@ public class LinkHelperFunctionsTest { // get required sleep long smashewSleepTime1 = LinkResolverHelperFunctions.waitTimeForDomain(domain1); // sleep - System.out.println("Sleeping: " + new Date().getTime() + "-" + smashewSleepTime1); + LOGGER.debug("Sleeping: " + new Date().getTime() + "-" + smashewSleepTime1); safeSleep(smashewSleepTime1); - System.out.println("Slept For: " + new Date().getTime() + "-" + smashewSleepTime1); + LOGGER.debug("Slept For: " + new Date().getTime() + "-" + smashewSleepTime1); // safe to run again assertEquals("smashew.com: No need to wait", 0, LinkResolverHelperFunctions.waitTimeForDomain(domain1)); } @@ -99,7 +103,7 @@ public class LinkHelperFunctionsTest { long smashewSleepTime3 = LinkResolverHelperFunctions.waitTimeForDomain(domain1); long smashewSleepTime4 = LinkResolverHelperFunctions.waitTimeForDomain(domain1); - System.out.println("smashew.com: " + smashewSleepTime1 + "," + smashewSleepTime2 + "," + smashewSleepTime3 + "," + smashewSleepTime4); + LOGGER.debug("smashew.com: " + smashewSleepTime1 + "," + smashewSleepTime2 + "," + smashewSleepTime3 + "," + smashewSleepTime4); assertEquals("smashew.com: No need to wait", 0, smashewSleepTime1); assertTrue("smashew.com: Wait for at least min x 1", smashewSleepTime2 >= (LinkResolverHelperFunctions.RECENT_DOMAINS_BACKOFF - LinkResolverHelperFunctions.DEFAULT_STAGGER)); @@ -107,13 +111,13 @@ public class LinkHelperFunctionsTest { assertTrue("smashew.com: Wait for at least min x 3", smashewSleepTime4 >= (LinkResolverHelperFunctions.RECENT_DOMAINS_BACKOFF * 3) - (LinkResolverHelperFunctions.DEFAULT_STAGGER * 3)); long timeBeforeSleep = new Date().getTime(); - System.out.println("Sleeping for: " + smashewSleepTime4 + " ms"); + LOGGER.debug("Sleeping for: " + smashewSleepTime4 + " ms"); safeSleep(smashewSleepTime4); - System.out.println("Actually slept for: " + (new Date().getTime() - timeBeforeSleep) + " ms"); + LOGGER.debug("Actually slept for: " + (new Date().getTime() - timeBeforeSleep) + " ms"); long postSleepDomain1 = LinkResolverHelperFunctions.waitTimeForDomain(domain1); - System.out.println("smashew.com: Post Sleep domain1: " + postSleepDomain1); + LOGGER.debug("smashew.com: Post Sleep domain1: " + postSleepDomain1); assertEquals("Smashew.com: No need to wait after sleep", 0, postSleepDomain1); } @@ -132,8 +136,8 @@ public class LinkHelperFunctionsTest { long googleSleepTime1 = LinkResolverHelperFunctions.waitTimeForDomain(domain2); long googleSleepTime2 = LinkResolverHelperFunctions.waitTimeForDomain(domain2); - System.out.println("smashew.com: " + smashewSleepTime1 + "," + smashewSleepTime2 + "," + smashewSleepTime3); - System.out.println("google.com: " + googleSleepTime1 + "," + googleSleepTime2); + LOGGER.debug("smashew.com: " + smashewSleepTime1 + "," + smashewSleepTime2 + "," + smashewSleepTime3); + LOGGER.debug("google.com: " + googleSleepTime1 + "," + googleSleepTime2); assertEquals("smashew.com: No need to wait", 0, smashewSleepTime1); assertTrue("smashew.com: Wait for at least min x 1", smashewSleepTime2 >= (LinkResolverHelperFunctions.RECENT_DOMAINS_BACKOFF - LinkResolverHelperFunctions.DEFAULT_STAGGER)); @@ -143,7 +147,7 @@ public class LinkHelperFunctionsTest { assertTrue("google.com: No need to wait", googleSleepTime2 >= LinkResolverHelperFunctions.RECENT_DOMAINS_BACKOFF - LinkResolverHelperFunctions.DEFAULT_STAGGER); try { - System.out.println("WAITING FOR: " + smashewSleepTime3); + LOGGER.debug("WAITING FOR: " + smashewSleepTime3); Thread.sleep(smashewSleepTime3); } catch(Exception e) { @@ -153,8 +157,8 @@ public class LinkHelperFunctionsTest { long postSleepDomain1 = LinkResolverHelperFunctions.waitTimeForDomain(domain1); long postSleepDomain2 = LinkResolverHelperFunctions.waitTimeForDomain(domain2); - System.out.println("smashew.com: Post Sleep domain1: " + postSleepDomain1); - System.out.println("google.com: Post Sleep domain2: " + postSleepDomain2); + LOGGER.debug("smashew.com: Post Sleep domain1: " + postSleepDomain1); + LOGGER.debug("google.com: Post Sleep domain2: " + postSleepDomain2); assertEquals("Smashew.com: No need to wait after sleep", 0, postSleepDomain1); assertEquals("google.com: No need to wait after sleep", 0, postSleepDomain2); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java b/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java index a682b79..11a384d 100644 --- a/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java +++ b/streams-contrib/streams-provider-datasift/src/test/java17/com/datasift/test/DatasiftSerDeTest.java @@ -54,7 +54,6 @@ public class DatasiftSerDeTest { while (br.ready()) { String line = br.readLine(); LOGGER.debug(line); - System.out.println(line); Datasift ser = mapper.readValue(line, Datasift.class); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookActivitySerDeIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookActivitySerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookActivitySerDeIT.java index 9f3d208..b5d8df0 100644 --- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookActivitySerDeIT.java +++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookActivitySerDeIT.java @@ -67,8 +67,7 @@ public class FacebookActivitySerDeIT { LOGGER.debug(mapper.writeValueAsString(activity)); } catch( Exception e ) { - System.out.println(e); - e.printStackTrace(); + LOGGER.error("Exception: ", e); Assert.fail(); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPageSerDeIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPageSerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPageSerDeIT.java index 4cdf263..bba30f2 100644 --- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPageSerDeIT.java +++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPageSerDeIT.java @@ -70,8 +70,7 @@ public class FacebookPageSerDeIT { LOGGER.debug(mapper.writeValueAsString(serde)); } catch( Exception e ) { - System.out.println(e); - e.printStackTrace(); + LOGGER.error("Exception: ", e); Assert.fail(); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPostSerDeIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPostSerDeIT.java b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPostSerDeIT.java index 5758ef2..46db1b3 100644 --- a/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPostSerDeIT.java +++ b/streams-contrib/streams-provider-facebook/src/test/java/org/apache/streams/facebook/test/FacebookPostSerDeIT.java @@ -91,8 +91,7 @@ public class FacebookPostSerDeIT { assertNotNull(activity.getAdditionalProperties().get("extensions")); } catch( Exception e ) { - System.out.println(e); - e.printStackTrace(); + LOGGER.error("Exception: ", e); Assert.fail(); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java index 5ab64cf..18fbfac 100644 --- a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java +++ b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCAsActivityTest.java @@ -50,7 +50,7 @@ public class FacebookEDCAsActivityTest { public void Tests() throws Exception { InputStream is = FacebookEDCAsActivityTest.class.getResourceAsStream("/FacebookEDC.xml"); - if(is == null) System.out.println("null"); + if(is == null) LOGGER.debug("null"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, Boolean.FALSE); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java index 67950eb..91a7634 100644 --- a/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java +++ b/streams-contrib/streams-provider-gnip/gnip-edc-facebook/src/test/java/org/apache/streams/gnip/facebook/test/FacebookEDCSerDeTest.java @@ -49,7 +49,7 @@ public class FacebookEDCSerDeTest { xmlMapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE); InputStream is = FacebookEDCSerDeTest.class.getResourceAsStream("/FacebookEDC.xml"); - if(is == null) System.out.println("null"); + if(is == null) LOGGER.debug("null"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, Boolean.FALSE); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java index 1cfb946..f1257e3 100644 --- a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java +++ b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCAsActivityTest.java @@ -52,7 +52,7 @@ public class FlickrEDCAsActivityTest { mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE); InputStream is = FlickrEDCAsActivityTest.class.getResourceAsStream("/FlickrEDC.xml"); - if(is == null) System.out.println("null"); + if(is == null) LOGGER.debug("null"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); XmlMapper xmlMapper = new XmlMapper(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java index ed86fb6..3b3a847 100644 --- a/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java +++ b/streams-contrib/streams-provider-gnip/gnip-edc-flickr/src/test/java/org/apache/streams/gnip/flickr/test/FlickrEDCSerDeTest.java @@ -49,7 +49,7 @@ public class FlickrEDCSerDeTest { mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE); InputStream is = FlickrEDCSerDeTest.class.getResourceAsStream("/FlickrEDC.xml"); - if(is == null) System.out.println("null"); + if(is == null) LOGGER.debug("null"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); XmlMapper xmlMapper = new XmlMapper(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/test/java/com/gplus/api/GPlusEDCAsActivityTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/test/java/com/gplus/api/GPlusEDCAsActivityTest.java b/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/test/java/com/gplus/api/GPlusEDCAsActivityTest.java index 081b9f5..10e58e6 100644 --- a/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/test/java/com/gplus/api/GPlusEDCAsActivityTest.java +++ b/streams-contrib/streams-provider-gnip/gnip-edc-googleplus/src/test/java/com/gplus/api/GPlusEDCAsActivityTest.java @@ -53,7 +53,7 @@ public class GPlusEDCAsActivityTest { public void Tests() throws Exception { InputStream is = GPlusEDCAsActivityTest.class.getResourceAsStream("/GPlusEDCFixed.json"); - if(is == null) System.out.println("null"); + if(is == null) LOGGER.debug("null"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, Boolean.FALSE); @@ -87,8 +87,7 @@ public class GPlusEDCAsActivityTest { } } catch( Exception e ) { - System.out.println("Exception: " + e); - LOGGER.error(e.getMessage()); + LOGGER.error("Exception: ", e); Assert.fail(""); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/test/java/com/reddit/api/RedditEDCAsActivityJSONTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/test/java/com/reddit/api/RedditEDCAsActivityJSONTest.java b/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/test/java/com/reddit/api/RedditEDCAsActivityJSONTest.java index 0a6847d..9044e12 100644 --- a/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/test/java/com/reddit/api/RedditEDCAsActivityJSONTest.java +++ b/streams-contrib/streams-provider-gnip/gnip-edc-reddit/src/test/java/com/reddit/api/RedditEDCAsActivityJSONTest.java @@ -53,7 +53,7 @@ public class RedditEDCAsActivityJSONTest { public void Tests() throws Exception { InputStream is = RedditEDCAsActivityJSONTest.class.getResourceAsStream("/RedditEDCFixed.json"); - if(is == null) System.out.println("null"); + if(is == null) LOGGER.debug("null"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); xmlMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, Boolean.FALSE); @@ -88,8 +88,7 @@ public class RedditEDCAsActivityJSONTest { //LOGGER.info(activity); } } catch( Exception e ) { - System.out.println("Exception: " + e); - LOGGER.error(e.getMessage()); + LOGGER.error("Exception: ", e); Assert.fail(""); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YouTubeEDCSerDeTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YouTubeEDCSerDeTest.java b/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YouTubeEDCSerDeTest.java index b811744..c986000 100644 --- a/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YouTubeEDCSerDeTest.java +++ b/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YouTubeEDCSerDeTest.java @@ -50,7 +50,7 @@ public class YouTubeEDCSerDeTest { mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE); InputStream is = YouTubeEDCSerDeTest.class.getResourceAsStream("/YoutubeEDC.xml"); - if(is == null) System.out.println("null"); + if(is == null) LOGGER.debug("null"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); XmlMapper xmlMapper = new XmlMapper(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YoutubeEDCAsActivityTest.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YoutubeEDCAsActivityTest.java b/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YoutubeEDCAsActivityTest.java index c8ea6e7..1c12744 100644 --- a/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YoutubeEDCAsActivityTest.java +++ b/streams-contrib/streams-provider-gnip/gnip-edc-youtube/src/test/java/com/gnip/test/YoutubeEDCAsActivityTest.java @@ -53,7 +53,7 @@ public class YoutubeEDCAsActivityTest { mapper.configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, Boolean.TRUE); InputStream is = YoutubeEDCAsActivityTest.class.getResourceAsStream("/YoutubeEDC.xml"); - if(is == null) System.out.println("null"); + if(is == null) LOGGER.debug("null"); InputStreamReader isr = new InputStreamReader(is); BufferedReader br = new BufferedReader(isr); XmlMapper xmlMapper = new XmlMapper(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeIT.java b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeIT.java index 732b18a..6d1bebd 100644 --- a/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeIT.java +++ b/streams-contrib/streams-provider-instagram/src/test/java/org/apache/streams/twitter/test/InstagramActivitySerDeIT.java @@ -24,7 +24,6 @@ import org.apache.streams.pojo.json.Activity; import org.jinstagram.entity.users.basicinfo.UserInfoData; import org.jinstagram.entity.users.feed.MediaFeedData; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,8 +75,7 @@ public class InstagramActivitySerDeIT { } } } catch( Exception e ) { - System.out.println(e); - e.printStackTrace(); + LOGGER.error("Exception: ", e); Assert.fail(); } } @@ -126,8 +124,7 @@ public class InstagramActivitySerDeIT { } } } catch( Exception e ) { - System.out.println(e); - e.printStackTrace(); + LOGGER.error("Exception: ", e); Assert.fail(); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java index 2f2d677..ae48b41 100644 --- a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java +++ b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/MoreoverJsonActivitySerializer.java @@ -27,6 +27,8 @@ import com.moreover.api.Article; import org.apache.commons.lang.NotImplementedException; import org.apache.streams.data.util.MoreoverUtils; import org.apache.streams.pojo.json.Activity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.List; @@ -36,6 +38,8 @@ import java.util.List; */ public class MoreoverJsonActivitySerializer implements ActivitySerializer<String> { + private final static Logger LOGGER = LoggerFactory.getLogger(MoreoverJsonActivitySerializer.class); + public MoreoverJsonActivitySerializer() { } @@ -53,7 +57,7 @@ public class MoreoverJsonActivitySerializer implements ActivitySerializer<String public Activity deserialize(String serialized) { serialized = serialized.replaceAll("\\[[ ]*\\]", "null"); - System.out.println(serialized); + LOGGER.debug(serialized); ObjectMapper mapper = new ObjectMapper(); AnnotationIntrospector introspector = new JaxbAnnotationIntrospector(mapper.getTypeFactory()); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/data/util/MoreoverTestUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/data/util/MoreoverTestUtil.java b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/data/util/MoreoverTestUtil.java index a8cd816..14b7652 100644 --- a/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/data/util/MoreoverTestUtil.java +++ b/streams-contrib/streams-provider-moreover/src/test/java/org/apache/streams/data/util/MoreoverTestUtil.java @@ -18,8 +18,9 @@ package org.apache.streams.data.util; -import com.fasterxml.jackson.databind.JsonNode; import org.apache.streams.pojo.json.Activity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static java.util.regex.Pattern.matches; import static org.hamcrest.CoreMatchers.*; @@ -27,6 +28,8 @@ import static org.junit.Assert.assertThat; public class MoreoverTestUtil { + private final static Logger LOGGER = LoggerFactory.getLogger(MoreoverTestUtil.class); + public static void test(Activity activity) { assertThat(activity, is(not(nullValue()))); assertThat(activity.getActor(), is(not(nullValue()))); @@ -35,6 +38,6 @@ public class MoreoverTestUtil { assertThat(matches("id:.*:[a-z]*s:[a-zA-Z0-9]*", activity.getObject().getId()), is(true)); } assertThat(activity.getObject().getObjectType(), is(not(nullValue()))); - System.out.println(activity.getPublished()); + LOGGER.debug(activity.getPublished().toString()); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java index f818c33..5e7ed53 100644 --- a/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java +++ b/streams-contrib/streams-provider-rss/src/test/java/org/apache/streams/rss/test/SyndEntryActivitySerializerIT.java @@ -29,22 +29,23 @@ import org.apache.streams.pojo.json.Provider; import org.apache.streams.rss.serializer.SyndEntryActivitySerializer; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; -import org.junit.Ignore; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.URL; import java.util.List; import java.util.Scanner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.*; /** * Tests ability to convert SyndEntry ObjectNode form to {@link org.apache.streams.rss.processor.RssTypeConverter} form */ public class SyndEntryActivitySerializerIT { + private final static Logger LOGGER = LoggerFactory.getLogger(SyndEntryActivitySerializerIT.class); + private static ObjectMapper mapper = StreamsJacksonMapper.getInstance(); @Test @@ -57,7 +58,7 @@ public class SyndEntryActivitySerializerIT { while(scanner.hasNext()) { String line = scanner.nextLine(); - System.out.println(line); + LOGGER.debug(line); ObjectNode node = (ObjectNode) mapper.readTree(line); objects.add(node); @@ -110,7 +111,7 @@ public class SyndEntryActivitySerializerIT { url = new URL(provider.getUrl()); url.toURI(); } catch(Exception e) { - System.out.println("Threw an exception while trying to validate URL: " + provider.getUrl()); + LOGGER.error("Threw an exception while trying to validate URL: {} - {}", provider.getUrl(), e); } assertNotNull(url); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java index dc0ec88..0bfa786 100644 --- a/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java +++ b/streams-contrib/streams-provider-twitter/src/main/java/org/apache/streams/twitter/converter/util/TwitterActivityUtil.java @@ -41,6 +41,8 @@ import org.apache.streams.twitter.pojo.Tweet; import org.apache.streams.twitter.pojo.User; import org.apache.streams.twitter.pojo.UserMentions; import org.apache.streams.twitter.converter.StreamsTwitterMapper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.HashMap; @@ -54,6 +56,8 @@ import static org.apache.streams.data.util.ActivityUtil.ensureExtensions; */ public class TwitterActivityUtil { + private final static Logger LOGGER = LoggerFactory.getLogger(TwitterActivityUtil.class); + /** * Updates the given Activity object with the values from the Tweet * @param tweet the object to use as the source @@ -242,7 +246,7 @@ public class TwitterActivityUtil { } } else - System.out.println(" 0 links"); + LOGGER.debug(" 0 links"); return links; } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterObjectMapperIT.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterObjectMapperIT.java b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterObjectMapperIT.java index 50acb3b..4da2af2 100644 --- a/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterObjectMapperIT.java +++ b/streams-contrib/streams-provider-twitter/src/test/java/org/apache/streams/twitter/test/TwitterObjectMapperIT.java @@ -120,8 +120,7 @@ public class TwitterObjectMapperIT { } } } catch( Exception e ) { - System.out.println(e); - e.printStackTrace(); + LOGGER.error("Exception: ", e); Assert.fail(); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/DoNothingProcessor.java ---------------------------------------------------------------------- diff --git a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/DoNothingProcessor.java b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/DoNothingProcessor.java index d7b5bbe..cad7873 100644 --- a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/DoNothingProcessor.java +++ b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/DoNothingProcessor.java @@ -20,6 +20,8 @@ package org.apache.streams.local.test.processors; import org.apache.streams.core.StreamsDatum; import org.apache.streams.core.StreamsProcessor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.LinkedList; import java.util.List; @@ -29,6 +31,8 @@ import java.util.List; */ public class DoNothingProcessor implements StreamsProcessor { + private final static Logger LOGGER = LoggerFactory.getLogger(DoNothingProcessor.class); + public final static String STREAMS_ID = "DoNothingProcessor"; List<StreamsDatum> result; @@ -55,6 +59,6 @@ public class DoNothingProcessor implements StreamsProcessor { @Override public void cleanUp() { - System.out.println("Processor clean up!"); + LOGGER.debug("Processor clean up!"); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/PassthroughDatumCounterProcessor.java ---------------------------------------------------------------------- diff --git a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/PassthroughDatumCounterProcessor.java b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/PassthroughDatumCounterProcessor.java index 8e6b59f..970a8dc 100644 --- a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/PassthroughDatumCounterProcessor.java +++ b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/processors/PassthroughDatumCounterProcessor.java @@ -20,6 +20,8 @@ package org.apache.streams.local.test.processors; import org.apache.streams.core.StreamsDatum; import org.apache.streams.core.StreamsProcessor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -30,6 +32,8 @@ import java.util.concurrent.atomic.AtomicLong; */ public class PassthroughDatumCounterProcessor implements StreamsProcessor { + private final static Logger LOGGER = LoggerFactory.getLogger(PassthroughDatumCounterProcessor.class); + public final static String STREAMS_ID = "PassthroughDatumCounterProcessor"; /** @@ -85,7 +89,7 @@ public class PassthroughDatumCounterProcessor implements StreamsProcessor { @Override public void cleanUp() { - System.out.println("Clean up "+this.procId); + LOGGER.debug("Clean up {}", this.procId); synchronized (COUNTS) { AtomicLong count = COUNTS.get(this.procId); if(count == null) { @@ -94,7 +98,7 @@ public class PassthroughDatumCounterProcessor implements StreamsProcessor { count.addAndGet(this.count); } } - System.out.println(this.procId+"\t"+this.count); + LOGGER.debug("{}\t{}", this.procId, this.count); } public int getMessageCount() { http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/DoNothingWriter.java ---------------------------------------------------------------------- diff --git a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/DoNothingWriter.java b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/DoNothingWriter.java index 9b78eb7..d9ec6d3 100644 --- a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/DoNothingWriter.java +++ b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/DoNothingWriter.java @@ -20,12 +20,16 @@ package org.apache.streams.local.test.writer; import org.apache.streams.core.StreamsDatum; import org.apache.streams.core.StreamsPersistWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Created by rebanks on 2/20/14. */ public class DoNothingWriter implements StreamsPersistWriter { + private final static Logger LOGGER = LoggerFactory.getLogger(DoNothingWriter.class); + @Override public String getId() { return "DoNothingWriter"; @@ -43,6 +47,6 @@ public class DoNothingWriter implements StreamsPersistWriter { @Override public void cleanUp() { - System.out.println("Writer Clean Up!"); + LOGGER.debug("Writer Clean Up!"); } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/296861a6/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/SystemOutWriter.java ---------------------------------------------------------------------- diff --git a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/SystemOutWriter.java b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/SystemOutWriter.java index a841ce5..76ce353 100644 --- a/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/SystemOutWriter.java +++ b/streams-runtimes/streams-runtime-local/src/test/java/org/apache/streams/local/test/writer/SystemOutWriter.java @@ -20,12 +20,16 @@ package org.apache.streams.local.test.writer; import org.apache.streams.core.StreamsDatum; import org.apache.streams.core.StreamsPersistWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Created by rebanks on 2/20/14. */ public class SystemOutWriter implements StreamsPersistWriter { + private final static Logger LOGGER = LoggerFactory.getLogger(SystemOutWriter.class); + @Override public String getId() { return "SystemOutWriter"; @@ -43,6 +47,6 @@ public class SystemOutWriter implements StreamsPersistWriter { @Override public void cleanUp() { - System.out.println("Clean up called writer!"); + LOGGER.debug("Clean up called writer!"); } }