From b2ddff63045c13cc2351894e29bc519e10b97778 Mon Sep 17 00:00:00 2001
From: Alina Zolotukhina <alina.zolotukhina@epfl.ch>
Date: Thu, 21 Jul 2016 17:54:00 +0200
Subject: [PATCH] BIPComponent interface updated
---
org.bip.api/src/main/java/org/bip/api/BIPComponent.java | 7 +++++++
.../executor/impl/akka/AkkaOrchestratedExecutorImpl.java | 7 +++++++
.../org/bip/executor/springinosgi/ExecutorOSGiImpl.java | 7 +++++++
.../src/main/java/org/bip/executor/ExecutorKernel.java | 6 ++++++
4 files changed, 27 insertions(+)
diff --git a/org.bip.api/src/main/java/org/bip/api/BIPComponent.java b/org.bip.api/src/main/java/org/bip/api/BIPComponent.java
index 81309d9b..acc68917 100644
--- a/org.bip.api/src/main/java/org/bip/api/BIPComponent.java
+++ b/org.bip.api/src/main/java/org/bip/api/BIPComponent.java
@@ -56,4 +56,11 @@ public interface BIPComponent extends Identifiable, BIPActor, ResourceManager {
public void provideAllocation(String resourceName, ResourceHandle resourceHandle);
+ /**
+ * Provides a map of resource names and their corresponding amounts released by the specified port
+ * @param port port releasing resources
+ * @return
+ */
+ public Map<String, String> getReleasedAmounts(Port port);
+
}
diff --git a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java b/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java
index 7a07f0e3..ec50ce66 100644
--- a/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java
+++ b/org.bip.executor.impl/src/main/java/org/bip/executor/impl/akka/AkkaOrchestratedExecutorImpl.java
@@ -5,6 +5,7 @@ import java.util.Map;
import org.bip.api.BIPEngine;
import org.bip.api.OrchestratedExecutor;
+import org.bip.api.Port;
import org.bip.api.PortBase;
import org.bip.api.ResourceHandle;
@@ -128,5 +129,11 @@ public class AkkaOrchestratedExecutorImpl implements AkkaOrchestratedExecutor {
return null;
}
+ @Override
+ public Map<String, String> getReleasedAmounts(Port port) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
diff --git a/org.bip.executor.impl/src/main/java/org/bip/executor/springinosgi/ExecutorOSGiImpl.java b/org.bip.executor.impl/src/main/java/org/bip/executor/springinosgi/ExecutorOSGiImpl.java
index 3e0e0878..a9c202e6 100644
--- a/org.bip.executor.impl/src/main/java/org/bip/executor/springinosgi/ExecutorOSGiImpl.java
+++ b/org.bip.executor.impl/src/main/java/org/bip/executor/springinosgi/ExecutorOSGiImpl.java
@@ -7,6 +7,7 @@ import java.util.Map;
import org.bip.api.BIPComponent;
import org.bip.api.BIPEngine;
import org.bip.api.Executor;
+import org.bip.api.Port;
import org.bip.api.PortBase;
import org.bip.api.Publishable;
import org.bip.api.ResourceHandle;
@@ -136,4 +137,10 @@ public class ExecutorOSGiImpl implements BundleContextAware, Publishable, Execut
return executor.decreaseCost(amount);
}
+ @Override
+ public Map<String, String> getReleasedAmounts(Port port) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
diff --git a/org.bip.executor/src/main/java/org/bip/executor/ExecutorKernel.java b/org.bip.executor/src/main/java/org/bip/executor/ExecutorKernel.java
index 5db4d7d1..53863b1f 100644
--- a/org.bip.executor/src/main/java/org/bip/executor/ExecutorKernel.java
+++ b/org.bip.executor/src/main/java/org/bip/executor/ExecutorKernel.java
@@ -457,4 +457,10 @@ public class ExecutorKernel extends SpecificationParser implements OrchestratedE
//return behaviour.resourceInvoke(this.getClass().getEnclosingMethod().getName(), amount);;
}
+ @Override
+ public Map<String, String> getReleasedAmounts(Port port) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
--
GitLab