Merge pull request #287 from Systems-Modeling/ST6RI-455

ST6RI-455 Updated implementation for 2021-09 API client

Author: seidewitz

org.omg.sysml/lib/sysml-v2-api-client-all.jar

@@ -34,12 +34,12 @@
 import org.omg.sysml.api.ProjectApi;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.model.Commit;
-import org.omg.sysml.model.ElementVersion;
+import org.omg.sysml.model.DataVersion;
 import okhttp3.OkHttpClient;
 
 /**
  * This is an element-processing facade that uses the SysML v2 REST API to write Elements to a repository.
- * A change set of ElementVersions is constructed during traversal of the model. Once the traversal is
+ * A change set of DataVersions is constructed during traversal of the model. Once the traversal is
  * completed, this change set can be committed to the repository.
  * 
  * @author Ed Seidewitz
@@ -121,7 +121,7 @@ public void commit() {
 		try {
 			this.project = projectApi.postProject(this.project);
 
-			List<ElementVersion> changes = this.getVersions();
+			List<DataVersion> changes = this.getVersions();
 			Commit commit = new Commit().change(changes);
 //			System.out.println(new org.omg.sysml.JSON().serialize(commit));
 

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

@@ -36,8 +36,8 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.util.SysMLLibraryUtil;
-import org.omg.sysml.model.ElementIdentity;
-import org.omg.sysml.model.ElementVersion;
+import org.omg.sysml.model.DataIdentity;
+import org.omg.sysml.model.DataVersion;
 import org.omg.sysml.model.Identified;
 import org.omg.sysml.util.traversal.Traversal;
 import org.omg.sysml.util.traversal.facade.ElementProcessingFacade;
@@ -48,7 +48,7 @@
 
 /**
  * This is an element-processing facade that uses the SysML v2 REST API client to export Elements to JSON.
- * A list of ElementVersions is constructed during traversal of the model. Once the traversal is
+ * A list of DataVersions is constructed during traversal of the model. Once the traversal is
  * completed, this change set can be exported to JSON.
  * 
  * @author Ed Seidewitz
@@ -67,7 +67,7 @@ public class JsonElementProcessingFacade implements ElementProcessingFacade {
 	protected int elementCount = 0;
 	protected int dotCount = 0;
 
-	private final List<ElementVersion> versions = new ArrayList<>();
+	private final List<DataVersion> versions = new ArrayList<>();
 	private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
 	/**
@@ -125,21 +125,21 @@ public boolean isIncludeDerived() {
 	}
 
 	/**
-	 * Return the collection of ElementVersions that have been created from
+	 * Return the collection of DataVersions that have been created from
 	 * processed model Elements.
 	 * 
-	 * @return	the collection of ElementVersions that have been created 
+	 * @return	the collection of DataVersions that have been created 
 	 */
-	List<ElementVersion> getVersions() {
+	List<DataVersion> getVersions() {
 		return Collections.unmodifiableList(this.versions);
 	}
 
 	/**
-	 * Add an ElementVersion to the collection.
+	 * Add a DataVersion to the collection.
 	 * 
-	 * @param 	elementVersion	the ElementVersion to be added to the collection
+	 * @param 	elementVersion	the DataVersion to be added to the collection
 	 */
-	protected void addVersion(ElementVersion elementVersion) {
+	protected void addVersion(DataVersion elementVersion) {
 		this.versions.add(elementVersion);
 	}
 
@@ -178,17 +178,17 @@ protected List<Identified> getIdentified(List<Element> elements) {
 	}
 
 	/**
-	 * Create an ElementVersion for the given model Element including the values of all its non-derived  
+	 * Create a DataVersion for the given model Element including the values of all its non-derived  
 	 * attributes (unless it is a library model element, in which case only its non-referential attribute values 
-	 * are included). If isIncludeDerived is true, also include derived attributes. The ID for the ElementVersion 
+	 * are included). If isIncludeDerived is true, also include derived attributes. The ID for the DataVersion 
 	 * uses the identifier from the model Element.
 	 * 
 	 * @param 	element				the source model Element as it is represented in Ecore
-	 * @return	an ElementVersion with the API representation of the given Element as its data
+	 * @return	a DataVersion with the API representation of the given Element as its data
 	 */
 	@SuppressWarnings("unchecked")
-	protected org.omg.sysml.model.ElementVersion createElementVersion(Element element) {
-		org.omg.sysml.model.Element apiElement = new org.omg.sysml.model.Element();
+	protected org.omg.sysml.model.DataVersion createElementVersion(Element element) {
+		org.omg.sysml.model.Data apiElement = new org.omg.sysml.model.Data();
 		EClass eClass = element.eClass();
 		apiElement.put("@type", eClass.getName());
 		boolean isLibraryElement = SysMLLibraryUtil.isModelLibrary(element.eResource());
@@ -206,8 +206,8 @@ protected org.omg.sysml.model.ElementVersion createElementVersion(Element elemen
 				apiElement.put(name, value);
 			}
 		}
-		return new ElementVersion().data(apiElement).
-				identity(new ElementIdentity().atId(UUID.fromString(element.getIdentifier())));
+		return new DataVersion().payload(apiElement).
+				identity(new DataIdentity().atId(UUID.fromString(element.getIdentifier())));
 	}
 
 	/**
@@ -256,7 +256,7 @@ public Object process(Element element) {
 	}
 
 	/**
-	 * Post-process the given Element by creating an ElementVersion for it and adding that
+	 * Post-process the given Element by creating a DataVersion for it and adding that
 	 * to the change set being constructed. This is done as a post-processing step so that
 	 * derived references to library model Elements not included in the change set can be
 	 * excluded.