Skip to content
Snippets Groups Projects
Commit 9e84b645 authored by Simon Spinner's avatar Simon Spinner
Browse files

Move replacePublicResources to generic agent.

parent 83a9d1b7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools.descartes.prisma.agent.generic/src/tools/descartes/prisma/agent/generic/GenericAgent.java
+ 38
− 2
View file @ 9e84b645
......@@ -14,8 +14,10 @@ import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.EStructuralFeature.Setting;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
......@@ -25,6 +27,9 @@ import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import edu.kit.ipd.descartes.identifier.Identifier;
import edu.kit.ipd.descartes.mm.resourcetype.ResourceType;
import edu.kit.ipd.descartes.mm.resourcetype.ResourceTypeRepository;
import edu.kit.ipd.descartes.mm.resourcetype.ResourcetypePackage;
import tools.descartes.prisma.agent.generic.genericagent.GenericAgentConfiguration;
import tools.descartes.prisma.agent.generic.genericagent.RequiredObject;
import tools.descartes.prisma.core.ModelRepository;
......@@ -40,8 +45,6 @@ public class GenericAgent implements IApplication {
private class GenericAgentController extends AgentController {
private ModelSkeleton skeleton;
private final Set<EObject> delegatedObjects = new HashSet<>();
public GenericAgentController(ModelRepository repository, GenericAgentConfiguration configuration) {
......@@ -138,6 +141,8 @@ public class GenericAgent implements IApplication {
agent.start().get();
resolvePublicResources(agent, configuration.getSkeleton());
if (resolveRequiredObjects(agent, configuration)) {
agent.apply(configuration.getSkeleton());
}
......@@ -170,6 +175,37 @@ public class GenericAgent implements IApplication {
return configuration;
}
private void resolvePublicResources(GenericAgentController agent, ModelSkeleton skeleton) {
// Resource types (e.g., CPU, HDD, DELAY) which are defined globally are
// not included in the model skeleton.
// We need to find these references in the model skeleton and connect
// them with the instances in the repository.
TreeIterator<EObject> iterator = skeleton.eAllContents();
ResourceTypeRepository publicResourceTypes = agent.getContainerScope().getSystemScope().getResourceTypes();
while (iterator.hasNext()) {
EObject curObject = iterator.next();
for (EReference curReference : curObject.eClass().getEAllReferences()) {
if (!curReference.isContainment() && !curReference.isContainer()) {
if (ResourcetypePackage.Literals.RESOURCE_TYPE.isSuperTypeOf(curReference.getEReferenceType())) {
ResourceType curType = (ResourceType) curObject.eGet(curReference);
if (curType != null) {
// find matching resources in system global scope
// (matching is based on name and class
for (ResourceType curPublicOne : publicResourceTypes.getResourceTypes()) {
if (curType.eClass().isInstance(curPublicOne)
&& curType.getName().equals(curPublicOne.getName())) {
ModelSkeletonAdapter adapter = agent.adapt(curType, ModelSkeletonAdapter.class);
adapter.setRepositoryObject(curPublicOne);
break;
}
}
}
}
}
}
}
}
private boolean resolveRequiredObjects(GenericAgentController agent, GenericAgentConfiguration configuration) {
Set<RequiredObject> notResolved = new HashSet<>(configuration.getRequiredObjects());
......
tools.descartes.prisma.core/src/tools/descartes/prisma/core/agent/AgentController.java
+ 0
− 39
View file @ 9e84b645
......@@ -13,13 +13,8 @@ import java.util.concurrent.TimeUnit;
import org.eclipse.emf.cdo.CDOAdapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.util.TreeIterator;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import edu.kit.ipd.descartes.mm.resourcetype.ResourceType;
import edu.kit.ipd.descartes.mm.resourcetype.ResourceTypeRepository;
import edu.kit.ipd.descartes.mm.resourcetype.ResourcetypePackage;
import tools.descartes.prisma.core.ModelRepository;
import tools.descartes.prisma.core.Transaction;
import tools.descartes.prisma.core.adapter.ModelSkeletonAdapter;
......@@ -168,8 +163,6 @@ public class AgentController {
try (Transaction transaction = getModelRepository().createTransaction()) {
replacePublicResources(skeleton);
scope.synchronizeModelSkeleton(this, transaction, skeleton);
boolean success = true;
......@@ -274,36 +267,4 @@ public class AgentController {
public <T> T adapt(EObject obj, Class<T> adapterClass) {
return (T) adapterFactory.adapt(obj, adapterClass);
}
private void replacePublicResources(ModelSkeleton skeleton) {
// Resource types (e.g., CPU, HDD, DELAY) which are defined globally are
// not included in the model skeleton.
// We need to find these references in the model skeleton and connect
// them with the instances in the repository.
TreeIterator<EObject> iterator = skeleton.eAllContents();
ResourceTypeRepository publicResourceTypes = scope.getSystemScope().getResourceTypes();
while (iterator.hasNext()) {
EObject curObject = iterator.next();
for (EReference curReference : curObject.eClass().getEAllReferences()) {
if (!curReference.isContainment() && !curReference.isContainer()) {
if (ResourcetypePackage.Literals.RESOURCE_TYPE.isSuperTypeOf(curReference.getEReferenceType())) {
ResourceType curType = (ResourceType) curObject.eGet(curReference);
if (curType != null) {
// find matching resources in system global scope
// (matching is based on name and class
for (ResourceType curPublicOne : publicResourceTypes.getResourceTypes()) {
if (curType.eClass().isInstance(curPublicOne)
&& curType.getName().equals(curPublicOne.getName())) {
ModelSkeletonAdapter adapter = adapt(curType,
ModelSkeletonAdapter.class);
adapter.setRepositoryObject(curPublicOne);
break;
}
}
}
}
}
}
}
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment