Cleaning code.

d3scomp · Apr 19, 2017 · 881cce0 · 881cce0
1 parent d9c6496
commit 881cce0
Show file tree

Hide file tree

Showing 25 changed files with 88 additions and 661 deletions.
diff --git a/jdeeco-adaptation-plugin/build.properties b/jdeeco-adaptation-plugin/build.properties
@@ -1,3 +1,2 @@
 source.. = src/, test/
-bin.includes = META-INF/,\
-               .
+bin.includes = .
diff --git a/...daptation-plugin/src/cz/cuni/mff/d3s/deeco/annotations/NonDeterministicModeSwitching.java b/...daptation-plugin/src/cz/cuni/mff/d3s/deeco/annotations/NonDeterministicModeSwitching.java
diff --git a/...ff/d3s/deeco/annotations/processor/NonDetModeSwitchAwareAnnotationProcessorExtension.java b/...ff/d3s/deeco/annotations/processor/NonDetModeSwitchAwareAnnotationProcessorExtension.java
diff --git a/jdeeco-adaptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/AdaptationPlugin.java b/jdeeco-adaptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/AdaptationPlugin.java
@@ -38,13 +38,25 @@ public class AdaptationPlugin implements DEECoPlugin {
 
 	private long period = 10000;
 
+	private boolean verbose;
+
 	private MetaAdaptationManager adaptationManager;
+
 
 	/** Plugin dependencies. */
 	static private final List<Class<? extends DEECoPlugin>> DEPENDENCIES =
 			Collections.emptyList();
+
+	/* (non-Javadoc)
+	 * @see cz.cuni.mff.d3s.deeco.runtime.DEECoPlugin#getDependencies()
+	 */
+	@Override
+	public List<Class<? extends DEECoPlugin>> getDependencies() {
+		return DEPENDENCIES;
+	}
 
 	public AdaptationPlugin withVerbosity(boolean verbosity){
+		verbose = verbosity;
 		return this;
 	}
 
@@ -63,14 +75,6 @@ public void registerAdaptation(MAPEAdaptation adaptation){
 
 		adaptationManager.addAdaptation(adaptation);
 	}
-
-	/* (non-Javadoc)
-	 * @see cz.cuni.mff.d3s.deeco.runtime.DEECoPlugin#getDependencies()
-	 */
-	@Override
-	public List<Class<? extends DEECoPlugin>> getDependencies() {
-		return DEPENDENCIES;
-	}
 
 	/* (non-Javadoc)
 	 * @see cz.cuni.mff.d3s.deeco.runtime.DEECoPlugin#init(cz.cuni.mff.d3s.deeco.runtime.DEECoContainer)
@@ -79,18 +83,15 @@ public List<Class<? extends DEECoPlugin>> getDependencies() {
 	public void init(DEECoContainer container) throws PluginInitFailedException {
 		try {
 			adaptationManager = new MetaAdaptationManager();
-			container.deployComponent(new AdaptationComponent(adaptationManager));
+			adaptationManager.setVerbosity(verbose);
+			ComponentInstance c = container.deployComponent(new AdaptationComponent(adaptationManager));
 
-			for (ComponentInstance c : container.getRuntimeMetadata().getComponentInstances()) {
-				if (c.getName().equals(MetaAdaptationManager.class.getName())) {
-					// Adjust non-deterministic mode switching manager periods
-					for (ComponentProcess p: c.getComponentProcesses()) {
-						if(p.getName().equals("reason")){
-							for (Trigger t : p.getTriggers()){
-								if (t instanceof TimeTrigger) {
-									((TimeTrigger) t).setPeriod(period);
-								}
-							}
+			// Adjust non-deterministic mode switching manager periods
+			for (ComponentProcess p: c.getComponentProcesses()) {
+				if(p.getName().equals("reason")){
+					for (Trigger t : p.getTriggers()){
+						if (t instanceof TimeTrigger) {
+							((TimeTrigger) t).setPeriod(period);
 						}
 					}
 				}

diff --git a/...tation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/componentIsolation/ComponentImpl.java b/...tation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/componentIsolation/ComponentImpl.java
@@ -48,7 +48,8 @@ public ComponentImpl(ComponentInstance component){
 	 */
 	@Override
 	public void addPort(Port port) {
-		// TODO Auto-generated method stub
+		// TODO: implement
+		throw new UnsupportedOperationException();
 
 	}
 
@@ -57,6 +58,7 @@ public void addPort(Port port) {
 	 */
 	@Override
 	public void removePort(Port port) {
+		// TODO: implement properly
 		KnowledgeManager kManager = component.getKnowledgeManager();
 		kManager.updateRoles(null);
 		Log.i("Removing the role of the " + kManager.getId());
@@ -82,7 +84,7 @@ public Set<Port> getPorts() {
 	 */
 	@Override
 	public void monitorHealth(Port port) {
-
+		// TODO: check whether this is needed
 
 	}
 

diff --git a/...in/src/cz/cuni/mff/d3s/jdeeco/adaptation/componentIsolation/ComponentIsolationPlugin.java b/...in/src/cz/cuni/mff/d3s/jdeeco/adaptation/componentIsolation/ComponentIsolationPlugin.java
@@ -39,16 +39,19 @@ public class ComponentIsolationPlugin implements DEECoPlugin, StartupListener {
 	/** Plugin dependencies. */
 	@SuppressWarnings("unchecked")
 	static private final List<Class<? extends DEECoPlugin>> DEPENDENCIES =
-			Arrays.asList(new Class[]{AdaptationPlugin.class});;
+			Arrays.asList(new Class[]{AdaptationPlugin.class});
 
+	@Override
+	public List<Class<? extends DEECoPlugin>> getDependencies() {
+		return DEPENDENCIES;
+	}
 
 	public ComponentIsolationPlugin(Set<DEECoNode> nodes){
 		if(nodes == null){
 			throw new IllegalArgumentException(String.format("The %s argument is null.", "nodes"));
 		}
 
 		verbose = false;
-
 		this.nodes = nodes;
 	}
 
@@ -61,15 +64,9 @@ public ComponentIsolationPlugin withVerbosity(boolean verbose){
 		this.verbose = verbose;
 		return this;
 	}
-
-	@Override
-	public List<Class<? extends DEECoPlugin>> getDependencies() {
-		return DEPENDENCIES;
-	}
-
+
 	@Override
 	public void init(DEECoContainer container) {
-
 		container.addStartupListener(this);
 
 		adaptationPlugin = container.getPluginInstance(AdaptationPlugin.class);
@@ -91,6 +88,9 @@ public void onStartup() throws PluginStartupFailedException {
 			}
 		}
 
-		adaptationPlugin.registerAdaptation(new ComponentIsolationManager(new ComponentManagerImpl(c)));		
+		ComponentIsolationManager ciManager = new ComponentIsolationManager(new ComponentManagerImpl(c));
+		ciManager.setVerbosity(verbose);
+
+		adaptationPlugin.registerAdaptation(ciManager);		
 	}
 }
diff --git a/...plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/componentIsolation/ComponentManagerImpl.java b/...plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/componentIsolation/ComponentManagerImpl.java
@@ -27,6 +27,7 @@ public class ComponentManagerImpl implements cz.cuni.mff.d3s.metaadaptation.comp
 
 	private final Set<Component> components;
 
+
 	public ComponentManagerImpl(Set<Component> components){
 		if(components == null){
 			throw new IllegalArgumentException(String.format("The %s argument is null.", "components"));

diff --git a/...-adaptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/componentIsolation/PortImpl.java b/...-adaptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/componentIsolation/PortImpl.java
@@ -24,6 +24,7 @@ public class PortImpl implements cz.cuni.mff.d3s.metaadaptation.componentisolati
 	@SuppressWarnings("rawtypes")
 	private final Class role;
 
+
 	@SuppressWarnings("rawtypes")
 	public PortImpl(Class role){
 		if(role == null){

diff --git a/...co-adaptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/correlation/ComponentImpl.java b/...co-adaptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/correlation/ComponentImpl.java
@@ -37,6 +37,7 @@ public class ComponentImpl implements cz.cuni.mff.d3s.metaadaptation.correlation
 
 	private final ComponentInstance componentInstance;
 
+
 	public ComponentImpl(String componentName, ComponentInstance componentInstance) {
 		if (componentName == null || componentName.isEmpty()) {
 			throw new IllegalArgumentException(String.format("The %s argument is null or empty.", "componentName"));
@@ -90,7 +91,8 @@ public Set<String> getKnowledgeFields() {
 	@Override
 	public Object getKnowledgeValue(String knowlegeField) {
 		try {
-			Map<String, Map<String, CorrelationMetadataWrapper<? extends Object>>> knowledgeOfAllComponents = getKnowledgeOfAllComponents();
+			Map<String, Map<String, CorrelationMetadataWrapper<? extends Object>>> knowledgeOfAllComponents
+				= getKnowledgeOfAllComponents();
 
 			if (knowledgeOfAllComponents.containsKey(componentName)) {
 				if (knowledgeOfAllComponents.get(componentName).containsKey(knowlegeField)) {

diff --git a/...on-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/correlation/CorrelationKnowledgeData.java b/...on-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/correlation/CorrelationKnowledgeData.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 import cz.cuni.mff.d3s.deeco.annotations.Component;
-import cz.cuni.mff.d3s.deeco.annotations.Local;
 import cz.cuni.mff.d3s.deeco.annotations.PlaysRole;
 import cz.cuni.mff.d3s.deeco.annotations.SystemComponent;
 import cz.cuni.mff.d3s.metaadaptation.correlation.CorrelationMetadataWrapper;
@@ -33,17 +32,6 @@
 @SystemComponent
 @PlaysRole(CorrelationKnowledgeRole.class)
 public class CorrelationKnowledgeData {
-	/**
-	 * Specify whether to print the values being processed by the correlation computation.
-	 */
-	@Local
-	static boolean dumpValues = false;
-
-	@Local
-	static boolean verbose = false;
-
-	@Local
-	static boolean logGeneratedEnsembles = false;
 
 	public String id = "CorrelationData";
 

diff --git a/...daptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/correlation/CorrelationPlugin.java b/...daptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/correlation/CorrelationPlugin.java
@@ -45,7 +45,12 @@ public class CorrelationPlugin implements DEECoPlugin, StartupListener {
 	/** Plugin dependencies. */
 	@SuppressWarnings("unchecked")
 	static private final List<Class<? extends DEECoPlugin>> DEPENDENCIES =
-			Arrays.asList(new Class[]{AdaptationPlugin.class});;
+			Arrays.asList(new Class[]{AdaptationPlugin.class});
+
+	@Override
+	public List<Class<? extends DEECoPlugin>> getDependencies() {
+		return DEPENDENCIES;
+	}
 
 
 	public CorrelationPlugin(Set<DEECoNode> nodes){
@@ -70,7 +75,6 @@ public CorrelationPlugin(Set<DEECoNode> nodes){
 	 */
 	public CorrelationPlugin withVerbosity(boolean verbose){
 		this.verbose = verbose;
-		CorrelationManager.verbose = verbose;
 		return this;
 	}
 
@@ -81,24 +85,18 @@ public CorrelationPlugin withVerbosity(boolean verbose){
 	 */
 	public CorrelationPlugin withDumping(boolean dumpValues){
 		this.dumpValues = dumpValues;
-		CorrelationManager.dumpValues = dumpValues;
 		return this;
 	}
 
-	@Override
-	public List<Class<? extends DEECoPlugin>> getDependencies() {
-		return DEPENDENCIES;
-	}
-
 	@Override
 	public void init(DEECoContainer container) {
 		AnnotationProcessorExtensionPoint correlationAwareAnnotationProcessorExtension = new CorrelationAwareAnnotationProcessorExtension();
 		container.getProcessor().addExtension(correlationAwareAnnotationProcessorExtension);
 		container.addStartupListener(this);
 
 		try {
-			CorrelationManager.verbose = verbose;
-			CorrelationManager.dumpValues = dumpValues;
+			manager.setVerbosity(verbose);
+			manager.setDumpValues(dumpValues);
 
 			container.deployComponent(new CorrelationKnowledgeData());
 			container.deployEnsemble(CorrelationDataAggregation.class);

diff --git a/...ptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/correlation/EnsembleManagerImpl.java b/...ptation-plugin/src/cz/cuni/mff/d3s/jdeeco/adaptation/correlation/EnsembleManagerImpl.java
@@ -36,6 +36,7 @@ public class EnsembleManagerImpl implements cz.cuni.mff.d3s.metaadaptation.corre
 	@Local
 	private final List<DEECoNode> nodes;
 
+
 	public EnsembleManagerImpl() {
 		this.nodes = new ArrayList<>();
 	}