Skip to content

Commit

Permalink
[Update] to SysML2.NET version 0.14.0
Browse files Browse the repository at this point in the history
[Update] SysML.ecore from source git repos - [TAG: 2024-07] (regenerate code)
  • Loading branch information
samatstariongroup committed Aug 11, 2024
1 parent a963318 commit e0c7e28
Show file tree
Hide file tree
Showing 135 changed files with 2,081 additions and 1,353 deletions.
2 changes: 1 addition & 1 deletion SySML2.NET.REST/SySML2.NET.REST.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<Version>0.13.0</Version>
<Version>0.14.0</Version>
<Description>A .NET implementation of the OMG SysML v2 REST/HTTP PSM Client</Description>
<PackageId>SysML2.NET.REST</PackageId>
<Company>Starion Group S.A.</Company>
Expand Down
2 changes: 1 addition & 1 deletion SysML2.NET.API/SysML2.NET.API.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<Version>0.13.0</Version>
<Version>0.14.0</Version>
<Description>A .NET implementation of the REST/HTTP Platform-specific model (PSM) of the SysML v2 API and Services.</Description>
<Company>Starion Group S.A.</Company>
<Copyright>Copyright © Starion Group S.A.</Copyright>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,15 @@ public List<FeatureMembership> QueryFeatureMembership()
throw new NotImplementedException("Derived property FeatureMembership not yet supported");
}

/// <summary>
/// Queries the derived property FeatureTarget
/// </summary>
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
public Feature QueryFeatureTarget()
{
throw new NotImplementedException("Derived property FeatureTarget not yet supported");
}

/// <summary>
/// Queries the derived property FeaturingType
/// </summary>
Expand Down
17 changes: 16 additions & 1 deletion SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Feature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,13 @@ namespace SysML2.NET.Core.POCO
/// andownedTyping.type->includes(oclIsKindOf(Class)) andowningType <> null
/// and(owningType.oclIsKindOf(Class) or owningType.oclIsKindOf(Feature) and
/// owningType.oclAsType(Feature).type-> exists(oclIsKindOf(Class))) implies
/// specializesFromLibrary('Occurrence::Occurrence::portions')
/// specializesFromLibrary('Occurrence::Occurrence::portions')featureTarget = if
/// chainingFeature->isEmpty() then self else chainingFeature->last() endifowningType <> null
/// andowningType.oclIsKindOf(InvocationExpression) andlet owningInvocation: InvocationExpression =
/// owningType.oclAsType(InvocationExpression) inself = owningInvocation.result andnot
/// owningInvocation.ownedTyping->exists(oclIsKindOf(Function)) andnot
/// owningInvocation.ownedSubsetting->reject(isImplied).subsettedFeature.type->exists(oclIsKindOf(Function))
/// implies owningInvocation.ownedTyping->forAll(type | self.specializes(type))
/// </summary>
public partial class Feature : IFeature
{
Expand Down Expand Up @@ -244,6 +250,15 @@ public List<FeatureMembership> QueryFeatureMembership()
throw new NotImplementedException("Derived property FeatureMembership not yet supported");
}

/// <summary>
/// Queries the derived property FeatureTarget
/// </summary>
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
public Feature QueryFeatureTarget()
{
throw new NotImplementedException("Derived property FeatureTarget not yet supported");
}

