ST6RI-178 Updated Jupyter %publish not to upload derived fields by

default

- derived elements are no longer uploaded by default by Jupyter %publish
- with the exception of importedElements which is needed to support a
workaround to addresses unstable membership UUIDs
- added flag '-d' to the command to still enable derived fields as an
option

Author: TheKorpos

org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractive.java

@@ -407,7 +407,7 @@ public String show(String name) {
 				show(name, Collections.emptyList(), Collections.emptyList()));
 	}
 
-	public String publish(String elementName, String projectName, String branchName, List<String> help) {
+	public String publish(String elementName, String projectName, String branchName, boolean includeDerievd, List<String> help) {
 		this.counter++;
 		if (Strings.isNullOrEmpty(elementName)) {
 			return help.isEmpty()? "": SysMLInteractiveHelp.getPublishHelp();
@@ -421,7 +421,7 @@ public String publish(String elementName, String projectName, String branchName,
 			} else {
 				String remoteProjectName = projectName == null? element.getDeclaredName() + " " + new Date() : projectName;
 
-				ApiElementProcessingFacade processingFacade = this.getApiElementProcessingFacade(remoteProjectName, branchName);
+				ApiElementProcessingFacade processingFacade = this.getApiElementProcessingFacade(remoteProjectName, branchName, includeDerievd);
 				processingFacade.getTraversal().visit(element);
 				processingFacade.commit(element);
 				System.out.println();
@@ -434,8 +434,8 @@ public String publish(String elementName, String projectName, String branchName,
 
 	protected String publish(String name) {
 		return "-h".equals(name)? 
-				publish(null, null, null, Collections.singletonList("true")):
-				publish(name, null, null, Collections.emptyList());
+				publish(null, null, null, false, Collections.singletonList("true")):
+				publish(name, null, null, false, Collections.emptyList());
 	}
 
 	public String loadByName(String projectName, String branchName, List<String> help) {
@@ -552,10 +552,10 @@ public String listPublications(List<String> help) {
 				.collect(Collectors.joining("\n"));
 	}
 
-	protected ApiElementProcessingFacade getApiElementProcessingFacade(String modelName, String branchName) {
+	protected ApiElementProcessingFacade getApiElementProcessingFacade(String modelName, String branchName, boolean includeDerived) {
 		System.out.println("API base path: " + this.apiBasePath);
 		ApiElementProcessingFacade processingFacade = new ApiElementProcessingFacade(modelName, branchName, this.apiBasePath);	
-		processingFacade.setIsIncludeDerived(true);
+		processingFacade.setIsIncludeDerived(includeDerived);
 		processingFacade.setTraversal(new Traversal(processingFacade));
 		return processingFacade;
 	}

org.omg.sysml.interactive/src/org/omg/sysml/interactive/SysMLInteractiveHelp.java

@@ -82,6 +82,7 @@ public class SysMLInteractiveHelp {
 			  "Usage: %publish <NAME>\n\n"
 			+ "Publish the model elements rooted in <NAME> to the repository. <NAME> must be fully qualified.\n"
 			+ "Use the --project parameter to specify a project to create or update. If not specified, a new project is created with the name of the model element and a timestamp.\n"
+			+ "Use the -d flag to include derived properties\n"
 			+ "(Experimental) Use --branch to specify the target branch name. If not specified, the default branch is selected.\n";
 
     private static final String VIZ_HELP_STRING =

org.omg.sysml.jupyter.kernel/src/main/java/org/omg/sysml/jupyter/kernel/magic/Publish.java

@@ -31,6 +31,7 @@ public class Publish {
     		.optional("element")
     		.keyword("project")
     		.keyword("branch")
+    		.flag("derived", 'd', "false")
             .flag("help", 'h', "true")
     		.build();
 
@@ -43,7 +44,8 @@ public static String publish(List<String> args) {
         String element = elements.isEmpty()? null:elements.get(0);
         String project = projects.isEmpty()? null:projects.get(0);
         String branch = branches.isEmpty()? null:branches.get(0);
+        boolean includeDerived = !vals.get("derived").isEmpty();
         List<String> help = vals.get("help");
-        return ISysML.getKernelInstance().getInteractive().publish(element, project, branch, help);
+        return ISysML.getKernelInstance().getInteractive().publish(element, project, branch, includeDerived, help);
     }
 }

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

@@ -178,7 +178,9 @@ protected org.omg.sysml.model.Element createApiModelElement(Element element) {
 		for (EStructuralFeature feature: eClass.getEAllStructuralFeatures()) {
 			String className = eClass.getName();
 			String featureName = feature.getName();
-			if ((this.isIncludeDerived() || !feature.isDerived()) && 
+			//always add the importedElement derived field. This field is used for a workaround that addresses
+			//unstable library membership UUIDs in the EMFModelRefresher.
+			if ((this.isIncludeDerived() || !feature.isDerived() || "importedElement".equals(feature.getName())) && 
 					// Skip implementation-specific features.
 					!(/*"Feature".equals(className) && */"isNonunique".equals(featureName) || 
 					  "OperatorExpression".equals(className) && "operand".equals(featureName) ||