From e2e936cb22ed47ccd703b549eda57cfc42960b05 Mon Sep 17 00:00:00 2001
From: as <asalveter@gmail.com>
Date: Thu, 12 Mar 2015 19:06:39 +0100
Subject: [PATCH] Rename Stage.executeWithPorts() to executeStage()
---
src/main/java/teetime/framework/AbstractConsumerStage.java | 2 +-
.../java/teetime/framework/AbstractIntraThreadPipe.java | 2 +-
src/main/java/teetime/framework/AbstractProducerStage.java | 2 +-
src/main/java/teetime/framework/CompositeStage.java | 4 ++--
src/main/java/teetime/framework/RunnableConsumerStage.java | 2 +-
src/main/java/teetime/framework/RunnableProducerStage.java | 2 +-
src/main/java/teetime/framework/Stage.java | 2 +-
src/main/java/teetime/stage/basic/AbstractTrigger.java | 2 +-
src/main/java/teetime/stage/basic/Delay.java | 2 +-
src/main/java/teetime/stage/basic/merger/Merger.java | 2 +-
src/test/java/teetime/stage/basic/merger/MergerTest.java | 6 +++---
11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/teetime/framework/AbstractConsumerStage.java b/src/main/java/teetime/framework/AbstractConsumerStage.java
index 73286f9d..6c0db64a 100644
--- a/src/main/java/teetime/framework/AbstractConsumerStage.java
+++ b/src/main/java/teetime/framework/AbstractConsumerStage.java
@@ -24,7 +24,7 @@ public abstract class AbstractConsumerStage<I> extends AbstractStage {
}
@Override
- public final void executeWithPorts() {
+ public final void executeStage() {
final I element = this.getInputPort().receive();
if (null == element) {
returnNoElement();
diff --git a/src/main/java/teetime/framework/AbstractIntraThreadPipe.java b/src/main/java/teetime/framework/AbstractIntraThreadPipe.java
index bde2cba9..4efd0cbf 100644
--- a/src/main/java/teetime/framework/AbstractIntraThreadPipe.java
+++ b/src/main/java/teetime/framework/AbstractIntraThreadPipe.java
@@ -33,7 +33,7 @@ public abstract class AbstractIntraThreadPipe extends AbstractPipe {
@Override
public final void reportNewElement() {
- this.cachedTargetStage.executeWithPorts();
+ this.cachedTargetStage.executeStage();
}
@Override
diff --git a/src/main/java/teetime/framework/AbstractProducerStage.java b/src/main/java/teetime/framework/AbstractProducerStage.java
index b3263ad5..ac7c1cfb 100644
--- a/src/main/java/teetime/framework/AbstractProducerStage.java
+++ b/src/main/java/teetime/framework/AbstractProducerStage.java
@@ -33,7 +33,7 @@ public abstract class AbstractProducerStage<O> extends AbstractStage {
}
@Override
- public void executeWithPorts() {
+ public void executeStage() {
this.execute();
}
diff --git a/src/main/java/teetime/framework/CompositeStage.java b/src/main/java/teetime/framework/CompositeStage.java
index 190b64ce..ea50ced3 100644
--- a/src/main/java/teetime/framework/CompositeStage.java
+++ b/src/main/java/teetime/framework/CompositeStage.java
@@ -43,8 +43,8 @@ public abstract class CompositeStage extends Stage {
protected abstract Collection<? extends Stage> getLastStages();
@Override
- protected final void executeWithPorts() {
- getFirstStage().executeWithPorts();
+ protected final void executeStage() {
+ getFirstStage().executeStage();
}
@Override
diff --git a/src/main/java/teetime/framework/RunnableConsumerStage.java b/src/main/java/teetime/framework/RunnableConsumerStage.java
index af0b6c4a..79649142 100644
--- a/src/main/java/teetime/framework/RunnableConsumerStage.java
+++ b/src/main/java/teetime/framework/RunnableConsumerStage.java
@@ -58,7 +58,7 @@ final class RunnableConsumerStage extends AbstractRunnableStage {
@Override
protected void executeStage(final Stage stage) {
try {
- stage.executeWithPorts();
+ stage.executeStage();
} catch (NotEnoughInputException e) {
checkForTerminationSignal(stage);
}
diff --git a/src/main/java/teetime/framework/RunnableProducerStage.java b/src/main/java/teetime/framework/RunnableProducerStage.java
index 5cb6a047..b809a5cf 100644
--- a/src/main/java/teetime/framework/RunnableProducerStage.java
+++ b/src/main/java/teetime/framework/RunnableProducerStage.java
@@ -32,7 +32,7 @@ public final class RunnableProducerStage extends AbstractRunnableStage {
@Override
protected void executeStage(final Stage stage) {
- stage.executeWithPorts();
+ stage.executeStage();
}
@Override
diff --git a/src/main/java/teetime/framework/Stage.java b/src/main/java/teetime/framework/Stage.java
index e971d54b..120db4ac 100644
--- a/src/main/java/teetime/framework/Stage.java
+++ b/src/main/java/teetime/framework/Stage.java
@@ -96,7 +96,7 @@ public abstract class Stage {
*/
public abstract void validateOutputPorts(List<InvalidPortConnection> invalidPortConnections);
- protected abstract void executeWithPorts();
+ protected abstract void executeStage();
protected abstract void onSignal(ISignal signal, InputPort<?> inputPort);
diff --git a/src/main/java/teetime/stage/basic/AbstractTrigger.java b/src/main/java/teetime/stage/basic/AbstractTrigger.java
index 4bdf6565..2d2d1c96 100644
--- a/src/main/java/teetime/stage/basic/AbstractTrigger.java
+++ b/src/main/java/teetime/stage/basic/AbstractTrigger.java
@@ -32,7 +32,7 @@ abstract class AbstractTrigger<I, T, O> extends AbstractStage {
@SuppressWarnings("PMD.EmptyMethodInAbstractClassShouldBeAbstract")
// disabled while in development
@Override
- protected void executeWithPorts() {
+ protected void executeStage() {
// TODO Auto-generated method stub
}
diff --git a/src/main/java/teetime/stage/basic/Delay.java b/src/main/java/teetime/stage/basic/Delay.java
index 5283896e..976bb7e6 100644
--- a/src/main/java/teetime/stage/basic/Delay.java
+++ b/src/main/java/teetime/stage/basic/Delay.java
@@ -31,7 +31,7 @@ public final class Delay<T> extends AbstractStage {
private final List<T> bufferedElements = new LinkedList<T>();
@Override
- public void executeWithPorts() {
+ public void executeStage() {
T element = inputPort.receive();
if (null != element) {
bufferedElements.add(element);
diff --git a/src/main/java/teetime/stage/basic/merger/Merger.java b/src/main/java/teetime/stage/basic/merger/Merger.java
index e09c1072..f162b2d5 100644
--- a/src/main/java/teetime/stage/basic/merger/Merger.java
+++ b/src/main/java/teetime/stage/basic/merger/Merger.java
@@ -54,7 +54,7 @@ public final class Merger<T> extends AbstractStage {
}
@Override
- public void executeWithPorts() {
+ public void executeStage() {
final T token = this.strategy.getNextInput(this);
if (token == null) {
returnNoElement();
diff --git a/src/test/java/teetime/stage/basic/merger/MergerTest.java b/src/test/java/teetime/stage/basic/merger/MergerTest.java
index bfbba4b2..234537e0 100644
--- a/src/test/java/teetime/stage/basic/merger/MergerTest.java
+++ b/src/test/java/teetime/stage/basic/merger/MergerTest.java
@@ -57,8 +57,8 @@ public class MergerTest {
public void roundRobinShouldWork() {
mergerUnderTest.setStrategy(new RoundRobinStrategy());
- this.fstProducer.executeWithPorts();
- this.sndProducer.executeWithPorts();
+ this.fstProducer.executeStage();
+ this.sndProducer.executeStage();
assertThat(this.collector.getElements(), contains(1, 2, 3, 4, 5, 6));
}
@@ -67,7 +67,7 @@ public class MergerTest {
public void roundRobinWithSingleProducerShouldWork() {
mergerUnderTest.setStrategy(new RoundRobinStrategy());
- this.fstProducer.executeWithPorts();
+ this.fstProducer.executeStage();
assertThat(this.collector.getElements(), contains(1, 2, 3));
}
--
GitLab