A few updates on how KnowledgeNotFoundException is constructed and

reacted to in tasks.
d3scomp · Dec 3, 2013 · 54a019a · 54a019a
1 parent 3e96f0f
commit 54a019a
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 4 deletions.
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
@@ -56,7 +56,11 @@ public ValueSet get(Collection<KnowledgePath> knowledgePaths)
 		ValueSet result = new ValueSet();
 		Object value;
 		for (KnowledgePath kp : knowledgePaths) {
+			try {
 			value = getKnowledge(kp.getNodes());
+			} catch (KnowledgeNotFoundException knfe) {
+				throw new KnowledgeNotFoundException(kp);
+			}
 			if (knowledge.equals(value))
 				for (KnowledgePath rootKP : knowledge.keySet())
 					result.setValue(rootKP, knowledge.get(rootKP));

diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
@@ -1,9 +1,26 @@
 package cz.cuni.mff.d3s.deeco.knowledge;
 
+import cz.cuni.mff.d3s.deeco.model.runtime.api.KnowledgePath;
+
 /**
  * @author Michal Kit <kit@d3s.mff.cuni.cz>
  *
  */
 public class KnowledgeNotFoundException extends Exception {
+	private static final long serialVersionUID = -999702030030889941L;
+
+	KnowledgePath notFoundPath;
+
+	KnowledgeNotFoundException() {}
+
+	public KnowledgeNotFoundException(KnowledgePath notFoundPath) {
+		this.notFoundPath = notFoundPath;
+	}
 
+	public KnowledgePath getNotFoundPath() {
+		return notFoundPath;
+	}
+
+
+
 }
diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
@@ -348,7 +348,11 @@ private void performExchange(PathRoot localRole, ReadOnlyKnowledgeManager shadow
 					absoluteKnowledgePathAndRoot = getAbsoluteStrippedPath(formalParam.getKnowledgePath(), shadowKnowledgeManager, localKnowledgeManager);				
 				}
 			} catch (KnowledgeNotFoundException e) {
-				throw new TaskInvocationException("Knowledge path in knowledge exchange could not be resolved.", e);
+				//throw new TaskInvocationException("Knowledge path in knowledge exchange could not be resolved.", e);
+				Log.i(String.format(
+						"Knowledge exchange of %s could not be performed: missing knowledge path (%s)", 
+						ensembleController.getEnsembleDefinition().getName(), e.getNotFoundPath()));
+				return;
 			}
 
 			allPathsWithRoots.add(absoluteKnowledgePathAndRoot);
@@ -371,7 +375,13 @@ private void performExchange(PathRoot localRole, ReadOnlyKnowledgeManager shadow
 			localKnowledge = localKnowledgeManager.get(localPaths);
 			shadowKnowledge = shadowKnowledgeManager.get(shadowPaths);
 		} catch (KnowledgeNotFoundException e) {
-			throw new TaskInvocationException("Input knowledge of a knowledge exchange not found in the knowledge manager.", e);
+//			throw new TaskInvocationException(
+//					String.format("Input knowledge (%s) of a knowledge exchange in %s not found in the knowledge manager.", 
+//							e.getNotFoundPath(), ensembleController.getEnsembleDefinition().getName())
+//					, e);
+			Log.i(String.format("Input knowledge (%s) of a knowledge exchange in %s not found in the knowledge manager.", 
+					e.getNotFoundPath(), ensembleController.getEnsembleDefinition().getName()));
+			return;
 		}
 
 		// Construct the parameters for the process method invocation

diff --git a/jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java b/jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
@@ -95,7 +95,8 @@ public void invoke(Trigger trigger) throws TaskInvocationException {
 			try {  
 				absoluteKnowledgePath = KnowledgePathHelper.getAbsolutePath(formalParam.getKnowledgePath(), knowledgeManager);
 			} catch (KnowledgeNotFoundException e) {
-				throw new TaskInvocationException("Knowledge path could not be resolved.", e);
+				throw new TaskInvocationException(
+						String.format("Knowledge path (%s) could not be resolved.", e.getNotFoundPath()), e);
 			}
 
 			if (paramDir == ParameterDirection.IN || paramDir == ParameterDirection.INOUT) {
@@ -110,7 +111,9 @@ public void invoke(Trigger trigger) throws TaskInvocationException {
 		try {
 			inKnowledge = knowledgeManager.get(inPaths);
 		} catch (KnowledgeNotFoundException e) {
-			throw new TaskInvocationException("Input knowledge of a component process not found in the knowledge manager.", e);
+			throw new TaskInvocationException(
+					String.format("Input knowledge (%s) of a component process (%s) not found in the knowledge manager.", 
+							e.getNotFoundPath(), componentProcess.getName()), e);
 		}
 
 		// Construct the parameters for the process method invocation