From 3e74fe4a9351496b848c8cd6902f88904c29a6ca Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Fri, 21 Aug 2015 14:41:15 +0200
Subject: [PATCH] renamed method
---
.../java/teetime/framework/AbstractCompositeStage.java | 8 ++++----
src/main/java/teetime/framework/Configuration.java | 4 ++--
src/main/java/teetime/framework/ConfigurationContext.java | 2 +-
src/main/java/teetime/framework/ThreadService.java | 2 +-
src/main/java/teetime/framework/test/StageTester.java | 2 +-
.../examples/wordcounter/WordCounterConfiguration.java | 6 +++---
.../teetime/framework/AbstractCompositeStageTest.java | 4 ++--
src/test/java/teetime/framework/ExecutionTest.java | 6 +++---
.../framework/RunnableConsumerStageTestConfiguration.java | 4 ++--
src/test/java/teetime/framework/TerminationTest.java | 4 ++--
src/test/java/teetime/framework/TraverserTest.java | 4 ++--
.../java/teetime/framework/WaitStrategyConfiguration.java | 6 +++---
.../teetime/framework/YieldStrategyConfiguration.java | 4 ++--
.../exceptionHandling/ExceptionTestConfiguration.java | 4 ++--
.../basic/distributor/dynamic/DynamicDistributorTest.java | 4 ++--
.../stage/basic/merger/dynamic/DynamicMergerTest.java | 2 +-
16 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/main/java/teetime/framework/AbstractCompositeStage.java b/src/main/java/teetime/framework/AbstractCompositeStage.java
index 674c4d57..ab55c4b3 100644
--- a/src/main/java/teetime/framework/AbstractCompositeStage.java
+++ b/src/main/java/teetime/framework/AbstractCompositeStage.java
@@ -38,8 +38,8 @@ public abstract class AbstractCompositeStage {
* @param stage
* A arbitrary stage, which will be added to the configuration and executed in a thread.
*/
- protected final void addThreadableStage(final Stage stage) {
- this.addThreadableStage(stage, stage.getId());
+ protected final void declareActive(final Stage stage) {
+ this.declareActive(stage, stage.getId());
}
/**
@@ -50,7 +50,7 @@ public abstract class AbstractCompositeStage {
* @param threadName
* A string which can be used for debugging.
*/
- protected void addThreadableStage(final Stage stage, final String threadName) {
+ protected void declareActive(final Stage stage, final String threadName) {
AbstractRunnableStage runnable = AbstractRunnableStage.create(stage);
Thread newThread = new TeeTimeThread(runnable, threadName);
stage.setOwningThread(newThread);
@@ -89,7 +89,7 @@ public abstract class AbstractCompositeStage {
private final <T> void connectPortsInternal(final OutputPort<? extends T> sourcePort, final InputPort<T> targetPort, final int capacity) {
if (sourcePort.getOwningStage().getInputPorts().size() == 0) {
if (sourcePort.getOwningStage().getOwningThread() == null) {
- addThreadableStage(sourcePort.getOwningStage(), sourcePort.getOwningStage().getId());
+ declareActive(sourcePort.getOwningStage(), sourcePort.getOwningStage().getId());
}
}
diff --git a/src/main/java/teetime/framework/Configuration.java b/src/main/java/teetime/framework/Configuration.java
index 97e9c344..2c10587f 100644
--- a/src/main/java/teetime/framework/Configuration.java
+++ b/src/main/java/teetime/framework/Configuration.java
@@ -56,9 +56,9 @@ public abstract class Configuration extends AbstractCompositeStage {
}
@Override
- protected void addThreadableStage(final Stage stage, final String threadName) {
+ protected void declareActive(final Stage stage, final String threadName) {
startStage = stage; // memorize an arbitrary stage as starting point for traversing
- super.addThreadableStage(stage, threadName);
+ super.declareActive(stage, threadName);
}
@Override
diff --git a/src/main/java/teetime/framework/ConfigurationContext.java b/src/main/java/teetime/framework/ConfigurationContext.java
index 8c356665..054821bb 100644
--- a/src/main/java/teetime/framework/ConfigurationContext.java
+++ b/src/main/java/teetime/framework/ConfigurationContext.java
@@ -19,7 +19,7 @@ import java.util.Set;
/**
* Represents a context that is used by a configuration and composite stages to connect ports, for example.
- * Stages can be added by executing {@link #addThreadableStage(Stage)}.
+ * Stages can be added by executing {@link #declareActive(Stage)}.
*
* @since 2.0
*/
diff --git a/src/main/java/teetime/framework/ThreadService.java b/src/main/java/teetime/framework/ThreadService.java
index 4528ed5c..4561e47e 100644
--- a/src/main/java/teetime/framework/ThreadService.java
+++ b/src/main/java/teetime/framework/ThreadService.java
@@ -61,7 +61,7 @@ class ThreadService extends AbstractService<ThreadService> {
}
void startStageAtRuntime(final Stage newStage) {
- configuration.addThreadableStage(newStage);
+ configuration.declareActive(newStage);
Set<Stage> newThreadableStages = initialize(newStage);
startThreads(newThreadableStages);
diff --git a/src/main/java/teetime/framework/test/StageTester.java b/src/main/java/teetime/framework/test/StageTester.java
index fd014645..eed58f55 100644
--- a/src/main/java/teetime/framework/test/StageTester.java
+++ b/src/main/java/teetime/framework/test/StageTester.java
@@ -91,7 +91,7 @@ public final class StageTester {
connectPorts(producer.getOutputPort(), inputHolder.getPort());
}
- addThreadableStage(stage);
+ declareActive(stage);
for (OutputHolder<?> outputHolder : outputHolders) {
final CollectorSink<Object> sink = new CollectorSink<Object>(outputHolder.getOutputElements());
diff --git a/src/test/java/teetime/examples/wordcounter/WordCounterConfiguration.java b/src/test/java/teetime/examples/wordcounter/WordCounterConfiguration.java
index a214fadc..529a7286 100644
--- a/src/test/java/teetime/examples/wordcounter/WordCounterConfiguration.java
+++ b/src/test/java/teetime/examples/wordcounter/WordCounterConfiguration.java
@@ -83,7 +83,7 @@ public class WordCounterConfiguration extends Configuration {
connectPorts(distributor.getNewOutputPort(), threadableStage.getInputPort(), 1000);
connectPorts(wc.getOutputPort(), merger.getNewInputPort());
// Add WordCounter as a threadable stage, so it runs in its own thread
- addThreadableStage(threadableStage.getInputPort().getOwningStage());
+ declareActive(threadableStage.getInputPort().getOwningStage());
distributorPorts.add(threadableStage.getInputPort());
mergerPorts.add(wc.getOutputPort());
@@ -95,8 +95,8 @@ public class WordCounterConfiguration extends Configuration {
connectPorts(merger.getOutputPort(), result.getInputPort());
// Add the first and last part to the threadable stages
- addThreadableStage(init);
- addThreadableStage(merger);
+ declareActive(init);
+ declareActive(merger);
}
public MonitoringThread getMonitoringThread() {
diff --git a/src/test/java/teetime/framework/AbstractCompositeStageTest.java b/src/test/java/teetime/framework/AbstractCompositeStageTest.java
index 18784f4b..414e0f1c 100644
--- a/src/test/java/teetime/framework/AbstractCompositeStageTest.java
+++ b/src/test/java/teetime/framework/AbstractCompositeStageTest.java
@@ -52,7 +52,7 @@ public class AbstractCompositeStageTest {
private final Counter firstCounter = new Counter();
public TestCompositeOneStage() {
- addThreadableStage(firstCounter);
+ declareActive(firstCounter);
}
}
@@ -63,7 +63,7 @@ public class AbstractCompositeStageTest {
private final Counter secondCounter = new Counter();
public TestCompositeTwoStage() {
- addThreadableStage(firstCounter);
+ declareActive(firstCounter);
connectPorts(firstCounter.getOutputPort(), secondCounter.getInputPort());
}
diff --git a/src/test/java/teetime/framework/ExecutionTest.java b/src/test/java/teetime/framework/ExecutionTest.java
index c256f27b..dcd44505 100644
--- a/src/test/java/teetime/framework/ExecutionTest.java
+++ b/src/test/java/teetime/framework/ExecutionTest.java
@@ -118,7 +118,7 @@ public class ExecutionTest {
public AnalysisTestConfig(final boolean inter) {
connectPorts(init.getOutputPort(), sink.getInputPort());
if (inter) {
- addThreadableStage(sink);
+ declareActive(sink);
}
}
}
@@ -143,7 +143,7 @@ public class ExecutionTest {
connectPorts(init.getOutputPort(), iof.getInputPort());
connectPorts(iof.getMatchedOutputPort(), sink.getInputPort());
connectPorts(init.createOutputPort(), sink.createInputPort());
- addThreadableStage(iof);
+ declareActive(iof);
}
}
@@ -191,7 +191,7 @@ public class ExecutionTest {
stageWithNamedThread = new InitialElementProducer<Object>(new Object());
Sink<Object> sink = new Sink<Object>();
- addThreadableStage(stageWithNamedThread, "TestName");
+ declareActive(stageWithNamedThread, "TestName");
connectPorts(stageWithNamedThread.getOutputPort(), sink.getInputPort());
}
diff --git a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
index 3f611792..3086ed51 100644
--- a/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
+++ b/src/test/java/teetime/framework/RunnableConsumerStageTestConfiguration.java
@@ -30,11 +30,11 @@ public class RunnableConsumerStageTestConfiguration extends Configuration {
public RunnableConsumerStageTestConfiguration(final Integer... inputElements) {
InitialElementProducer<Integer> producer = new InitialElementProducer<Integer>(inputElements);
if (inputElements.length > 0) {
- addThreadableStage(producer);
+ declareActive(producer);
}
CollectorSink<Integer> collectorSink = new CollectorSink<Integer>(collectedElements);
- addThreadableStage(collectorSink);
+ declareActive(collectorSink);
// Can not use createPorts, as the if condition above will lead to an exception
new SpScPipeFactory().create(producer.getOutputPort(), collectorSink.getInputPort());
diff --git a/src/test/java/teetime/framework/TerminationTest.java b/src/test/java/teetime/framework/TerminationTest.java
index ac876760..452cdbbe 100644
--- a/src/test/java/teetime/framework/TerminationTest.java
+++ b/src/test/java/teetime/framework/TerminationTest.java
@@ -55,11 +55,11 @@ public class TerminationTest {
connectPorts(init.getOutputPort(), firstProp.getInputPort());
connectPorts(firstProp.getOutputPort(), sinkStage.getInputPort(), capacity);
connectPorts(sinkStage.getOutputPort(), finalProp.getInputPort());
- addThreadableStage(sinkStage);
+ declareActive(sinkStage);
} else {
Sink<Integer> sink = new Sink<Integer>();
connectPorts(init.getOutputPort(), sink.getInputPort(), capacity);
- addThreadableStage(sink);
+ declareActive(sink);
}
}
diff --git a/src/test/java/teetime/framework/TraverserTest.java b/src/test/java/teetime/framework/TraverserTest.java
index 27878602..aeae76c9 100644
--- a/src/test/java/teetime/framework/TraverserTest.java
+++ b/src/test/java/teetime/framework/TraverserTest.java
@@ -86,14 +86,14 @@ public class TraverserTest {
connectPorts(distributor.getNewOutputPort(), wc.getInputPort());
connectPorts(wc.getOutputPort(), merger.getNewInputPort());
// Add WordCounter as a threadable stage, so it runs in its own thread
- addThreadableStage(wc.getInputPort().getOwningStage());
+ declareActive(wc.getInputPort().getOwningStage());
}
// Connect the stages of the last part
connectPorts(merger.getOutputPort(), result.getInputPort());
// Add the first and last part to the threadable stages
- addThreadableStage(merger);
+ declareActive(merger);
}
}
diff --git a/src/test/java/teetime/framework/WaitStrategyConfiguration.java b/src/test/java/teetime/framework/WaitStrategyConfiguration.java
index 02730dde..8003cb7d 100644
--- a/src/test/java/teetime/framework/WaitStrategyConfiguration.java
+++ b/src/test/java/teetime/framework/WaitStrategyConfiguration.java
@@ -29,13 +29,13 @@ class WaitStrategyConfiguration extends Configuration {
public WaitStrategyConfiguration(final long initialDelayInMs, final Object... elements) {
Stage producer = buildProducer(elements);
- addThreadableStage(producer);
+ declareActive(producer);
Stage consumer = buildConsumer(delay);
- addThreadableStage(consumer);
+ declareActive(consumer);
Clock clock = buildClock(initialDelayInMs, delay);
- addThreadableStage(clock);
+ declareActive(clock);
}
private Clock buildClock(final long initialDelayInMs, final Delay<Object> delay) {
diff --git a/src/test/java/teetime/framework/YieldStrategyConfiguration.java b/src/test/java/teetime/framework/YieldStrategyConfiguration.java
index 46af8c04..0cc890ea 100644
--- a/src/test/java/teetime/framework/YieldStrategyConfiguration.java
+++ b/src/test/java/teetime/framework/YieldStrategyConfiguration.java
@@ -26,10 +26,10 @@ class YieldStrategyConfiguration extends Configuration {
public YieldStrategyConfiguration(final Object... elements) {
InitialElementProducer<Object> producer = buildProducer(elements);
- addThreadableStage(producer);
+ declareActive(producer);
Stage consumer = buildConsumer(producer);
- addThreadableStage(consumer);
+ declareActive(consumer);
}
private InitialElementProducer<Object> buildProducer(final Object... elements) {
diff --git a/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java b/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
index 9229eb75..54de3f41 100644
--- a/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
+++ b/src/test/java/teetime/framework/exceptionHandling/ExceptionTestConfiguration.java
@@ -33,8 +33,8 @@ public class ExceptionTestConfiguration extends Configuration {
connectPorts(first.getOutputPort(), second.getInputPort());
// this.addThreadableStage(new ExceptionTestStage());
- this.addThreadableStage(second);
- this.addThreadableStage(third);
+ this.declareActive(second);
+ this.declareActive(third);
}
}
diff --git a/src/test/java/teetime/stage/basic/distributor/dynamic/DynamicDistributorTest.java b/src/test/java/teetime/stage/basic/distributor/dynamic/DynamicDistributorTest.java
index 26a61ce6..553c5345 100644
--- a/src/test/java/teetime/stage/basic/distributor/dynamic/DynamicDistributorTest.java
+++ b/src/test/java/teetime/stage/basic/distributor/dynamic/DynamicDistributorTest.java
@@ -137,8 +137,8 @@ public class DynamicDistributorTest {
connectPorts(initialElementProducer.getOutputPort(), distributor.getInputPort());
connectPorts(distributor.getNewOutputPort(), collectorSink.getInputPort());
- addThreadableStage(distributor);
- addThreadableStage(collectorSink);
+ declareActive(distributor);
+ declareActive(collectorSink);
for (PortAction<DynamicDistributor<T>> a : inputActions) {
distributor.addPortActionRequest(a);
diff --git a/src/test/java/teetime/stage/basic/merger/dynamic/DynamicMergerTest.java b/src/test/java/teetime/stage/basic/merger/dynamic/DynamicMergerTest.java
index 5d8cb948..0b5187a1 100644
--- a/src/test/java/teetime/stage/basic/merger/dynamic/DynamicMergerTest.java
+++ b/src/test/java/teetime/stage/basic/merger/dynamic/DynamicMergerTest.java
@@ -118,7 +118,7 @@ public class DynamicMergerTest {
connectPorts(initialElementProducer.getOutputPort(), merger.getNewInputPort());
connectPorts(merger.getOutputPort(), collectorSink.getInputPort());
- addThreadableStage(merger);
+ declareActive(merger);
for (PortAction<DynamicMerger<T>> a : inputActions) {
boolean added = merger.addPortActionRequest(a);
--
GitLab