From 49f1103dbe9350bf7317ae86d306863daa6a2408 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Mon, 27 Jul 2015 13:13:06 +0200
Subject: [PATCH] visibility change and improved code style
---
.../teetime/framework/AbstractService.java | 2 +-
.../framework/ConfigurationContext.java | 1 -
src/main/java/teetime/framework/Execution.java | 18 +++++++++---------
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/teetime/framework/AbstractService.java b/src/main/java/teetime/framework/AbstractService.java
index fe716ca1..029a6ef6 100644
--- a/src/main/java/teetime/framework/AbstractService.java
+++ b/src/main/java/teetime/framework/AbstractService.java
@@ -10,7 +10,7 @@ package teetime.framework;
*
* @since 2.0
*/
-public abstract class AbstractService<T> {
+abstract class AbstractService<T> {
abstract void onInitialize();
diff --git a/src/main/java/teetime/framework/ConfigurationContext.java b/src/main/java/teetime/framework/ConfigurationContext.java
index c55e3b22..20b42785 100644
--- a/src/main/java/teetime/framework/ConfigurationContext.java
+++ b/src/main/java/teetime/framework/ConfigurationContext.java
@@ -74,7 +74,6 @@ final class ConfigurationContext {
new InstantiationPipe(sourcePort, targetPort, capacity);
}
- // FIXME: Rename method
final void addChildContext(final Stage stage) {
if (!stage.owningContext.equals(EMPTY_CONTEXT)) {
if (stage.owningContext != this) { // Performance
diff --git a/src/main/java/teetime/framework/Execution.java b/src/main/java/teetime/framework/Execution.java
index 007ec6fa..aab80537 100644
--- a/src/main/java/teetime/framework/Execution.java
+++ b/src/main/java/teetime/framework/Execution.java
@@ -43,7 +43,7 @@ public final class Execution<T extends Configuration> {
private final T configuration;
- private final boolean executionInterrupted = false;
+ private final ConfigurationContext configurationContext;
/**
* Creates a new {@link Execution} that skips validating the port connections and uses the default listener.
@@ -67,6 +67,7 @@ public final class Execution<T extends Configuration> {
*/
public Execution(final T configuration, final boolean validationEnabled) {
this.configuration = configuration;
+ this.configurationContext = configuration.getContext();
if (configuration.isExecuted()) {
throw new IllegalStateException("Configuration was already executed");
}
@@ -79,7 +80,7 @@ public final class Execution<T extends Configuration> {
// BETTER validate concurrently
private void validateStages() {
- final Map<Stage, String> threadableStageJobs = this.configuration.getContext().getThreadableStages();
+ final Map<Stage, String> threadableStageJobs = configurationContext.getThreadableStages();
for (Stage stage : threadableStageJobs.keySet()) {
// // portConnectionValidator.validate(stage);
// }
@@ -97,11 +98,11 @@ public final class Execution<T extends Configuration> {
*
*/
private final void init() {
- ExecutionInstantiation executionInstantiation = new ExecutionInstantiation(configuration.getContext());
+ ExecutionInstantiation executionInstantiation = new ExecutionInstantiation(configurationContext);
executionInstantiation.instantiatePipes();
- getConfiguration().getContext().finalizeContext();
- getConfiguration().getContext().initializeServices();
+ configurationContext.finalizeContext();
+ configurationContext.initializeServices();
}
/**
@@ -113,13 +114,12 @@ public final class Execution<T extends Configuration> {
* @since 2.0
*/
public void waitForTermination() {
- getConfiguration().getContext().waitForConfigurationToTerminate();
- ;
+ configurationContext.waitForConfigurationToTerminate();
}
// TODO: implement
private void abortEventually() {
- getConfiguration().getContext().abortConfigurationRun();
+ configurationContext.abortConfigurationRun();
waitForTermination();
}
@@ -143,7 +143,7 @@ public final class Execution<T extends Configuration> {
* @since 2.0
*/
public void executeNonBlocking() {
- configuration.getContext().executeConfiguration();
+ configurationContext.executeConfiguration();
}
/**
--
GitLab