Skip to content
Snippets Groups Projects
Commit d3afffc0 authored by Nelson Tavares de Sousa's avatar Nelson Tavares de Sousa
Browse files

renamed method

parent 31e6bba9
No related branches found
No related tags found
No related merge requests found
Showing
with 34 additions and 34 deletions
...@@ -145,7 +145,7 @@ public abstract class AnalysisConfiguration { ...@@ -145,7 +145,7 @@ public abstract class AnalysisConfiguration {
return interUnboundedThreadFactory.create(sourcePort, targetPort, capacity); return interUnboundedThreadFactory.create(sourcePort, targetPort, capacity);
} }
protected <T> void connectStages(final OutputPort<? extends T> sourcePort, final InputPort<T> targetPort) { protected <T> void connectPorts(final OutputPort<? extends T> sourcePort, final InputPort<T> targetPort) {
connections.add(new Pair<OutputPort, InputPort>(sourcePort, targetPort)); connections.add(new Pair<OutputPort, InputPort>(sourcePort, targetPort));
} }
......
...@@ -88,7 +88,7 @@ public final class StageTester { ...@@ -88,7 +88,7 @@ public final class StageTester {
public Configuration(final List<InputHolder<?>> inputHolders, final Stage stage, final List<OutputHolder<?>> outputHolders) { public Configuration(final List<InputHolder<?>> inputHolders, final Stage stage, final List<OutputHolder<?>> outputHolders) {
for (InputHolder<?> inputHolder : inputHolders) { for (InputHolder<?> inputHolder : inputHolders) {
final InitialElementProducer<Object> producer = new InitialElementProducer<Object>(inputHolder.getInput()); final InitialElementProducer<Object> producer = new InitialElementProducer<Object>(inputHolder.getInput());
connectStages(producer.getOutputPort(), inputHolder.getPort()); connectPorts(producer.getOutputPort(), inputHolder.getPort());
addThreadableStage(producer); addThreadableStage(producer);
} }
...@@ -96,7 +96,7 @@ public final class StageTester { ...@@ -96,7 +96,7 @@ public final class StageTester {
for (OutputHolder<?> outputHolder : outputHolders) { for (OutputHolder<?> outputHolder : outputHolders) {
final CollectorSink<Object> sink = new CollectorSink<Object>(outputHolder.getOutputElements()); final CollectorSink<Object> sink = new CollectorSink<Object>(outputHolder.getOutputElements());
connectStages(outputHolder.getPort(), sink.getInputPort()); connectPorts(outputHolder.getPort(), sink.getInputPort());
} }
} }
} }
......
...@@ -40,12 +40,12 @@ public class CipherConfiguration extends AnalysisConfiguration { ...@@ -40,12 +40,12 @@ public class CipherConfiguration extends AnalysisConfiguration {
final CipherStage decrypt = new CipherStage(password, CipherMode.DECRYPT); final CipherStage decrypt = new CipherStage(password, CipherMode.DECRYPT);
final ByteArrayFileWriter writer = new ByteArrayFileWriter(output); final ByteArrayFileWriter writer = new ByteArrayFileWriter(output);
connectStages(init.getOutputPort(), f2b.getInputPort()); connectPorts(init.getOutputPort(), f2b.getInputPort());
connectStages(f2b.getOutputPort(), enc.getInputPort()); connectPorts(f2b.getOutputPort(), enc.getInputPort());
connectStages(enc.getOutputPort(), comp.getInputPort()); connectPorts(enc.getOutputPort(), comp.getInputPort());
connectStages(comp.getOutputPort(), decomp.getInputPort()); connectPorts(comp.getOutputPort(), decomp.getInputPort());
connectStages(decomp.getOutputPort(), decrypt.getInputPort()); connectPorts(decomp.getOutputPort(), decrypt.getInputPort());
connectStages(decrypt.getOutputPort(), writer.getInputPort()); connectPorts(decrypt.getOutputPort(), writer.getInputPort());
// this.getFiniteProducerStages().add(init); // this.getFiniteProducerStages().add(init);
this.addThreadableStage(init); this.addThreadableStage(init);
......
...@@ -43,12 +43,12 @@ public class TokenizerConfiguration extends AnalysisConfiguration { ...@@ -43,12 +43,12 @@ public class TokenizerConfiguration extends AnalysisConfiguration {
final Tokenizer tokenizer = new Tokenizer(" "); final Tokenizer tokenizer = new Tokenizer(" ");
this.counter = new Counter<String>(); this.counter = new Counter<String>();
connectStages(init.getOutputPort(), f2b.getInputPort()); connectPorts(init.getOutputPort(), f2b.getInputPort());
connectStages(f2b.getOutputPort(), decomp.getInputPort()); connectPorts(f2b.getOutputPort(), decomp.getInputPort());
connectStages(decomp.getOutputPort(), decrypt.getInputPort()); connectPorts(decomp.getOutputPort(), decrypt.getInputPort());
connectStages(decrypt.getOutputPort(), b2s.getInputPort()); connectPorts(decrypt.getOutputPort(), b2s.getInputPort());
connectStages(b2s.getOutputPort(), tokenizer.getInputPort()); connectPorts(b2s.getOutputPort(), tokenizer.getInputPort());
connectStages(tokenizer.getOutputPort(), this.counter.getInputPort()); connectPorts(tokenizer.getOutputPort(), this.counter.getInputPort());
this.addThreadableStage(init); this.addThreadableStage(init);
} }
......
...@@ -73,7 +73,7 @@ public class AnalysisTest { ...@@ -73,7 +73,7 @@ public class AnalysisTest {
public TestConfig() { public TestConfig() {
final InitialElementProducer<String> init = new InitialElementProducer<String>("Hello"); final InitialElementProducer<String> init = new InitialElementProducer<String>("Hello");
delay = new DelayAndTerminate(DELAY_IN_MS); delay = new DelayAndTerminate(DELAY_IN_MS);
connectStages(init.getOutputPort(), delay.getInputPort()); connectPorts(init.getOutputPort(), delay.getInputPort());
addThreadableStage(init); addThreadableStage(init);
} }
} }
...@@ -114,7 +114,7 @@ public class AnalysisTest { ...@@ -114,7 +114,7 @@ public class AnalysisTest {
public Sink<Object> sink = new Sink<Object>(); public Sink<Object> sink = new Sink<Object>();
public AnalysisTestConfig(final boolean inter) { public AnalysisTestConfig(final boolean inter) {
connectStages(init.getOutputPort(), sink.getInputPort()); connectPorts(init.getOutputPort(), sink.getInputPort());
addThreadableStage(init); addThreadableStage(init);
if (inter) { if (inter) {
addThreadableStage(sink); addThreadableStage(sink);
......
...@@ -35,7 +35,7 @@ public class RunnableConsumerStageTestConfiguration extends AnalysisConfiguratio ...@@ -35,7 +35,7 @@ public class RunnableConsumerStageTestConfiguration extends AnalysisConfiguratio
CollectorSink<Integer> collectorSink = new CollectorSink<Integer>(collectedElements); CollectorSink<Integer> collectorSink = new CollectorSink<Integer>(collectedElements);
addThreadableStage(collectorSink); addThreadableStage(collectorSink);
connectStages(producer.getOutputPort(), collectorSink.getInputPort()); connectPorts(producer.getOutputPort(), collectorSink.getInputPort());
this.collectorSink = collectorSink; this.collectorSink = collectorSink;
} }
......
...@@ -60,7 +60,7 @@ public class StageTest { ...@@ -60,7 +60,7 @@ public class StageTest {
public TestConfig() { public TestConfig() {
init = new InitialElementProducer<String>("Hello"); init = new InitialElementProducer<String>("Hello");
delay = new DelayAndTerminate(0); delay = new DelayAndTerminate(0);
connectStages(init.getOutputPort(), delay.getInputPort()); connectPorts(init.getOutputPort(), delay.getInputPort());
addThreadableStage(init); addThreadableStage(init);
} }
} }
......
...@@ -71,8 +71,8 @@ public class TraversorTest { ...@@ -71,8 +71,8 @@ public class TraversorTest {
// CountingMapMerger (already as field) // CountingMapMerger (already as field)
// Connecting the stages of the first part of the config // Connecting the stages of the first part of the config
connectStages(init.getOutputPort(), f2b.getInputPort()); connectPorts(init.getOutputPort(), f2b.getInputPort());
connectStages(f2b.getOutputPort(), distributor.getInputPort()); connectPorts(f2b.getOutputPort(), distributor.getInputPort());
// Middle part... multiple instances of WordCounter are created and connected to the merger and distrubuter stages // Middle part... multiple instances of WordCounter are created and connected to the merger and distrubuter stages
for (int i = 0; i < threads; i++) { for (int i = 0; i < threads; i++) {
...@@ -80,15 +80,15 @@ public class TraversorTest { ...@@ -80,15 +80,15 @@ public class TraversorTest {
final WordCounter wc = new WordCounter(); final WordCounter wc = new WordCounter();
// intraFact.create(inputPortSizePrinter.getOutputPort(), wc.getInputPort()); // intraFact.create(inputPortSizePrinter.getOutputPort(), wc.getInputPort());
connectStages(distributor.getNewOutputPort(), wc.getInputPort()); connectPorts(distributor.getNewOutputPort(), wc.getInputPort());
connectStages(wc.getOutputPort(), merger.getNewInputPort()); connectPorts(wc.getOutputPort(), merger.getNewInputPort());
// Add WordCounter as a threadable stage, so it runs in its own thread // Add WordCounter as a threadable stage, so it runs in its own thread
addThreadableStage(wc); addThreadableStage(wc);
} }
// Connect the stages of the last part // Connect the stages of the last part
connectStages(merger.getOutputPort(), result.getInputPort()); connectPorts(merger.getOutputPort(), result.getInputPort());
// Add the first and last part to the threadable stages // Add the first and last part to the threadable stages
addThreadableStage(init); addThreadableStage(init);
......
...@@ -42,7 +42,7 @@ class WaitStrategyConfiguration extends AnalysisConfiguration { ...@@ -42,7 +42,7 @@ class WaitStrategyConfiguration extends AnalysisConfiguration {
Clock clock = new Clock(); Clock clock = new Clock();
clock.setInitialDelayInMs(initialDelayInMs); clock.setInitialDelayInMs(initialDelayInMs);
connectStages(clock.getOutputPort(), delay.getTimestampTriggerInputPort()); connectPorts(clock.getOutputPort(), delay.getTimestampTriggerInputPort());
return clock; return clock;
} }
...@@ -51,7 +51,7 @@ class WaitStrategyConfiguration extends AnalysisConfiguration { ...@@ -51,7 +51,7 @@ class WaitStrategyConfiguration extends AnalysisConfiguration {
InitialElementProducer<Object> initialElementProducer = new InitialElementProducer<Object>(elements); InitialElementProducer<Object> initialElementProducer = new InitialElementProducer<Object>(elements);
delay = new Delay<Object>(); delay = new Delay<Object>();
connectStages(initialElementProducer.getOutputPort(), delay.getInputPort()); connectPorts(initialElementProducer.getOutputPort(), delay.getInputPort());
return initialElementProducer; return initialElementProducer;
} }
...@@ -62,8 +62,8 @@ class WaitStrategyConfiguration extends AnalysisConfiguration { ...@@ -62,8 +62,8 @@ class WaitStrategyConfiguration extends AnalysisConfiguration {
// relay.setIdleStrategy(new WaitStrategy(relay)); // relay.setIdleStrategy(new WaitStrategy(relay));
connectStages(delay.getOutputPort(), relay.getInputPort()); connectPorts(delay.getOutputPort(), relay.getInputPort());
connectStages(relay.getOutputPort(), collectorSink.getInputPort()); connectPorts(relay.getOutputPort(), collectorSink.getInputPort());
this.collectorSink = collectorSink; this.collectorSink = collectorSink;
......
...@@ -44,8 +44,8 @@ class YieldStrategyConfiguration extends AnalysisConfiguration { ...@@ -44,8 +44,8 @@ class YieldStrategyConfiguration extends AnalysisConfiguration {
// relay.setIdleStrategy(new YieldStrategy()); // relay.setIdleStrategy(new YieldStrategy());
connectStages(producer.getOutputPort(), relay.getInputPort()); connectPorts(producer.getOutputPort(), relay.getInputPort());
connectStages(relay.getOutputPort(), collectorSink.getInputPort()); connectPorts(relay.getOutputPort(), collectorSink.getInputPort());
this.collectorSink = collectorSink; this.collectorSink = collectorSink;
......
...@@ -28,7 +28,7 @@ public class ExceptionTestConfiguration extends AnalysisConfiguration { ...@@ -28,7 +28,7 @@ public class ExceptionTestConfiguration extends AnalysisConfiguration {
second = new ExceptionTestConsumerStage(); second = new ExceptionTestConsumerStage();
third = new ExceptionTestProducerStage(); third = new ExceptionTestProducerStage();
connectStages(first.getOutputPort(), second.getInputPort()); connectPorts(first.getOutputPort(), second.getInputPort());
// this.addThreadableStage(new ExceptionTestStage()); // this.addThreadableStage(new ExceptionTestStage());
this.addThreadableStage(first); this.addThreadableStage(first);
......
...@@ -130,9 +130,9 @@ public class InstanceOfFilterTest { ...@@ -130,9 +130,9 @@ public class InstanceOfFilterTest {
CollectorSink<Clazz> clazzCollector = new CollectorSink<Clazz>(); CollectorSink<Clazz> clazzCollector = new CollectorSink<Clazz>();
CollectorSink<Object> mismatchedCollector = new CollectorSink<Object>(); CollectorSink<Object> mismatchedCollector = new CollectorSink<Object>();
connectStages(elementProducer.getOutputPort(), instanceOfFilter.getInputPort()); connectPorts(elementProducer.getOutputPort(), instanceOfFilter.getInputPort());
connectStages(instanceOfFilter.getMatchedOutputPort(), clazzCollector.getInputPort()); connectPorts(instanceOfFilter.getMatchedOutputPort(), clazzCollector.getInputPort());
connectStages(instanceOfFilter.getMismatchedOutputPort(), mismatchedCollector.getInputPort()); connectPorts(instanceOfFilter.getMismatchedOutputPort(), mismatchedCollector.getInputPort());
addThreadableStage(elementProducer); addThreadableStage(elementProducer);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment