Return SEI instead of only uuid when posting neu SEI - task #1174

de.dlr.sc.virsat.server/src/de/dlr/sc/virsat/server/resources/ModelAccessResource.java

@@ -40,6 +40,7 @@
 import de.dlr.sc.virsat.model.concept.types.factory.BeanStructuralElementInstanceFactory;
 import de.dlr.sc.virsat.model.concept.types.roles.BeanDiscipline;
 import de.dlr.sc.virsat.model.concept.types.structural.ABeanStructuralElementInstance;
+import de.dlr.sc.virsat.model.concept.types.structural.BeanStructuralElementInstance;
 import de.dlr.sc.virsat.model.dvlm.Repository;
 import de.dlr.sc.virsat.model.dvlm.concepts.Concept;
 import de.dlr.sc.virsat.model.dvlm.concepts.registry.ActiveConceptConfigurationElement;
@@ -363,10 +364,10 @@ public Response createRootSei(@QueryParam(value = ModelAccessResource.QP_FULL_QU
  try {
  serverRepository.syncRepository();
 
- String newSeiUuid = createSeiFromFqn(fullQualifiedName, repository, ed, userContext);
+ BeanStructuralElementInstance newSeiBean = createSeiFromFqn(fullQualifiedName, repository, ed, userContext);
 
  serverRepository.syncRepository();
- return Response.ok(newSeiUuid).build();
+ return Response.ok(newSeiBean).build();
  } catch (Exception e) {
  return ApiErrorHelper.createInternalErrorResponse(e.getMessage());
  }
@@ -551,7 +552,7 @@ public Response getRepositpryDiscipline() {
  * @param iUserContext the user context
  * @return uuid of the created sei
  */
- public static String createSeiFromFqn(String fullQualifiedName, EObject owner, VirSatTransactionalEditingDomain editingDomain, IUserContext iUserContext) {
+ public static BeanStructuralElementInstance createSeiFromFqn(String fullQualifiedName, EObject owner, VirSatTransactionalEditingDomain editingDomain, IUserContext iUserContext) {
  ActiveConceptHelper helper = new ActiveConceptHelper(editingDomain.getResourceSet().getRepository());
  StructuralElement se = helper.getStructuralElement(fullQualifiedName);
  StructuralElementInstance newSei = new StructuralInstantiator().generateInstance(se, null);
@@ -564,6 +565,6 @@ public static String createSeiFromFqn(String fullQualifiedName, EObject owner, V
  Command createCommand = CreateAddSeiWithFileStructureCommand.create(editingDomain, owner, newSei);
  ApiErrorHelper.executeCommandIffCanExecute(createCommand, editingDomain, iUserContext);
 
- return newSei.getUuid().toString();
+ return new BeanStructuralElementInstance(newSei);
  }
 }

de.dlr.sc.virsat.server/src/de/dlr/sc/virsat/server/resources/modelaccess/StructuralElementInstanceResource.java

@@ -26,6 +26,7 @@
 
 import de.dlr.sc.virsat.model.concept.types.factory.BeanStructuralElementInstanceFactory;
 import de.dlr.sc.virsat.model.concept.types.structural.ABeanStructuralElementInstance;
+import de.dlr.sc.virsat.model.concept.types.structural.BeanStructuralElementInstance;
 import de.dlr.sc.virsat.model.concept.types.structural.IBeanStructuralElementInstance;
 import de.dlr.sc.virsat.model.dvlm.structural.StructuralElementInstance;
 import de.dlr.sc.virsat.project.structure.command.CreateRemoveSeiWithFileStructureCommand;
@@ -146,10 +147,10 @@ public Response createSei(@PathParam("seiUuid") @ApiParam(value = "parent uuid",
  if (parentSei == null) {
  return ApiErrorHelper.createNotFoundErrorResponse();
  }
- String newSeiUuid = ModelAccessResource.createSeiFromFqn(fullQualifiedName, parentSei, parentResource.getEd(), parentResource.getUser());
+ BeanStructuralElementInstance newSeiBean = ModelAccessResource.createSeiFromFqn(fullQualifiedName, parentSei, parentResource.getEd(), parentResource.getUser());
 
  parentResource.synchronize();
- return Response.ok(newSeiUuid).build();
+ return Response.ok(newSeiBean).build();
  } catch (Exception e) {
  return ApiErrorHelper.createInternalErrorResponse(e.getMessage());
  }