ST6RI-178 Added workarounds to fix upload/download in Jupyter

 - added ability to add any element as root element to the APIModel

Author: TheKorpos

org.omg.kerml.xtext/src/org/omg/kerml/xtext/util/KerMLRepositorySaveUtil.java

@@ -185,7 +185,7 @@ protected void initialize(String[] args)  {
 	@Override
 	public void process() {
 		super.process();
-		this.isCommitted = ((ApiElementProcessingFacade)this.traversal.getFacade()).commit();
+		this.isCommitted = ((ApiElementProcessingFacade)this.traversal.getFacade()).commit(null);
 	}
 
 	/**

org.omg.sysml/src/org/omg/sysml/util/repository/APIModel.java

@@ -74,12 +74,18 @@ public Map<UUID, Element> getModelRoots() {
 
 
 	/**
-	 * Adds root level model element to the model.
+	 * Adds root level model element to the model. Adding an element this way will unset the owner
+	 * and owning attributes.
 	 * 
 	 * @param id UUID of the element
 	 * @param rootElement element to add
 	 */
 	 public void addModelRoot(UUID id, Element rootElement) {
+		for (var key: rootElement.keySet()) {
+			if (key.equals("owner") || key.startsWith("owning")) {
+				rootElement.replace(key, null);
+			}
+		}
 		modelRoots.put(id, rootElement);
 		modelElements.put(id, rootElement);
 	}
@@ -137,6 +143,10 @@ public Element getElement(UUID uuid) {
 		return modelElements.get(uuid);
 	}
 
+	public Element getElement(String uuid) {
+		return modelElements.get(UUID.fromString(uuid));
+	}
+	
 	public void addOutOfScopeReferencesAsProxies() {
 		Set<LocalReference> localReferences = modelElements.values().stream()
 			.flatMap(el -> el.values().stream())
@@ -150,6 +160,7 @@ public void addOutOfScopeReferencesAsProxies() {
 				Element proxy = new Element();
 				proxy.put(Identified.SERIALIZED_NAME_AT_ID, uuid.toString());
 				proxy.put("@type", ref.getType());
+				proxy.put("isLibraryElement", ref.isLibraryElement());
 				addModelRoot(uuid, proxy);
 			}
 		}
@@ -188,15 +199,21 @@ public JsonElement toJsonTree(Gson gson) {
 	public static class LocalReference extends HashMap<String, UUID> {
 
 		private transient String type;
+		private boolean isLibraryElement;
 
-		public LocalReference(UUID identifier, String type) {
+		public LocalReference(UUID identifier, String type, boolean isLibraryElement) {
 			put(Identified.SERIALIZED_NAME_AT_ID, identifier);
 			this.type = type;
+			this.isLibraryElement = isLibraryElement;
 		}
 
 		public String getType() {
 			return type;
 		}
+		
+		public boolean isLibraryElement() {
+			return isLibraryElement;
+		}
 
 		public UUID getUUID() {
 			return get(Identified.SERIALIZED_NAME_AT_ID);

org.omg.sysml/src/org/omg/sysml/util/repository/APIModelDelta.java

@@ -46,10 +46,10 @@
 public class APIModelDelta {
 
 	private final Collection<Element> additions;
-	private final Map<UUID, Data> changes;
+	private final Map<UUID, ChangedElement> changes;
 	private final Collection<UUID> deletions;
 
-	private APIModelDelta(Set<Element> additions, Map<UUID, Data> changes, Set<UUID> deletions) {
+	private APIModelDelta(Set<Element> additions, Map<UUID, ChangedElement> changes, Set<UUID> deletions) {
 		this.additions = Collections.unmodifiableCollection(additions);
 		this.changes = Collections.unmodifiableMap(changes);
 		this.deletions = Collections.unmodifiableCollection(deletions);
@@ -69,7 +69,7 @@ public Collection<Element> getAdditions() {
 	 * 
 	 * @return UUID and field changes of elements
 	 */
-	public Map<UUID, Data> getChanges() {
+	public Map<UUID, ChangedElement> getChanges() {
 		return changes;
 	}
 
@@ -82,6 +82,10 @@ public Collection<UUID> getDeletions() {
 		return deletions;
 	}
 
+	public boolean isEmpty() {
+		return deletions.isEmpty() && additions.isEmpty() && changes.isEmpty();
+	}
+	
 	/**
 	 * Converts the {@link APIModelDelta} to a data structure
 	 * that the standard API server accepts as a model delta.
@@ -102,7 +106,7 @@ public List<DataVersion> toTrasferableDelta() {
 		}
 
 		for (var change: changes.entrySet()) {
-			delta.add(new DataVersion().payload(change.getValue()).identity(new DataIdentity().atId(change.getKey())));
+			delta.add(new DataVersion().payload(change.getValue().toData()).identity(new DataIdentity().atId(change.getKey())));
 		}
 
 		for (UUID deletion: getDeletions()) {
@@ -127,7 +131,7 @@ public static APIModelDelta create(APIModel thisModel, APIModel baseline) {
 
 		Set<Element> additions = new HashSet<>();
 		Set<UUID> deletions = new HashSet<>();
-		Map<UUID, Data> changes = new HashMap<>();
+		Map<UUID, ChangedElement> changes = new HashMap<>();
 
 		Map<UUID, Element> elementsFromThis = thisModel.getModelElements();
 
@@ -137,9 +141,8 @@ public static APIModelDelta create(APIModel thisModel, APIModel baseline) {
 				additions.add(thisModel.getElement(id));
 			} else {
 				Element thisElement = thisModel.getElement(id);
-				Data change = createElementDelta(thisElement, baselineElement);
-				if (!change.isEmpty()) {
-					change.put("@type", thisElement.get("@type"));
+				ChangedElement change = createElementDelta(thisElement, baselineElement);
+				if (change != null) {
 					changes.put(id, change);
 				}
 			}
@@ -164,14 +167,15 @@ public static APIModelDelta create(APIModel thisModel, APIModel baseline) {
 	 * @param baselineElement element to use as a baseline
 	 * @return changed fields and their new values wrapped in a {@link Data} object.
 	 */
-	public static Data createElementDelta(Element thisElement, Element baselineElement) {
-		Data change = new Data();
+	public static ChangedElement createElementDelta(Element thisElement, Element baselineElement) {
+		ChangedElement change = null;
 		Set<String> fieldsInThis = thisElement.keySet();
 		for (String field: fieldsInThis) {
 			Object thisValue = thisElement.get(field);
 			Object baselineValue = baselineElement.get(field);
 			if (!Objects.equal(thisValue, baselineValue)) {
-				change.put(field, thisValue);
+				if (change == null) change = new ChangedElement(baselineElement);
+				change.add(field, thisValue);
 			}
 		}
 		//set removed fields to null
@@ -184,4 +188,24 @@ public static Data createElementDelta(Element thisElement, Element baselineEleme
 
 		return change;
 	}
+	
+	private static class ChangedElement {
+		private Element originalElement;
+		private Map<String, Object> changes = new HashMap<>();
+		
+		public ChangedElement(Element originalElement) {
+			this.originalElement = originalElement;
+		}
+		
+		public void add(String field, Object thisValue) {
+			changes.put(field, thisValue);
+		}
+		
+		public Data toData() {
+			Data data = new Data();
+			data.putAll(originalElement);
+			data.putAll(changes);
+			return data;
+		}
+	}
 }

org.omg.sysml/src/org/omg/sysml/util/repository/Revision.java

@@ -106,11 +106,17 @@ public Revision pushLocalChanges() throws ApiException {
 	}
 
 	public Revision pushChanges(APIModelDelta changes) throws ApiException {
+		if (changes.isEmpty()) {
+			return this;
+		}
 		APIModelDelta localChanges = getLocalChanges();
 		return pushChanges(localChanges.toTrasferableDelta());
 	}
 
 	public Revision pushChanges(List<DataVersion> transferableChanges) throws ApiException {
+		if (transferableChanges.isEmpty()) {
+			return this;
+		}
 		CommitApi commitApi = getRemoteProject().getProjectRepository().getCommitApi();
 		Commit commit = new Commit();
 		commit.setChange(transferableChanges);

org.omg.sysml/src/org/omg/sysml/util/traversal/facade/impl/ApiElementProcessingFacade.java

@@ -26,6 +26,7 @@
 package org.omg.sysml.util.traversal.facade.impl;
 
 import java.util.List;
+import java.util.UUID;
 
 import org.omg.sysml.ApiException;
 import org.omg.sysml.lang.sysml.Element;
@@ -104,12 +105,14 @@ public Object process(Element element) {
 	}
 
 	/**
-	 * Create a new project in the repository, then create and post a commit to the project to save the 
+	 * Create or update a project in the repository, then create and post a commit to the project to save the 
 	 * ElementVersions constructed from the processed model Elements.
 	 * 
+	 * @param element to use as project root.
+	 * 
 	 * @return	whether the commit succeeded without an ApiException
 	 */
-	public boolean commit() {
+	public boolean commit(Element useAsRoot) {
 		try {
 			RemoteProject project = getProject();
 			RemoteBranch defaultBranch = project.getDefaultBranch();
@@ -121,10 +124,18 @@ public boolean commit() {
 			}
 //			System.out.println(toJson());
 			APIModel localState = getLocalModel();
+			
+			if (useAsRoot != null) {
+				UUID rootUUID = UUID.fromString(useAsRoot.getElementId());
+				var root = localState.getElement(rootUUID);
+				//reinsert element as root, this will unset its owners turning it into a root element
+				localState.addModelRoot(rootUUID, root);
+			}
+			
 			localState.addOutOfScopeReferencesAsProxies();
 			headRevision.setLocalState(localState);
 			List<DataVersion> localChanges = headRevision.getLocalChanges().toTrasferableDelta();
-			System.out.println(new org.omg.sysml.JSON().serialize(localChanges));
+//			System.out.println(new org.omg.sysml.JSON().serialize(localChanges));
 
 			int n = localChanges.size();
 			System.out.print("\nPosting Commit (" + n + " element" + (n == 1? ")...": "s)..."));

org.omg.sysml/src/org/omg/sysml/util/traversal/facade/impl/JsonElementProcessingFacade.java

@@ -128,10 +128,11 @@ public boolean isIncludeDerived() {
 	 * Create an Identified object with the given identifier.
 	 * 
 	 * @param 	identifier			the UUID of the object being identified
+	 * @param isLibraryElement 
 	 * @return	an Identified object with the given identifier
 	 */
-	protected static Map<String, UUID> identified(UUID identifier, String type) {
-		return new APIModel.LocalReference(identifier, type);
+	protected static Map<String, UUID> identified(UUID identifier, String type, boolean isLibraryElement) {
+		return new APIModel.LocalReference(identifier, type, isLibraryElement);
 	}
 
 	/**
@@ -141,7 +142,7 @@ protected static Map<String, UUID> identified(UUID identifier, String type) {
 	 * @return	an Identified object for the given Element (or null if the input is null).
 	 */
 	protected Map<String, UUID> getIdentified(Element element) {
-		return element == null? null: identified(UUID.fromString(element.getElementId()), element.eClass().getName());
+		return element == null? null: identified(UUID.fromString(element.getElementId()), element.eClass().getName(), element.isLibraryElement());
 	}
 
 	/**
@@ -178,7 +179,7 @@ protected org.omg.sysml.model.Element createApiModelElement(Element element) {
 			String featureName = feature.getName();
 			if ((this.isIncludeDerived() || !feature.isDerived()) && 
 					// Skip implementation-specific features.
-					!("Feature".equals(className) && "isNonunique".equals(featureName) || 
+					!(/*"Feature".equals(className) && */"isNonunique".equals(featureName) || 
 					  "OperatorExpression".equals(className) && "operand".equals(featureName) || 
 					  apiElement.containsKey(featureName))) {
 				Object value = element.eGet(feature);