use Dataset name service property in add/removeDataset instead of

getName method
ibcn-cloudlet · Jul 18, 2015 · 3bca68f · 3bca68f
1 parent e6430b6
commit 3bca68f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 38 deletions.
diff --git a/be.iminds.iot.dianne.builder/src/be/iminds/iot/dianne/builder/DianneDatasets.java b/be.iminds.iot.dianne.builder/src/be/iminds/iot/dianne/builder/DianneDatasets.java
@@ -41,20 +41,14 @@ public class DianneDatasets extends HttpServlet {
 
 	@Reference(cardinality=ReferenceCardinality.AT_LEAST_ONE, 
 			policy=ReferencePolicy.DYNAMIC)
-	public void addDataset(Dataset dataset){
-		this.datasets.put(dataset.getName(), dataset);
+	public void addDataset(Dataset dataset, Map<String, Object> properties){
+		String name = (String) properties.get("name");
+		this.datasets.put(name, dataset);
 	}
 
-	public void removeDataset(Dataset dataset){
-		synchronized(datasets){
-			Iterator<Entry<String, Dataset>> it = datasets.entrySet().iterator();
-			while(it.hasNext()){
-				Entry<String, Dataset> e = it.next();
-				if(e.getValue()==dataset){
-					it.remove();
-				}
-			}
-		}
+	public void removeDataset(Dataset dataset, Map<String, Object> properties){
+		String name = (String) properties.get("name");
+		datasets.remove(name);
 	}
 
 	@Override

diff --git a/be.iminds.iot.dianne.builder/src/be/iminds/iot/dianne/builder/DianneLearner.java b/be.iminds.iot.dianne.builder/src/be/iminds/iot/dianne/builder/DianneLearner.java
@@ -92,18 +92,14 @@ public void removeModule(Module m){
 
 	@Reference(cardinality=ReferenceCardinality.AT_LEAST_ONE, 
 			policy=ReferencePolicy.DYNAMIC)
-	public void addDataset(Dataset dataset){
-		this.datasets.put(dataset.getName(), dataset);
+	public void addDataset(Dataset dataset, Map<String, Object> properties){
+		String name = (String) properties.get("name");
+		this.datasets.put(name, dataset);
 	}
 
-	public void removeDataset(Dataset dataset){
-		Iterator<Entry<String, Dataset>> it = datasets.entrySet().iterator();
-		while(it.hasNext()){
-			Entry<String, Dataset> e = it.next();
-			if(e.getValue()==dataset){
-				it.remove();
-			}
-		}
+	public void removeDataset(Dataset dataset, Map<String, Object> properties){
+		String name = (String) properties.get("name");
+		this.datasets.remove(name);
 	}
 
 	@Override

diff --git a/be.iminds.iot.dianne.builder/src/be/iminds/iot/dianne/builder/DianneRunner.java b/be.iminds.iot.dianne.builder/src/be/iminds/iot/dianne/builder/DianneRunner.java
@@ -78,20 +78,14 @@ public void setTensorFactory(TensorFactory factory){
 
 	@Reference(cardinality=ReferenceCardinality.MULTIPLE, 
 			policy=ReferencePolicy.DYNAMIC)
-	public void addDataset(Dataset dataset){
-		this.datasets.put(dataset.getName(), dataset);
+	public void addDataset(Dataset dataset, Map<String, Object> properties){
+		String name = (String) properties.get("name");
+		this.datasets.put(name, dataset);
 	}
 
-	public void removeDataset(Dataset dataset){
-		synchronized(datasets){
-			Iterator<Entry<String, Dataset>> it = datasets.entrySet().iterator();
-			while(it.hasNext()){
-				Entry<String, Dataset> e = it.next();
-				if(e.getValue()==dataset){
-					it.remove();
-				}
-			}
-		}
+	public void removeDataset(Dataset dataset, Map<String, Object> properties){
+		String name = (String) properties.get("name");
+		datasets.remove(name);
 	}
 
 	@Reference(cardinality=ReferenceCardinality.MULTIPLE, 

diff --git a/...nds.iot.dianne.nn.runtime/src/be/iminds/iot/dianne/nn/runtime/command/DianneCommands.java b/...nds.iot.dianne.nn.runtime/src/be/iminds/iot/dianne/nn/runtime/command/DianneCommands.java
@@ -221,12 +221,14 @@ public void eval(int start, int end){
 
 	@Reference(cardinality=ReferenceCardinality.MULTIPLE, 
 			policy=ReferencePolicy.DYNAMIC)
-	public void addDataset(Dataset dataset){
-		this.datasets.put(dataset.getName(), dataset);
+	public void addDataset(Dataset dataset, Map<String, Object> properties){
+		String name = (String) properties.get("name");
+		this.datasets.put(name, dataset);
 	}
 
-	public void removeDataset(Dataset dataset){
-		this.datasets.remove(dataset.getName());
+	public void removeDataset(Dataset dataset, Map<String, Object> properties){
+		String name = (String) properties.get("name");
+		this.datasets.remove(name);
 	}
 
 	@Reference