Gracefully handle cases where a new instance cannot be added directly…

… to the model (fixes #12)
epsilonlabs · Mar 8, 2024 · dab75b8 · dab75b8
1 parent 26c21cd
commit dab75b8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/...ugin.remote/src/org/eclipse/epsilon/emc/magicdraw/mdplugin/remote/ModelAccessService.java b/...ugin.remote/src/org/eclipse/epsilon/emc/magicdraw/mdplugin/remote/ModelAccessService.java
@@ -427,15 +427,27 @@ public void createInstance(CreateInstanceRequest request, StreamObserver<ModelEl
  Method mCreateInstance = factory.getClass().getMethod(methodName);
  MDObject mdObject = (MDObject) mCreateInstance.invoke(factory);
  if (mdObject instanceof PackageableElement) {
- return findRootElement(request.getRootElementHyperlink(), project).flatMapRight((root) -> {
+ final Either<StatusRuntimeException, EObject> errorOrRoot = findRootElement(request.getRootElementHyperlink(), project);
+ return errorOrRoot.flatMapRight((root) -> {
+ final Element rootElement = (Element) root;
  try {
- ModelElementsManager.getInstance().addElement((Element) mdObject, (Element) root);
+ if (rootElement.canAdd(mdObject)) {
+ ModelElementsManager.getInstance().addElement((Element) mdObject, rootElement);
+ }
  return Either.right(encoder.encode(mdObject));
  } catch (ReadOnlyElementException e) {
  LOGGER.error(e.getMessage(), e);
  return Either.left(Status.INVALID_ARGUMENT
- .withDescription(String.format("Element with ID %s is read only", ((Element) root).getID()))
+ .withDescription(String.format("Element with ID %s is read only", rootElement.getID()))
  .asRuntimeException());
+ } catch (IllegalArgumentException e) {
+ /*
+ * Some objects falsely report canAdd() = true (e.g.
+ * EnumerationLiteral instances): we log a warning
+ * and return them as is.
+ */
+ LOGGER.warn(e.getMessage(), e);
+ return Either.right(encoder.encode(mdObject));
  }
  });
  }

diff --git a/...emc.magicdraw.remote.tests/src/org/eclipse/epsilon/emc/magicdraw/remote/ZooModelTest.java b/...emc.magicdraw.remote.tests/src/org/eclipse/epsilon/emc/magicdraw/remote/ZooModelTest.java
@@ -582,6 +582,13 @@ public void allProfiles() throws Exception {
  assertTrue("There should be at least one predefined profile", (int) module.execute() > 1);
  }
 
+ @Test
+ public void addEnumerationLiteral() throws Exception {
+ EolModule module = createEOLModule();
+ module.parse("return new EnumerationLiteral();");
+ assertNotNull(module.execute());
+ }
+
  private void assumeTypeExists(String typeName) {
  try {
  m.getAllOfKind(typeName);