diff --git a/src/main/java/teetime/framework/AbstractConsumerStage.java b/src/main/java/teetime/framework/AbstractConsumerStage.java index 73286f9d0861608a0e7e981d2a5c2986160cfd87..6c0db64a1e420d3e2779c46d5426c0bfb47ae2be 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 bde2cba9ae7c03ef996f6c05901b55d027f2a6b4..4efd0cbfd14ab0fb53f3f74053c0d4400dbc10f2 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 b3263ad547ce9a917ab57396a4fec14565e7e939..ac7c1cfba7586a406624c3a0147dd8db9eabe275 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 190b64ce685f4f1448301c9ee79c952399d33e23..ea50ced3f6bf54b612b1fbe1fedf0d57e6deea33 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 af0b6c4a62e8558c124b62cd621f93944b611efd..7964914242c4fcc6fac05c6958dc97b76dcd7439 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 5cb6a047f928876c769874f0c6cfcc75d5d2bfc0..b809a5cf75198ae18a9e05fdf765843e3014cc21 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 e971d54b705325a8a61126533dba0d38cdf8c429..120db4ac8697be43aa6561fd7da67516b4316338 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 4bdf656530c3aa78db6ee3b24c780856d24b18ff..2d2d1c960cceea0111ecbc64f1fb7fae83d4a2cc 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 5283896e4eb69b3a7375f0a87a6f3d07f68a2dcf..976bb7e69a19a0fa22a0849f8025632ec30f65fa 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 e09c10720b9cbcf95c290e319a61d30d5ed1f188..f162b2d598e0d96113798e0bb916b1d61b14cb20 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 bfbba4b2f377e1c30dee102a6f139dc22c804ebd..234537e01dca9f28c400ed90c2043d6085013f45 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)); }