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

Merge branch 'executeStage' into 'master'

Execute stage

#120

See merge request !32
parents c1418452 e2e936cb
No related branches found
No related tags found
No related merge requests found
Showing
with 14 additions and 14 deletions
......@@ -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();
......
......@@ -33,7 +33,7 @@ public abstract class AbstractIntraThreadPipe extends AbstractPipe {
@Override
public final void reportNewElement() {
this.cachedTargetStage.executeWithPorts();
this.cachedTargetStage.executeStage();
}
@Override
......
......@@ -33,7 +33,7 @@ public abstract class AbstractProducerStage<O> extends AbstractStage {
}
@Override
public void executeWithPorts() {
public void executeStage() {
this.execute();
}
......
......@@ -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
......
......@@ -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);
}
......
......@@ -32,7 +32,7 @@ public final class RunnableProducerStage extends AbstractRunnableStage {
@Override
protected void executeStage(final Stage stage) {
stage.executeWithPorts();
stage.executeStage();
}
@Override
......
......@@ -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);
......
......@@ -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
}
......
......@@ -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);
......
......@@ -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();
......
......@@ -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));
}
......
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