ST6RI-682 Made some editorial corrections and added issue aggregation

for EMF transformation

Author: TheKorpos

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

@@ -489,6 +489,7 @@ private String load(RepositoryProject repositoryProject) {
 
 		System.out.println("Downloading model...");
 		ProjectDelta delta = fetcher.fetch();
+		fetcher.getIssues().forEach(System.out::println);
 
 		System.out.println("Adding model to index");
 		delta.getProjectRoots().forEach((eObject, dto) -> {

org.omg.sysml.xtext/src/org/omg/sysml/xtext/util/SysMLRepositoryLoadUtil.java

@@ -40,6 +40,7 @@
 import org.omg.sysml.util.repository.ProjectDelta;
 import org.omg.sysml.util.repository.ProjectRepository;
 import org.omg.sysml.util.repository.ProjectRepository.RepositoryProject;
+import org.omg.sysml.util.traversal.facade.impl.ApiElementProcessingFacade;
 import org.omg.sysml.util.repository.RepositoryContentFetcher;
 import org.omg.sysml.xmi.SysMLxStandaloneSetup;
 import org.omg.sysml.xtext.SysMLStandaloneSetup;
@@ -60,7 +61,7 @@ public static SysMLRepositoryLoadUtil createUsingArgs(String... args) throws Par
 		var localLibrary = new Option("l", "library", true, "Path to local library");
 		localLibrary.setRequired(true);
 
-		var repositoryOption = new Option("b", "base", true, "Repository url. E.g: http://localhost:9000");
+		var repositoryOption = new Option("b", "base", true, "Repository url. E.g: " + ApiElementProcessingFacade.DEFAULT_BASE_PATH);
 		repositoryOption.setRequired(false);
 
 		OptionGroup projectOption = new OptionGroup();
@@ -82,7 +83,7 @@ public static SysMLRepositoryLoadUtil createUsingArgs(String... args) throws Par
 		CommandLine cli = parser.parse(options, args);
 
 		return new SysMLRepositoryLoadUtil(
-					cli.hasOption(repositoryOption)? cli.getOptionValue(repositoryOption) : "http://localhost:9000",
+					cli.hasOption(repositoryOption)? cli.getOptionValue(repositoryOption) : ApiElementProcessingFacade.DEFAULT_BASE_PATH,
 					cli.hasOption(projectNameOption)? cli.getOptionValue(projectNameOption) : cli.getOptionValue(projectIdOption),
 					cli.getOptionValue(targetOption),
 					new File(cli.getOptionValue(localLibrary))
@@ -129,6 +130,9 @@ public void load() {
 		RepositoryContentFetcher repositoryFetcher = new RepositoryContentFetcher(repositoryProject, tracker);
 		System.out.println("Fetching project...");
 		ProjectDelta delta = repositoryFetcher.fetch();
+		
+		repositoryFetcher.getIssues().forEach(System.out::println);
+		
 		ResourceSet resourceSet = getResourceSet();
 
 		try {

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

@@ -24,9 +24,11 @@
 
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -60,6 +62,8 @@ public class RepositoryContentFetcher {
 
 	private static Set<String> disabledStructuralFeatures = Set.of("importedMembership");
 
+	private final List<Issue> issues = new LinkedList<>();
+	
 	/**
 	 * @param repositoryProject as the input
 	 * @param tracker index based on element UUIDs
@@ -76,6 +80,7 @@ public RepositoryContentFetcher(RepositoryProject repositoryProject, EObjectUUID
 	 * @return project diff. (currently just a container for the entire model downloaded from the project)
 	 */
 	public ProjectDelta fetch() {
+		issues.clear();
 		boolean success = repositoryProject.loadRemote();
 
 		if (!success) throw new RuntimeException("Couldn't download project: " + repositoryProject.getProjectName());
@@ -94,8 +99,8 @@ public ProjectDelta fetch() {
 		tracker.forEachTrackedUserElement((id, langElement) -> {
 			Element element = repositoryProject.getElement(id);
 			if (element != null && isNotStandardLibraryElement(langElement)) {
-				tranformCrossreferences(langElement, element);
-				tranformAttributes(langElement, element);
+				tranformCrossReferences(langElement, element);
+				transformAttributes(langElement, element);
 				//set importedMemberships for MembershipImports
 				setImportedMembership(langElement, element);
 			}
@@ -130,10 +135,9 @@ private void setImportedMembership(EObject langElement, Element dto) {
 			//this is a workaround to address library element proxies where UUIDs of referenced Memberships aren't stable,
 			//so the importedElement UUID is used instead.
 			Object importedMembers = dto.get("importedElement");
-			EObject resolvedReference = resolveReference(importedMembers, false);
-			if (resolvedReference != null) {
+			resolveReference(importedMembers, false).ifPresent(resolvedReference -> {
 				membershipImport.setImportedMembership(((org.omg.sysml.lang.sysml.Element) resolvedReference).getOwningMembership());
-			}
+			});
 		}
 	}
 
@@ -153,7 +157,7 @@ private boolean isNotStandardLibraryElement(EObject langElement) {
 	}
 
 	private void transformContainmentReferences(EObject langElement, Element remoteElement) {
-		for (EStructuralFeature feature: getStructuralFeatuers(langElement))
+		for (EStructuralFeature feature: getStructuralFeatures(langElement))
 		{
 			if (!feature.isDerived() && remoteElement.get(feature.getName()) != null) {
 				if (feature instanceof EReference reference && reference.isContainment()) {
@@ -163,8 +167,8 @@ private void transformContainmentReferences(EObject langElement, Element remoteE
 		}
 	}
 
-	private void tranformCrossreferences(EObject langElement, Element remoteElement) {
-		for (EStructuralFeature feature: getStructuralFeatuers(langElement))
+	private void tranformCrossReferences(EObject langElement, Element remoteElement) {
+		for (EStructuralFeature feature: getStructuralFeatures(langElement))
 		{
 			if (!feature.isDerived() && remoteElement.containsKey(feature.getName())) {
 				if (feature instanceof EReference reference) {
@@ -178,8 +182,8 @@ private void tranformCrossreferences(EObject langElement, Element remoteElement)
 		}
 	}
 
-	private void tranformAttributes(EObject langElement, Element remoteElement) {
-		for (EStructuralFeature feature: getStructuralFeatuers(langElement))
+	private void transformAttributes(EObject langElement, Element remoteElement) {
+		for (EStructuralFeature feature: getStructuralFeatures(langElement))
 		{
 			if (!feature.isDerived() && remoteElement.containsKey(feature.getName())) {
 				if (feature instanceof EAttribute reference) {
@@ -189,7 +193,7 @@ private void tranformAttributes(EObject langElement, Element remoteElement) {
 		}
 	}
 
-	private static Collection<EStructuralFeature> getStructuralFeatuers(EObject langElement){
+	private static Collection<EStructuralFeature> getStructuralFeatures(EObject langElement){
 		EClass eClass = langElement.eClass();
 
 		Set<EObject> allRedefined = eClass.getEAllStructuralFeatures().stream()
@@ -208,33 +212,31 @@ private void transformStructuralFeature(EObject langElement,  Element remoteElem
 					Object value = remoteElement.get(feature.getName());
 					if (value instanceof Collection valueCollection) {
 						for (Object referenceValue: valueCollection) {
-							EObject referencedLangElement = resolveReference(referenceValue, isContainment);
-							if (referencedLangElement != null) {
-								referenceList.add(referencedLangElement);
-							}
+							resolveReference(referenceValue, isContainment).ifPresent(referenceList::add);
 						}
 					} 
 				} else {
 					Object value = remoteElement.get(feature.getName());
 					if (value != null) {
-						langElement.eSet(feature, isReference? resolveReference(value, isContainment) : transformAttributeValue(value, feature));
+						langElement.eSet(feature, isReference? resolveReference(value, isContainment).orElse(null) : transformAttributeValue(value, feature));
 					}
 				}
 			}
-			catch (Exception e) {
-				System.out.printf("Unable to set structural feature %s::%s %n", feature.getEContainingClass().getName(), feature.getName());
+			catch (IllegalArgumentException e) {
+				//handle EObject.eGet, eSet errors
+				issues.add(new Issue(String.format("Unable to set structural feature %s because %s ha no such feature.", feature.getName(), feature.getEType().getName())));
 			}
 		}
 	}
 
-	private EObject resolveReference(Object referenceValue, boolean isContainment) {
+	private Optional<EObject> resolveReference(Object referenceValue, boolean isContainment) {
 		if (referenceValue instanceof Map referenceObjectMap) {
 			Object refUUID = referenceObjectMap.get("@id");
 			Element referencedElement = repositoryProject.getElement(UUID.fromString(refUUID.toString()));
 			EObject referencedLangElement = isContainment? transform(referencedElement) : tracker.get(UUID.fromString(refUUID.toString()));
-			return referencedLangElement;
+			return Optional.ofNullable(referencedLangElement);
 		}
-		return null;		
+		return Optional.empty();		
 	}
 
 
@@ -257,4 +259,20 @@ private Object transformAttributeValue(Object attributeValue, EStructuralFeature
 
 		return null;		
 	}
+	
+	public List<Issue> getIssues() {
+		return issues;
+	}
+	
+	public static class Issue {
+		private final String message;
+
+		public Issue(String message) {
+			this.message = message;
+		}
+		
+		public String getMessage() {
+			return message;
+		}
+	}
 }

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

@@ -122,11 +122,8 @@ public Object process(Element element) {
 	public boolean commit() {
 		try {
 			this.project = projectApi.postProject(this.project);
-			
 			List<DataVersion> changes = this.getVersions();
 			Commit commit = new Commit().change(changes);
-//			System.out.println(new org.omg.sysml.JSON().serialize(commit));
-			
 			int n = changes.size();
 			System.out.print("\nPosting Commit (" + n + " element" + (n == 1? ")...": "s)..."));
 			commit = this.commitApi.postCommitByProject(this.project.getAtId(), commit, null);