ST6RI-864 Implemented node succession specializations.

Satisfied in SuccessionAsUsageAdapter:
- checkDecisionNodeOutgoingSuccessionSpecialization
- checkMergeNodeIncomingSuccessionSpecialization

Author: seidewitz

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/simpletests/ControlNodeTest.sysml.xt

@@ -65,7 +65,12 @@ action def ControlNodeTest {
 	action B1 {
 	    in b;
 	}
+	then M;
+	
 	action B2 {
 	    in b;
 	}
+	then M; 
+	
+	merge M;
 }

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/simpletests/DecisionTest.sysml.xt

@@ -58,7 +58,7 @@ action def DecisionTest {
 	if x > 1 then A2;
 	else A3; 
 
-	then decide; 
+	then decide D; 
 	if true then A1;
 	if false then A2;
 

org.omg.sysml/src/org/omg/sysml/adapter/SuccessionAsUsageAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2024, 2025 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -21,10 +21,15 @@
 
 package org.omg.sysml.adapter;
 
+import org.omg.sysml.lang.sysml.DecisionNode;
+import org.omg.sysml.lang.sysml.Feature;
+import org.omg.sysml.lang.sysml.MergeNode;
 import org.omg.sysml.lang.sysml.Namespace;
 import org.omg.sysml.lang.sysml.SuccessionAsUsage;
 import org.omg.sysml.lang.sysml.TransitionUsage;
 import org.omg.sysml.util.ElementUtil;
+import org.omg.sysml.util.FeatureUtil;
+import org.omg.sysml.util.UsageUtil;
 
 public class SuccessionAsUsageAdapter extends SuccessionAdapter {
 
@@ -47,9 +52,42 @@ protected void addContextFeaturingType() {
 		}
 	}
 
+	@Override
+	public void addDefaultGeneralType() {
+		super.addDefaultGeneralType();
+		addDecisionNodeOutgoingSuccessionSpecialization();
+		addMergeNodeIncomingSuccessionSpecialization();
+	}
+	
+	/**
+	 * @satisfies checkDecisionNodeOutgoingSuccessionSpecialization
+	 * 
+	 * TODO: Update checkDecisionNodeOutgoingSuccessionSpecialization
+	 * 
+	 * OCL refers to MergePerformance::outgoingHBLink rather than DecisionPerformance::outgoingHBLink.
+	 * See SYSML21-306
+	 */
+	protected void addDecisionNodeOutgoingSuccessionSpecialization() {
+		SuccessionAsUsage succession = getTarget();
+		// Note: Use utility method to get source feature, to avoid infinite recursion.
+		Feature sourceFeature = UsageUtil.getSourceOf(succession);
+		if (sourceFeature instanceof DecisionNode) {
+			addImplicitGeneralType(getSpecializationEClass(), 
+					FeatureUtil.chainFeatures(sourceFeature, (Feature)getLibraryType(getDefaultSupertype("decision"))));
+		}
+	}
+	
 	/**
-	 * TODO: checkDecisionNodeOutgoingSuccessionSpecialization
-	 * TODO: checkMergeNodeIncomingSuccessionSpecialization
+	 * @satisfies checkMergeNodeIncomingSuccessionSpecialization
 	 */
+	protected void addMergeNodeIncomingSuccessionSpecialization() {
+		SuccessionAsUsage succession = getTarget();
+		// Note: Use utility method to get target feature, to avoid infinite recursion.
+		Feature targetFeature = UsageUtil.getTargetOf(succession);
+		if (targetFeature instanceof MergeNode) {
+			addImplicitGeneralType(getSpecializationEClass(), 
+					FeatureUtil.chainFeatures(targetFeature, (Feature)getLibraryType(getDefaultSupertype("merge"))));
+		}
+	}
 
 }

org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java

@@ -511,6 +511,10 @@ protected ImplicitGeneralizationMap() {
 		put(SuccessionAsUsageImpl.class, "base", "Occurrences::happensBeforeLinks");
 		//checkSuccessionSpecialization
 		put(SuccessionAsUsageImpl.class, "binary", "Occurrences::happensBeforeLinks");
+		//checkDecisionNodeOutgoingSuccessionSpecialization
+		put(SuccessionAsUsageImpl.class, "decision", "ControlPerformances::DecisionPerformance::outgoingHBLink");
+		//checkMergeNodeIncomingSuccessionSpecialization
+		put(SuccessionAsUsageImpl.class, "merge", "ControlPerformances::MergePerformance::incomingHBLink");
 
 		//checkSuccessionFlowUsageSpecialization
 		put(SuccessionFlowUsageImpl.class, "base", "Flows::successionFlows");

org.omg.sysml/src/org/omg/sysml/util/UsageUtil.java

@@ -50,6 +50,7 @@
 import org.omg.sysml.lang.sysml.Namespace;
 import org.omg.sysml.lang.sysml.ObjectiveMembership;
 import org.omg.sysml.lang.sysml.ParameterMembership;
+import org.omg.sysml.lang.sysml.ReferenceSubsetting;
 import org.omg.sysml.lang.sysml.RenderingUsage;
 import org.omg.sysml.lang.sysml.RequirementConstraintKind;
 import org.omg.sysml.lang.sysml.RequirementConstraintMembership;
@@ -194,6 +195,17 @@ public static Expression getArgumentOf(ActionUsage action, int i) {
 
 	// SuccessionAsUsages
 
+	public static Feature getSourceOf(Feature succession) {
+		List<Feature> ends = succession.getOwnedEndFeature();
+		if (!ends.isEmpty()) {
+			ReferenceSubsetting referenceSubsetting = ends.get(0).getOwnedReferenceSubsetting();
+			if (referenceSubsetting != null) {
+				return referenceSubsetting.getReferencedFeature();
+			}
+		}
+		return getSourceFeature(succession);
+	}
+	
 	public static Feature getSourceFeature(Feature feature) {
 		Namespace owningNamespace = feature.getOwningNamespace();
 		if (owningNamespace instanceof TransitionUsage) {
@@ -205,6 +217,17 @@ public static Feature getSourceFeature(Feature feature) {
 		return getPreviousFeature(feature);
 	}
 
+	public static Feature getTargetOf(Feature succession) {
+		List<Feature> ends = succession.getOwnedEndFeature();
+		if (ends.size() > 1) {
+			ReferenceSubsetting referenceSubsetting = ends.get(1).getOwnedReferenceSubsetting();
+			if (referenceSubsetting != null) {
+				return referenceSubsetting.getReferencedFeature();
+			}
+		}
+		return getTargetFeature(succession);
+	}
+	
 	public static Feature getTargetFeature(Feature feature) {
 		Type type = feature.getOwningType();
 		if (type == null) {

sysml/src/examples/Simple Tests/ControlNodeTest.sysml

@@ -24,7 +24,12 @@ action def ControlNodeTest {
 	action B1 {
 	    in b;
 	}
+	then M;
+	
 	action B2 {
 	    in b;
 	}
+	then M; 
+	
+	merge M;
 }

sysml/src/examples/Simple Tests/DecisionTest.sysml

@@ -6,7 +6,7 @@ action def DecisionTest {
 	if x > 1 then A2;
 	else A3; 
 
-	then decide; 
+	then decide D; 
 	if true then A1;
 	if false then A2;