/// <summary>
/// Queries the derived property FeaturingType
/// </summary>
Expand Down
14 changes: 13 additions & 1 deletion SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/IFeature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,13 @@ namespace SysML2.NET.Core.POCO
/// andownedTyping.type->includes(oclIsKindOf(Class)) andowningType <> null
/// and(owningType.oclIsKindOf(Class) or owningType.oclIsKindOf(Feature) and
/// owningType.oclAsType(Feature).type-> exists(oclIsKindOf(Class))) implies
/// specializesFromLibrary('Occurrence::Occurrence::portions')
/// specializesFromLibrary('Occurrence::Occurrence::portions')featureTarget = if
/// chainingFeature->isEmpty() then self else chainingFeature->last() endifowningType <> null
/// andowningType.oclIsKindOf(InvocationExpression) andlet owningInvocation: InvocationExpression =
/// owningType.oclAsType(InvocationExpression) inself = owningInvocation.result andnot
/// owningInvocation.ownedTyping->exists(oclIsKindOf(Function)) andnot
/// owningInvocation.ownedSubsetting->reject(isImplied).subsettedFeature.type->exists(oclIsKindOf(Function))
/// implies owningInvocation.ownedTyping->forAll(type | self.specializes(type))
/// </summary>
public partial interface IFeature : IType
{
Expand All @@ -131,6 +137,12 @@ public partial interface IFeature : IType
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
Type QueryEndOwningType();

/// <summary>
/// Queries the derived property FeatureTarget
/// </summary>
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
Feature QueryFeatureTarget();

/// <summary>
/// Queries the derived property FeaturingType
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ namespace SysML2.NET.Core.POCO
/// (the default), then only public Memberships are considered &quot;visible&quot;. If isImportAll =
/// true, then all Memberships are considered &quot;visible&quot;, regardless of their declared
/// visibility. If isRecursive = true, then visible Memberships are also recursively imported from owned
/// sub-Namespaces.
/// sub-Namespaces.importOwningNamespace.owningNamespace = null implies visibility =
/// VisibilityKind::private
/// </summary>
public partial interface IImport : IRelationship
{
Expand Down Expand Up @@ -67,6 +68,7 @@ public partial interface IImport : IRelationship

/// <summary>
/// The visibility level of the imported members from this Import relative to the importOwningNamespace.
/// The default is private.
/// </summary>
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
VisibilityKind Visibility { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,15 @@ public List<FeatureMembership> QueryFeatureMembership()
throw new NotImplementedException("Derived property FeatureMembership not yet supported");
}

/// <summary>
/// Queries the derived property FeatureTarget
/// </summary>
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
public Feature QueryFeatureTarget()
{
throw new NotImplementedException("Derived property FeatureTarget not yet supported");
}

/// <summary>
/// Queries the derived property FeaturingType
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,15 @@ public List<FeatureMembership> QueryFeatureMembership()
throw new NotImplementedException("Derived property FeatureMembership not yet supported");
}

/// <summary>
/// Queries the derived property FeatureTarget
/// </summary>
[EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
public Feature QueryFeatureTarget()
{
throw new NotImplementedException("Derived property FeatureTarget not yet supported");
}

/// <summary>
/// Queries the derived property FeaturingType
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public NamespaceImport()
this.OwnedRelationship = new List<IRelationship>();
this.Source = new List<IElement>();
this.Target = new List<IElement>();
this.Visibility = VisibilityKind.Public;
this.Visibility = VisibilityKind.Private;
}

/// <summary>
Expand Down Expand Up @@ -289,6 +289,7 @@ public List<TextualRepresentation> QueryTextualRepresentation()

/// <summary>
/// The visibility level of the imported members from this Import relative to the importOwningNamespace.
/// The default is private.
/// </summary>
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
public VisibilityKind Visibility { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,13 @@ namespace SysML2.NET.Core.DTO
/// andownedTyping.type->includes(oclIsKindOf(Class)) andowningType <> null
/// and(owningType.oclIsKindOf(Class) or owningType.oclIsKindOf(Feature) and
/// owningType.oclAsType(Feature).type-> exists(oclIsKindOf(Class))) implies
/// specializesFromLibrary('Occurrence::Occurrence::portions')
/// specializesFromLibrary('Occurrence::Occurrence::portions')featureTarget = if
/// chainingFeature->isEmpty() then self else chainingFeature->last() endifowningType <> null
/// andowningType.oclIsKindOf(InvocationExpression) andlet owningInvocation: InvocationExpression =
/// owningType.oclAsType(InvocationExpression) inself = owningInvocation.result andnot
/// owningInvocation.ownedTyping->exists(oclIsKindOf(Function)) andnot
/// owningInvocation.ownedSubsetting->reject(isImplied).subsettedFeature.type->exists(oclIsKindOf(Function))
/// implies owningInvocation.ownedTyping->forAll(type | self.specializes(type))
/// </summary>
public partial class Feature : IFeature
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,13 @@ namespace SysML2.NET.Core.DTO
/// andownedTyping.type->includes(oclIsKindOf(Class)) andowningType <> null
/// and(owningType.oclIsKindOf(Class) or owningType.oclIsKindOf(Feature) and
/// owningType.oclAsType(Feature).type-> exists(oclIsKindOf(Class))) implies
/// specializesFromLibrary('Occurrence::Occurrence::portions')
/// specializesFromLibrary('Occurrence::Occurrence::portions')featureTarget = if
/// chainingFeature->isEmpty() then self else chainingFeature->last() endifowningType <> null
/// andowningType.oclIsKindOf(InvocationExpression) andlet owningInvocation: InvocationExpression =
/// owningType.oclAsType(InvocationExpression) inself = owningInvocation.result andnot
/// owningInvocation.ownedTyping->exists(oclIsKindOf(Function)) andnot
/// owningInvocation.ownedSubsetting->reject(isImplied).subsettedFeature.type->exists(oclIsKindOf(Function))
/// implies owningInvocation.ownedTyping->forAll(type | self.specializes(type))
/// </summary>
public partial interface IFeature : IType
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ namespace SysML2.NET.Core.DTO
/// (the default), then only public Memberships are considered &quot;visible&quot;. If isImportAll =
/// true, then all Memberships are considered &quot;visible&quot;, regardless of their declared
/// visibility. If isRecursive = true, then visible Memberships are also recursively imported from owned
/// sub-Namespaces.
/// sub-Namespaces.importOwningNamespace.owningNamespace = null implies visibility =
/// VisibilityKind::private
/// </summary>
public partial interface IImport : IRelationship
{
Expand All @@ -55,6 +56,7 @@ public partial interface IImport : IRelationship

/// <summary>
/// The visibility level of the imported members from this Import relative to the importOwningNamespace.
/// The default is private.
/// </summary>
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
VisibilityKind Visibility { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public NamespaceImport()
this.OwnedRelationship = new List<Guid>();
this.Source = new List<Guid>();
this.Target = new List<Guid>();
this.Visibility = VisibilityKind.Public;
this.Visibility = VisibilityKind.Private;
}

/// <summary>
Expand Down Expand Up @@ -163,6 +163,7 @@ public NamespaceImport()

/// <summary>
/// The visibility level of the imported members from this Import relative to the importOwningNamespace.
/// The default is private.
/// </summary>
[EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
public VisibilityKind Visibility { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>11.0</LangVersion>
<Version>0.13.0</Version>
<Version>0.14.0</Version>
<Description>A Library to generate SysML v2 code.</Description>
<PackageId>SysML2.NET</PackageId>
<Company>Starion Group S.A.</Company>
Expand Down
Loading

0 comments on commit e0c7e28

Please sign in to comment.