Merge branch 'release/2020-06-rc1'

Author: ivan-gomes

app/controllers/RelationshipController.java

@@ -6,6 +6,7 @@
 import jackson.JsonLdMofObjectAdornment;
 import org.omg.sysml.metamodel.MofObject;
 import org.omg.sysml.metamodel.Relationship;
+import org.omg.sysml.utils.RelationshipDirection;
 import play.Environment;
 import play.libs.Json;
 import play.mvc.Controller;
@@ -15,10 +16,7 @@
 import services.RelationshipService;
 
 import javax.inject.Inject;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -57,8 +55,14 @@ public Result create(Http.Request request) {
         return responseRelationship.map(e -> created(Json.toJson(e))).orElseGet(Results::internalServerError);
     }
 
-    public Result getRelationshipsByProjectIdCommitIdRelatedElementId(UUID projectId, UUID commitId, UUID elementId, Http.Request request) {
-        Set<Relationship> relationships = relationshipService.getRelationshipsByProjectCommitRelatedElement(projectId, commitId, elementId);
+    public Result getRelationshipsByProjectIdCommitIdRelatedElementId(UUID projectId, UUID commitId, UUID elementId, Optional<String> direction, Http.Request request) {
+        RelationshipDirection relDirection = direction
+                .flatMap(d -> Arrays.stream(RelationshipDirection.values())
+                        .filter(rd -> rd.toString().equalsIgnoreCase(d))
+                        .findAny())
+                .orElse(RelationshipDirection.BOTH);
+
+        Set<Relationship> relationships = relationshipService.getRelationshipsByProjectCommitRelatedElement(projectId, commitId, elementId, relDirection);
         boolean respondWithJsonLd = ElementController.respondWithJsonLd(request);
         return ok(JacksonHelper.collectionValueToTree(Set.class,
                 respondWithJsonLd ? JsonLdMofObjectAdornment.class : metamodelProvider.getImplementationClass(Relationship.class),

app/org/omg/sysml/metamodel/Activity.java …mg/sysml/metamodel/ActionDefinition.javaapp/org/omg/sysml/metamodel/Activity.java renamed to app/org/omg/sysml/metamodel/ActionDefinition.java app/org/omg/sysml/metamodel/Activity.java renamed to app/org/omg/sysml/metamodel/ActionDefinition.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface Activity extends Behavior, Definition, MofObject {
+public interface ActionDefinition extends Behavior, Definition, MofObject {
     Collection<? extends ActionUsage> getAction();
 }

app/org/omg/sysml/metamodel/ActionUsage.java

@@ -5,9 +5,5 @@
 import java.util.Set;
 
 public interface ActionUsage extends Step, Usage, MofObject {
-    Collection<? extends Behavior> getActivity();
-
-    Definition getActionOwningDefinition();
-
-    Usage getActionOwningUsage();
+    Collection<? extends Behavior> getActionDefinition();
 }

app/org/omg/sysml/metamodel/AnalysisCaseDefinition.java

@@ -0,0 +1,11 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface AnalysisCaseDefinition extends CaseDefinition, MofObject {
+    Collection<? extends ActionUsage> getAnalysisAction();
+
+    Expression getResultExpression();
+}

app/org/omg/sysml/metamodel/AnalysisCaseUsage.java

@@ -0,0 +1,13 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface AnalysisCaseUsage extends CaseUsage, MofObject {
+    Collection<? extends ActionUsage> getAnalysisAction();
+
+    AnalysisCaseDefinition getAnalysisCaseDefinition();
+
+    Expression getResultExpression();
+}

…mg/sysml/metamodel/AssociationBlock.java …sysml/metamodel/AttributeDefinition.javaapp/org/omg/sysml/metamodel/AssociationBlock.java renamed to app/org/omg/sysml/metamodel/AttributeDefinition.java app/org/omg/sysml/metamodel/AssociationBlock.java renamed to app/org/omg/sysml/metamodel/AttributeDefinition.java

@@ -4,6 +4,6 @@
 import java.util.List;
 import java.util.Set;
 
-public interface AssociationBlock extends Association, Block, MofObject {
+public interface AttributeDefinition extends DataType, Definition, MofObject {
 
 }

app/org/omg/sysml/metamodel/AttributeUsage.java

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface AttributeUsage extends Usage, MofObject {
+    Collection<? extends DataType> getAttributeDefinition();
+}

app/org/omg/sysml/metamodel/BlockProperty.java

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface CalculationDefinition extends Function, ActionDefinition, MofObject {
+    Collection<? extends CalculationUsage> getCalculationUsage();
+}

app/org/omg/sysml/metamodel/CalculationDefinition.java

@@ -0,0 +1,9 @@
+package org.omg.sysml.metamodel;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+public interface CalculationUsage extends Expression, ActionUsage, MofObject {
+    Function getCalculationDefinition();
+}