From af1fd216a623e142f18248cd4d40ca1fbc19a9c4 Mon Sep 17 00:00:00 2001 From: Daniel Dara Date: Fri, 27 Oct 2017 22:32:29 -0400 Subject: [PATCH] Deprecated FixedTupleSpout constructor with String. Added constructor with Fields so more than one output field can be specified. --- .../apache/storm/testing/FixedTupleSpout.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java b/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java index 87fc52d1f59..5234d32d434 100644 --- a/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java +++ b/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java @@ -59,13 +59,21 @@ public static void clear(String stormId) { private Map _pending; private String _id; - private String _fieldName; + private Fields _fields; public FixedTupleSpout(List tuples) { - this(tuples, null); + this(tuples, (Fields) null); } + /** + * @deprecated please use {@link #FixedTupleSpout(List, Fields)} + */ + @Deprecated public FixedTupleSpout(List tuples, String fieldName) { + this(tuples, new Fields(fieldName)); + } + + public FixedTupleSpout(List tuples, Fields fields) { _id = UUID.randomUUID().toString(); synchronized(acked) { acked.put(_id, 0); @@ -83,7 +91,7 @@ public FixedTupleSpout(List tuples, String fieldName) { } _tuples.add(ft); } - _fieldName = fieldName; + _fields = fields; } public List getSourceTuples() { @@ -167,8 +175,8 @@ public void deactivate() { @Override public void declareOutputFields(OutputFieldsDeclarer declarer) { - if (_fieldName != null) { - declarer.declare(new Fields(_fieldName)); + if (_fields != null) { + declarer.declare(_fields); } }