From ae9bf7296bead07485464f4c241860af39a66005 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <ntd@informatik.uni-kiel.de>
Date: Fri, 27 Mar 2015 13:13:22 +0100
Subject: [PATCH] renamed the exceptionhandler
---
.../java/teetime/framework/AbstractRunnableStage.java | 8 ++++----
src/main/java/teetime/framework/Analysis.java | 10 +++++-----
.../java/teetime/framework/RunnableConsumerStage.java | 6 +++---
.../java/teetime/framework/RunnableProducerStage.java | 4 ++--
...Handler.java => AbstractStageExceptionHandler.java} | 4 ++--
.../exceptionHandling/IgnoringStageListener.java | 2 +-
.../exceptionHandling/LoggingStageListener.java | 2 +-
.../exceptionHandling/TerminatingStageListener.java | 2 +-
src/site/markdown/wiki | 2 +-
.../framework/exceptionHandling/TestListener.java | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
rename src/main/java/teetime/framework/exceptionHandling/{StageExceptionHandler.java => AbstractStageExceptionHandler.java} (91%)
diff --git a/src/main/java/teetime/framework/AbstractRunnableStage.java b/src/main/java/teetime/framework/AbstractRunnableStage.java
index 3e496643..8b20fa8c 100644
--- a/src/main/java/teetime/framework/AbstractRunnableStage.java
+++ b/src/main/java/teetime/framework/AbstractRunnableStage.java
@@ -4,13 +4,13 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import teetime.framework.exceptionHandling.StageException;
-import teetime.framework.exceptionHandling.StageExceptionHandler;
-import teetime.framework.exceptionHandling.StageExceptionHandler.FurtherExecution;
+import teetime.framework.exceptionHandling.AbstractStageExceptionHandler;
+import teetime.framework.exceptionHandling.AbstractStageExceptionHandler.FurtherExecution;
import teetime.framework.signal.TerminatingSignal;
abstract class AbstractRunnableStage implements Runnable {
- private final StageExceptionHandler exceptionHandler;
+ private final AbstractStageExceptionHandler exceptionHandler;
private static final String TERMINATING_THREAD_DUE_TO_THE_FOLLOWING_EXCEPTION = "Terminating thread due to the following exception: ";
@@ -18,7 +18,7 @@ abstract class AbstractRunnableStage implements Runnable {
@SuppressWarnings("PMD.LoggerIsNotStaticFinal")
protected final Logger logger;
- public AbstractRunnableStage(final Stage stage, final StageExceptionHandler exceptionHandler) {
+ public AbstractRunnableStage(final Stage stage, final AbstractStageExceptionHandler exceptionHandler) {
this.stage = stage;
this.logger = LoggerFactory.getLogger(stage.getClass());
this.exceptionHandler = exceptionHandler;
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index ffb48663..9238dce9 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import teetime.framework.exceptionHandling.IgnoringStageListener;
-import teetime.framework.exceptionHandling.StageExceptionHandler;
+import teetime.framework.exceptionHandling.AbstractStageExceptionHandler;
import teetime.framework.signal.ValidatingSignal;
import teetime.framework.validation.AnalysisNotValidException;
import teetime.util.Pair;
@@ -43,7 +43,7 @@ public final class Analysis implements UncaughtExceptionHandler {
private final AnalysisConfiguration configuration;
- private final Class<? extends teetime.framework.exceptionHandling.StageExceptionHandler> listener;
+ private final Class<? extends teetime.framework.exceptionHandling.AbstractStageExceptionHandler> listener;
private boolean executionInterrupted = false;
@@ -79,11 +79,11 @@ public final class Analysis implements UncaughtExceptionHandler {
* @param listener
* specific listener for the exception handling
*/
- public Analysis(final AnalysisConfiguration configuration, final Class<? extends StageExceptionHandler> listener) {
+ public Analysis(final AnalysisConfiguration configuration, final Class<? extends AbstractStageExceptionHandler> listener) {
this(configuration, false, listener);
}
- public Analysis(final AnalysisConfiguration configuration, final boolean validationEnabled, final Class<? extends StageExceptionHandler> listener) {
+ public Analysis(final AnalysisConfiguration configuration, final boolean validationEnabled, final Class<? extends AbstractStageExceptionHandler> listener) {
this.configuration = configuration;
this.listener = listener;
if (validationEnabled) {
@@ -124,7 +124,7 @@ public final class Analysis implements UncaughtExceptionHandler {
throw new IllegalStateException("No stage was added using the addThreadableStage(..) method. Add at least one stage.");
}
for (Stage stage : threadableStageJobs) {
- StageExceptionHandler newListener;
+ AbstractStageExceptionHandler newListener;
try {
newListener = listener.newInstance();
} catch (InstantiationException e) {
diff --git a/src/main/java/teetime/framework/RunnableConsumerStage.java b/src/main/java/teetime/framework/RunnableConsumerStage.java
index 9f7ac0c8..9c37dde7 100644
--- a/src/main/java/teetime/framework/RunnableConsumerStage.java
+++ b/src/main/java/teetime/framework/RunnableConsumerStage.java
@@ -15,7 +15,7 @@
*/
package teetime.framework;
-import teetime.framework.exceptionHandling.StageExceptionHandler;
+import teetime.framework.exceptionHandling.AbstractStageExceptionHandler;
import teetime.framework.idle.IdleStrategy;
import teetime.framework.idle.YieldStrategy;
import teetime.framework.signal.ISignal;
@@ -32,11 +32,11 @@ final class RunnableConsumerStage extends AbstractRunnableStage {
* @param stage
* to execute within an own thread
*/
- public RunnableConsumerStage(final Stage stage, final StageExceptionHandler exceptionListener) {
+ public RunnableConsumerStage(final Stage stage, final AbstractStageExceptionHandler exceptionListener) {
this(stage, new YieldStrategy(), exceptionListener);
}
- public RunnableConsumerStage(final Stage stage, final IdleStrategy idleStrategy, final StageExceptionHandler exceptionListener) {
+ public RunnableConsumerStage(final Stage stage, final IdleStrategy idleStrategy, final AbstractStageExceptionHandler exceptionListener) {
super(stage, exceptionListener);
this.inputPorts = stage.getInputPorts(); // FIXME should getInputPorts() really be defined in Stage?
}
diff --git a/src/main/java/teetime/framework/RunnableProducerStage.java b/src/main/java/teetime/framework/RunnableProducerStage.java
index 8feebfeb..fc4c8a54 100644
--- a/src/main/java/teetime/framework/RunnableProducerStage.java
+++ b/src/main/java/teetime/framework/RunnableProducerStage.java
@@ -15,13 +15,13 @@
*/
package teetime.framework;
-import teetime.framework.exceptionHandling.StageExceptionHandler;
+import teetime.framework.exceptionHandling.AbstractStageExceptionHandler;
import teetime.framework.signal.StartingSignal;
import teetime.framework.signal.TerminatingSignal;
public final class RunnableProducerStage extends AbstractRunnableStage {
- public RunnableProducerStage(final Stage stage, final StageExceptionHandler listener) {
+ public RunnableProducerStage(final Stage stage, final AbstractStageExceptionHandler listener) {
super(stage, listener);
}
diff --git a/src/main/java/teetime/framework/exceptionHandling/StageExceptionHandler.java b/src/main/java/teetime/framework/exceptionHandling/AbstractStageExceptionHandler.java
similarity index 91%
rename from src/main/java/teetime/framework/exceptionHandling/StageExceptionHandler.java
rename to src/main/java/teetime/framework/exceptionHandling/AbstractStageExceptionHandler.java
index c413fd2d..eac052e8 100644
--- a/src/main/java/teetime/framework/exceptionHandling/StageExceptionHandler.java
+++ b/src/main/java/teetime/framework/exceptionHandling/AbstractStageExceptionHandler.java
@@ -9,7 +9,7 @@ import teetime.framework.Stage;
* Represent a minimalistic StageExceptionListener. Listener which extend from this one, must a least implement this functionality.
* This abstract class provides a Logger {@link #logger} and a method to terminate the threads execution {@link #terminateExecution()}.
*/
-public abstract class StageExceptionHandler {
+public abstract class AbstractStageExceptionHandler {
public enum FurtherExecution {
CONTINUE, TERMINATE
@@ -20,7 +20,7 @@ public abstract class StageExceptionHandler {
*/
protected final Logger logger;
- public StageExceptionHandler() {
+ public AbstractStageExceptionHandler() {
this.logger = LoggerFactory.getLogger(this.getClass().getCanonicalName());
}
diff --git a/src/main/java/teetime/framework/exceptionHandling/IgnoringStageListener.java b/src/main/java/teetime/framework/exceptionHandling/IgnoringStageListener.java
index 0a169c8c..a815fa2a 100644
--- a/src/main/java/teetime/framework/exceptionHandling/IgnoringStageListener.java
+++ b/src/main/java/teetime/framework/exceptionHandling/IgnoringStageListener.java
@@ -2,7 +2,7 @@ package teetime.framework.exceptionHandling;
import teetime.framework.Stage;
-public class IgnoringStageListener extends StageExceptionHandler {
+public class IgnoringStageListener extends AbstractStageExceptionHandler {
public IgnoringStageListener() {
super();
diff --git a/src/main/java/teetime/framework/exceptionHandling/LoggingStageListener.java b/src/main/java/teetime/framework/exceptionHandling/LoggingStageListener.java
index 4341620c..8df9fc45 100644
--- a/src/main/java/teetime/framework/exceptionHandling/LoggingStageListener.java
+++ b/src/main/java/teetime/framework/exceptionHandling/LoggingStageListener.java
@@ -2,7 +2,7 @@ package teetime.framework.exceptionHandling;
import teetime.framework.Stage;
-public class LoggingStageListener extends StageExceptionHandler {
+public class LoggingStageListener extends AbstractStageExceptionHandler {
@Override
public FurtherExecution onStageException(final Exception e, final Stage throwingStage) {
diff --git a/src/main/java/teetime/framework/exceptionHandling/TerminatingStageListener.java b/src/main/java/teetime/framework/exceptionHandling/TerminatingStageListener.java
index 74711a0a..020e7fbe 100644
--- a/src/main/java/teetime/framework/exceptionHandling/TerminatingStageListener.java
+++ b/src/main/java/teetime/framework/exceptionHandling/TerminatingStageListener.java
@@ -2,7 +2,7 @@ package teetime.framework.exceptionHandling;
import teetime.framework.Stage;
-public class TerminatingStageListener extends StageExceptionHandler {
+public class TerminatingStageListener extends AbstractStageExceptionHandler {
@Override
public FurtherExecution onStageException(final Exception e, final Stage throwingStage) {
diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki
index 63ccbbc8..162510ff 160000
--- a/src/site/markdown/wiki
+++ b/src/site/markdown/wiki
@@ -1 +1 @@
-Subproject commit 63ccbbc87bd2c0e6599ca91502149dba3cfb99de
+Subproject commit 162510ff4d2f04011498ba6920aae0c78347c6c8
diff --git a/src/test/java/teetime/framework/exceptionHandling/TestListener.java b/src/test/java/teetime/framework/exceptionHandling/TestListener.java
index cf101682..809fbd5f 100644
--- a/src/test/java/teetime/framework/exceptionHandling/TestListener.java
+++ b/src/test/java/teetime/framework/exceptionHandling/TestListener.java
@@ -2,7 +2,7 @@ package teetime.framework.exceptionHandling;
import teetime.framework.Stage;
-public class TestListener extends StageExceptionHandler {
+public class TestListener extends AbstractStageExceptionHandler {
public static int exceptionInvoked = 0;
--
GitLab