From 624a9de14d57c9d9674fabeb8eb14e00afc96702 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Thu, 18 Jun 2015 09:32:10 +0200
Subject: [PATCH] minor refactoring
---
.../java/teetime/framework/AbstractStage.java | 37 ++++++++++---------
.../basic/distributor/DistributorTest.java | 2 +-
2 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/main/java/teetime/framework/AbstractStage.java b/src/main/java/teetime/framework/AbstractStage.java
index 88bed605..a880c185 100644
--- a/src/main/java/teetime/framework/AbstractStage.java
+++ b/src/main/java/teetime/framework/AbstractStage.java
@@ -90,22 +90,7 @@ public abstract class AbstractStage extends Stage {
@Override
public void onInitializing() throws Exception {
this.connectUnconnectedOutputPorts();
- currentState = StageState.INITIALIZED;
- logger.trace("Initialized.");
- }
-
- @Override
- public void onValidating(final List<InvalidPortConnection> invalidPortConnections) {
- this.validateOutputPorts(invalidPortConnections);
- currentState = StageState.VALIDATED;
- logger.trace("Validated.");
- }
-
- @SuppressWarnings("PMD.SignatureDeclareThrowsException")
- @Override
- public void onStarting() throws Exception {
- currentState = StageState.STARTED;
- logger.trace("Started.");
+ changeState(StageState.INITIALIZED);
}
@SuppressWarnings("PMD.DataflowAnomalyAnalysis")
@@ -120,11 +105,27 @@ public abstract class AbstractStage extends Stage {
}
}
+ private void changeState(final StageState newState) {
+ currentState = newState;
+ logger.trace(newState.toString());
+ }
+
+ @Override
+ public void onValidating(final List<InvalidPortConnection> invalidPortConnections) {
+ this.validateOutputPorts(invalidPortConnections);
+ changeState(StageState.VALIDATED);
+ }
+
+ @SuppressWarnings("PMD.SignatureDeclareThrowsException")
+ @Override
+ public void onStarting() throws Exception {
+ changeState(StageState.STARTED);
+ }
+
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
@Override
public void onTerminating() throws Exception {
- currentState = StageState.TERMINATED;
- logger.trace("Terminated.");
+ changeState(StageState.TERMINATED);
}
/**
diff --git a/src/test/java/teetime/stage/basic/distributor/DistributorTest.java b/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
index 3d637d25..5e9381d8 100644
--- a/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
+++ b/src/test/java/teetime/stage/basic/distributor/DistributorTest.java
@@ -131,7 +131,7 @@ public class DistributorTest {
}
@Test
- public void cloneForSimpleBeanShoulWork() throws Exception {
+ public void cloneForSimpleBeanShouldWork() throws Exception {
final Distributor<SimpleBean> distributor = new Distributor<SimpleBean>(new CloneStrategy());
final List<SimpleBean> results = new ArrayList<SimpleBean>();
final SimpleBean originalBean = new SimpleBean(42);
--
GitLab