Repository: incubator-streams Updated Branches: refs/heads/master 6894acfaa -> 2daa1b430
Another Trivial cleanup, to trigger screwed Github mirror to sync up Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/2daa1b43 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/2daa1b43 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/2daa1b43 Branch: refs/heads/master Commit: 2daa1b430577bb4737668280cd0149923faa177e Parents: 6894acf Author: smarthi <smar...@apache.org> Authored: Wed Oct 26 21:14:47 2016 -0400 Committer: smarthi <smar...@apache.org> Committed: Wed Oct 26 21:14:47 2016 -0400 ---------------------------------------------------------------------- .../org/apache/streams/core/StreamState.java | 3 --- .../org/apache/streams/core/StreamsDatum.java | 21 +++++++++++--------- .../org/apache/streams/core/StreamsFilter.java | 4 ---- .../streams/core/StreamsPersistReader.java | 8 +++----- .../streams/core/StreamsPersistWriter.java | 8 +------- .../apache/streams/core/StreamsProcessor.java | 8 +------- .../apache/streams/core/StreamsProvider.java | 8 +++----- .../apache/streams/core/util/DatumUtils.java | 6 ++---- 8 files changed, 22 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2daa1b43/streams-core/src/main/java/org/apache/streams/core/StreamState.java ---------------------------------------------------------------------- diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamState.java b/streams-core/src/main/java/org/apache/streams/core/StreamState.java index 8dab789..0c24d29 100644 --- a/streams-core/src/main/java/org/apache/streams/core/StreamState.java +++ b/streams-core/src/main/java/org/apache/streams/core/StreamState.java @@ -18,9 +18,6 @@ package org.apache.streams.core; -/** - * Created by sblackmon on 1/6/14. - */ public enum StreamState { RUNNING, //Stream is currently connected and running STOPPED, // Stream has been shut down and is stopped http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2daa1b43/streams-core/src/main/java/org/apache/streams/core/StreamsDatum.java ---------------------------------------------------------------------- diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsDatum.java b/streams-core/src/main/java/org/apache/streams/core/StreamsDatum.java index e0b17de..8367631 100644 --- a/streams-core/src/main/java/org/apache/streams/core/StreamsDatum.java +++ b/streams-core/src/main/java/org/apache/streams/core/StreamsDatum.java @@ -26,17 +26,14 @@ import java.math.BigInteger; import java.util.HashMap; import java.util.Map; -/** - * Created by sblackmon on 1/2/14. - */ public class StreamsDatum implements Serializable { public StreamsDatum(Object document) { - this(document, null, null, null, new HashMap<String, Object>()); + this(document, null, null, null, new HashMap<>()); } public StreamsDatum(Object document, String id) { - this(document, id, null, null, new HashMap<String, Object>()); + this(document, id, null, null, new HashMap<>()); } public StreamsDatum(Object document, BigInteger sequenceid) { @@ -56,7 +53,7 @@ public class StreamsDatum implements Serializable { } public StreamsDatum(Object document, String id, DateTime timestamp) { - this(document, id, timestamp, null, new HashMap<String, Object>()); + this(document, id, timestamp, null, new HashMap<>()); } public StreamsDatum(Object document, String id, Map<String, Object> metadata) { @@ -68,7 +65,7 @@ public class StreamsDatum implements Serializable { } public StreamsDatum(Object document, String id, BigInteger sequenceid) { - this(document, id, sequenceid, new HashMap<String, Object>()); + this(document, id, sequenceid, new HashMap<>()); } public StreamsDatum(Object document, String id, DateTime timestamp, BigInteger sequenceid) { @@ -76,7 +73,7 @@ public class StreamsDatum implements Serializable { this.id = id; this.timestamp = timestamp; this.sequenceid = sequenceid; - this.metadata = new HashMap<String, Object>(); + this.metadata = new HashMap<>(); } public StreamsDatum(Object document, String id, DateTime timestamp, BigInteger sequenceid, Map<String, Object> metadata) { @@ -160,7 +157,13 @@ public class StreamsDatum implements Serializable { @Override public String toString() { - return this.id+"\tMetadata="+this.metadata+"\tTimestamp="+this.timestamp+"\tSequence="+this.sequenceid+"\tDocument="+this.document; + return "StreamsDatum{" + + "timestamp=" + timestamp + + ", sequenceid=" + sequenceid + + ", metadata=" + metadata + + ", document=" + document + + ", id='" + id + '\'' + + '}'; } } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2daa1b43/streams-core/src/main/java/org/apache/streams/core/StreamsFilter.java ---------------------------------------------------------------------- diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsFilter.java b/streams-core/src/main/java/org/apache/streams/core/StreamsFilter.java index 11e9539..929b26f 100644 --- a/streams-core/src/main/java/org/apache/streams/core/StreamsFilter.java +++ b/streams-core/src/main/java/org/apache/streams/core/StreamsFilter.java @@ -18,12 +18,8 @@ package org.apache.streams.core; -import java.util.List; import java.util.Queue; -/** - * Created by sblackmon on 12/13/13. - */ public interface StreamsFilter { void start(); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2daa1b43/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java ---------------------------------------------------------------------- diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java b/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java index 386a5e0..1a6b0d8 100644 --- a/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java +++ b/streams-core/src/main/java/org/apache/streams/core/StreamsPersistReader.java @@ -20,9 +20,7 @@ package org.apache.streams.core; import org.joda.time.DateTime; -import java.io.Serializable; import java.math.BigInteger; -import java.util.Queue; /** * @@ -32,9 +30,9 @@ import java.util.Queue; */ public interface StreamsPersistReader extends StreamsProvider { - public StreamsResultSet readAll(); - public StreamsResultSet readNew(BigInteger sequence); - public StreamsResultSet readRange(DateTime start, DateTime end); + StreamsResultSet readAll(); + StreamsResultSet readNew(BigInteger sequence); + StreamsResultSet readRange(DateTime start, DateTime end); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2daa1b43/streams-core/src/main/java/org/apache/streams/core/StreamsPersistWriter.java ---------------------------------------------------------------------- diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsPersistWriter.java b/streams-core/src/main/java/org/apache/streams/core/StreamsPersistWriter.java index 3f7a79c..1af62e7 100644 --- a/streams-core/src/main/java/org/apache/streams/core/StreamsPersistWriter.java +++ b/streams-core/src/main/java/org/apache/streams/core/StreamsPersistWriter.java @@ -18,18 +18,12 @@ package org.apache.streams.core; -import java.io.Serializable; -import java.util.Queue; - -/** - * Created by sblackmon on 12/13/13. - */ public interface StreamsPersistWriter extends StreamsOperation{ /** * Persist the StreamsDatum to the corresponding data store. * @param entry to be stored. */ - public void write( StreamsDatum entry ); + void write( StreamsDatum entry ); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2daa1b43/streams-core/src/main/java/org/apache/streams/core/StreamsProcessor.java ---------------------------------------------------------------------- diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsProcessor.java b/streams-core/src/main/java/org/apache/streams/core/StreamsProcessor.java index d61c1e5..b63e2d9 100644 --- a/streams-core/src/main/java/org/apache/streams/core/StreamsProcessor.java +++ b/streams-core/src/main/java/org/apache/streams/core/StreamsProcessor.java @@ -19,21 +19,15 @@ package org.apache.streams.core; import java.util.List; -import java.util.Queue; -/** - * Created by sblackmon on 12/13/13. - */ public interface StreamsProcessor extends StreamsOperation{ - - /** * Process/Analyze the {@link org.apache.streams.core.StreamsDatum} and return the the StreamsDatums that will * passed to every down stream operation that reads from this processor. * @param entry StreamsDatum to be process * @return resulting StreamDatums from process. Should never be null or contain null object. Empty list OK. */ - public List<StreamsDatum> process( StreamsDatum entry ); + List<StreamsDatum> process( StreamsDatum entry ); } http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2daa1b43/streams-core/src/main/java/org/apache/streams/core/StreamsProvider.java ---------------------------------------------------------------------- diff --git a/streams-core/src/main/java/org/apache/streams/core/StreamsProvider.java b/streams-core/src/main/java/org/apache/streams/core/StreamsProvider.java index 1e6cf12..7c27e34 100644 --- a/streams-core/src/main/java/org/apache/streams/core/StreamsProvider.java +++ b/streams-core/src/main/java/org/apache/streams/core/StreamsProvider.java @@ -18,10 +18,8 @@ package org.apache.streams.core; -import org.joda.time.DateTime; - import java.math.BigInteger; -import java.util.Queue; +import org.joda.time.DateTime; /** * A StreamsProvider represents the entry point into the Streams pipeline. Providers are responsible for inserting @@ -43,7 +41,7 @@ public interface StreamsProvider extends StreamsOperation { /** * TODO: Define how this operates or eliminate * @param sequence - * @return + * @return {@link StreamsResultSet} */ StreamsResultSet readNew(BigInteger sequence); @@ -51,7 +49,7 @@ public interface StreamsProvider extends StreamsOperation { * TODO: Define how this operates or eliminate * @param start * @param end - * @return + * @return {@link StreamsResultSet} */ StreamsResultSet readRange(DateTime start, DateTime end); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/2daa1b43/streams-core/src/main/java/org/apache/streams/core/util/DatumUtils.java ---------------------------------------------------------------------- diff --git a/streams-core/src/main/java/org/apache/streams/core/util/DatumUtils.java b/streams-core/src/main/java/org/apache/streams/core/util/DatumUtils.java index b751b2a..a229413 100644 --- a/streams-core/src/main/java/org/apache/streams/core/util/DatumUtils.java +++ b/streams-core/src/main/java/org/apache/streams/core/util/DatumUtils.java @@ -19,12 +19,10 @@ package org.apache.streams.core.util; -import com.google.common.collect.Maps; import org.apache.streams.core.StreamsDatum; import org.apache.streams.core.StreamsOperation; import org.joda.time.DateTime; -import java.math.BigInteger; import java.util.HashMap; import java.util.Map; @@ -44,7 +42,7 @@ public class DatumUtils { @SuppressWarnings("all") public static void addErrorToMetadata(StreamsDatum datum, Throwable e, Class<? extends StreamsOperation> operationClass) { if(!datum.getMetadata().containsKey("errors")) { - datum.getMetadata().put("errors", Maps.<String, Throwable>newHashMap()); + datum.getMetadata().put("errors", new HashMap<String, Throwable>()); } Map<String, Throwable> errors = (Map)datum.getMetadata().get("errors"); errors.put(operationClass.getCanonicalName(), e); @@ -52,7 +50,7 @@ public class DatumUtils { public static StreamsDatum cloneDatum(StreamsDatum datum) { StreamsDatum clone = new StreamsDatum(datum.getDocument()); - clone.setId(datum.getId() == null ? null : new String(datum.getId())); + clone.setId(datum.getId() == null ? null : datum.getId()); clone.setTimestamp(datum.getTimestamp() == null ? null : new DateTime(datum.getTimestamp())); clone.setSequenceid(datum.getSequenceid() == null ? null : datum.getSequenceid()); clone.setMetadata(datum.getMetadata() == null ? null : new HashMap<>(datum.getMetadata()));
