PagedResult concept

.editorconfig

@@ -6,25 +6,29 @@ indent_size = 4
 
 [*.cs]
 
-#### 1. Layout & wrapping — Rider: WRAP_LIMIT, WRAP_LINES, LINE_FEED_AT_FILE_END, PLACE_COMMENTS_AT_FIRST_COLUMN, MAX_ENUM_MEMBERS_ON_LINE
+#### 1. Layout & wrapping — Rider: WRAP_LIMIT, WRAP_LINES, LINE_FEED_AT_FILE_END, PLACE_COMMENTS_AT_FIRST_COLUMN, MAX_ENUM_MEMBERS_ON_LINE, WRAP_OBJECT_AND_COLLECTION_INITIALIZER_STYLE, WRAP_ARRAY_INITIALIZER_STYLE
 indent_style = space
 indent_size = 4
 tab_width = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
 max_line_length = 180
-resharper_wrap_lines = false
+resharper_wrap_lines = true
 resharper_place_comments_at_first_column = true
 resharper_max_enum_members_on_line = 1
 resharper_place_accessorholder_attribute_on_same_line = never
+resharper_wrap_object_and_collection_initializer_style = wrap_if_long
+resharper_wrap_array_initializer_style = wrap_if_long
+resharper_place_simple_initializer_on_single_line = true
+resharper_max_initializer_elements_on_line = 100
 
 #### 2. Braces — Allman, and required on every control statement (Rider: BRACES_FOR_IFELSE/_FOR/_FOREACH/_WHILE = Required)
 csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
 csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = false
+csharp_new_line_before_members_in_anonymous_types = false
 csharp_new_line_between_query_expression_clauses = true
 csharp_prefer_braces = true:warning
 resharper_braces_for_ifelse = required

SySML2.NET.REST/IRestClient.cs

@@ -1,20 +1,20 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="IRestClient.cs" company="Starion Group S.A.">
-// 
+//
 //   Copyright 2022-2026 Starion Group S.A.
-// 
+//
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-// 
+//
 //        http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 //    Unless required by applicable law or agreed to in writing, software
 //    distributed under the License is distributed on an "AS IS" BASIS,
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
-// 
+//
 // </copyright>
 // ------------------------------------------------------------------------------------------------
 
@@ -24,9 +24,9 @@ namespace SySML2.NET.REST
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using System.Threading;
-    
-    using SysML2.NET.PIM;
-    using SysML2.NET.PIM.DTO;
+
+    using SysML2.NET.PSM;
+    using SysML2.NET.PSM.DTO;
     using SysML2.NET.Core.DTO.Root.Elements;
 
     /// <summary>

SySML2.NET.REST/RestClient.cs

@@ -1,20 +1,20 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="RestClient.cs" company="Starion Group S.A.">
-// 
+//
 //   Copyright 2022-2026 Starion Group S.A.
-// 
+//
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-// 
+//
 //        http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 //    Unless required by applicable law or agreed to in writing, software
 //    distributed under the License is distributed on an "AS IS" BASIS,
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
-// 
+//
 // </copyright>
 // ------------------------------------------------------------------------------------------------
 
@@ -30,10 +30,10 @@ namespace SySML2.NET.REST
     using Microsoft.Extensions.Logging;
     using Microsoft.Extensions.Logging.Abstractions;
 
-    using SysML2.NET.PIM;
-    using SysML2.NET.PIM.DTO;
+    using SysML2.NET.PSM;
     using SysML2.NET.Common;
     using SysML2.NET.Core.DTO.Root.Elements;
+    using SysML2.NET.PSM.DTO;
     using SysML2.NET.Serializer.Json;
 
     /// <summary>
@@ -113,7 +113,7 @@ public async Task<IEnumerable<Project>> Open(string username, string password, s
             try
             {
                 this.baseUri = uri;
-                
+
                 var projects = await this.RequestProjects(null, null, cancellationToken);
                 return projects;
             }
@@ -157,7 +157,7 @@ public async Task<IEnumerable<Project>> RequestProjects(Guid? project, QueryPara
             var requestUri = project == null ? new Uri($"{this.baseUri}/projects{queryParameters}") : new Uri($"{this.baseUri}/projects/{project}{queryParameters}");
 
             var data = await this.RequestData(requestUri, cancellationToken);
-            
+
             if (data != null && data.Any())
             {
                 return data.OfType<Project>();
@@ -336,7 +336,7 @@ public async Task<IEnumerable<IElement>> RequestElements(Guid project, Guid comm
             }
 
             return Enumerable.Empty<IElement>();
-            
+
         }
 
         /// <summary>
@@ -406,7 +406,7 @@ private async Task<IEnumerable<IIdentified>> RequestData(Uri requestUri, Cancell
                 Method = HttpMethod.Get,
                 RequestUri = requestUri,
             };
-            
+
             using var response = await this.httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
 
             response.EnsureSuccessStatusCode();

SySML2.NET.REST/SySML2.NET.REST.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
       <TargetFrameworks>netstandard2.1;net10.0</TargetFrameworks>
       <LangVersion>14.0</LangVersion>
-      <Version>0.24.0</Version>
+      <Version>0.24.1</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>
@@ -14,7 +14,7 @@
       <Authors>Sam Gerené</Authors>
       <RequireLicenseAcceptance>true</RequireLicenseAcceptance>
       <PackageReleaseNotes>
-          [Fix] Build warnings cleared; log statements in the RestClient are guarded by a level check (#280)
+          [Update] IRestClient and RestClient aligned with the move of QueryParameters, Page and PagedResult to the SysML2.NET.PSM namespace
       </PackageReleaseNotes>
       <PackageIcon>cdp4-icon.png</PackageIcon>
       <PackageReadmeFile>README.md</PackageReadmeFile>

SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net10.0</TargetFramework>
     <LangVersion>14.0</LangVersion>
-    <Version>0.24.0</Version>
+    <Version>0.24.1</Version>
     <Description>A Library to generate SysML v2 code.</Description>
     <PackageId>SysML2.NET</PackageId>
     <Company>Starion Group S.A.</Company>

SysML2.NET.Dal/SysML2.NET.Dal.csproj

@@ -3,7 +3,7 @@
    <PropertyGroup>
       <TargetFrameworks>netstandard2.1;net10.0</TargetFrameworks>
        <LangVersion>14.0</LangVersion>
-       <Version>0.24.0</Version>
+       <Version>0.24.1</Version>
       <Description>A .NET implementation of the OMG SysML v2 specification data-acces-layer.</Description>
       <PackageId>SysML2.NET.Dal</PackageId>
       <Company>Starion Group S.A.</Company>
@@ -14,7 +14,7 @@
       <Authors>Sam Gerené</Authors>
       <RequireLicenseAcceptance>true</RequireLicenseAcceptance>
       <PackageReleaseNotes>
-          [Fix] Build warnings cleared; log statements in the Assembler are guarded by a level check (#280)
+          [Update] Aligned with SysML2.NET 0.24.1
       </PackageReleaseNotes>
        <PackageIcon>cdp4-icon.png</PackageIcon>
        <PackageReadmeFile>README.md</PackageReadmeFile>

SysML2.NET.Extensions/SysML2.NET.Extensions.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;net10.0</TargetFrameworks>
         <LangVersion>14.0</LangVersion>
-        <Version>0.24.0</Version>
+        <Version>0.24.1</Version>
         <Description>A .NET implementation of the OMG SysML v2 specification Extension and Helper methods.</Description>
         <PackageId>SysML2.NET.Extensions</PackageId>
         <Company>Starion Group S.A.</Company>
@@ -14,7 +14,7 @@
         <Authors>Sam Gerené</Authors>
         <RequireLicenseAcceptance>true</RequireLicenseAcceptance>
         <PackageReleaseNotes>
-            [Add] Enum providers for the PSM constraint operator enumerations, generated from the Systems Modeling API and Services OpenAPI document (#367)
+            [Update] Aligned with SysML2.NET 0.24.1
         </PackageReleaseNotes>
         <PackageIcon>cdp4-icon.png</PackageIcon>
         <PackageReadmeFile>README.md</PackageReadmeFile>

SysML2.NET.Kpar/SysML2.NET.Kpar.csproj

@@ -5,7 +5,7 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.1;net10.0</TargetFrameworks>
         <LangVersion>14.0</LangVersion>
-        <Version>0.24.0</Version>
+        <Version>0.24.1</Version>
         <Description>A .NET implementation of the OMG SysML v2 specification.</Description>
         <PackageId>SysML2.NET.Kpar</PackageId>
         <Company>Starion Group S.A.</Company>
@@ -16,7 +16,7 @@
         <Authors>Sam Gerené</Authors>
         <RequireLicenseAcceptance>true</RequireLicenseAcceptance>
         <PackageReleaseNotes>
-            [Fix] Build warnings cleared; log statements in the Reader are guarded by a level check (#280)
+            [Update] Aligned with SysML2.NET 0.24.1
         </PackageReleaseNotes>
         <PackageIcon>cdp4-icon.png</PackageIcon>
         <PackageReadmeFile>README.md</PackageReadmeFile>

SysML2.NET.Semantics/SysML2.NET.Semantics.csproj

@@ -4,7 +4,7 @@
         <TargetFrameworks>netstandard2.1;net10.0</TargetFrameworks>
         <LangVersion>14.0</LangVersion>
         <Nullable>disable</Nullable>
-        <Version>0.24.0</Version>
+        <Version>0.24.1</Version>
         <Description>A .NET implementation of the OMG SysML v2 specification semantic constraints and implied Relationships.</Description>
         <PackageId>SysML2.NET.Semantics</PackageId>
         <Company>Starion Group S.A.</Company>
@@ -15,7 +15,7 @@
         <Authors>Sam Gerené</Authors>
         <RequireLicenseAcceptance>true</RequireLicenseAcceptance>
         <PackageReleaseNotes>
-            [Fix] FeatureParameterRedefinitionRule resolves supertypes over the effective model, following implied Specializations as well as declared ones (KerML 8.4.2)
+            [Update] Aligned with SysML2.NET 0.24.1
         </PackageReleaseNotes>
         <PackageIcon>cdp4-icon.png</PackageIcon>
         <PackageReadmeFile>README.md</PackageReadmeFile>

SysML2.NET.Serializer.Json/DeSerializer.cs

@@ -34,6 +34,7 @@ namespace SysML2.NET.Serializer.Json
     using Microsoft.Extensions.Logging.Abstractions;
 
     using SysML2.NET.Common;
+    using SysML2.NET.PSM;
     using SysML2.NET.PSM.DTO;
     using SysML2.NET.Serializer.Json.Core.DTO;
     using SysML2.NET.Serializer.Json.PIM.DTO;

SysML2.NET.Serializer.Json/IDeSerializer.cs

@@ -1,20 +1,20 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="IDeSerializer.cs" company="Starion Group S.A.">
-// 
+//
 //   Copyright 2022-2026 Starion Group S.A.
-// 
+//
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-// 
+//
 //        http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 //    Unless required by applicable law or agreed to in writing, software
 //    distributed under the License is distributed on an "AS IS" BASIS,
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
-// 
+//
 // </copyright>
 // ------------------------------------------------------------------------------------------------
 
@@ -26,6 +26,7 @@ namespace SysML2.NET.Serializer.Json
     using System.Threading.Tasks;
 
     using SysML2.NET.Common;
+    using SysML2.NET.PSM;
     using SysML2.NET.PSM.DTO;
 
     /// <summary>

SysML2.NET.Serializer.Json/ISerializer.cs

@@ -1,20 +1,20 @@
 // -------------------------------------------------------------------------------------------------
 // <copyright file="ISerializer.cs" company="Starion Group S.A.">
-// 
+//
 //   Copyright 2022-2026 Starion Group S.A.
-// 
+//
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
-// 
+//
 //        http://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 //    Unless required by applicable law or agreed to in writing, software
 //    distributed under the License is distributed on an "AS IS" BASIS,
 //    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //    See the License for the specific language governing permissions and
 //    limitations under the License.
-// 
+//
 // </copyright>
 // ------------------------------------------------------------------------------------------------
 
@@ -27,6 +27,7 @@ namespace SysML2.NET.Serializer.Json
     using System.Threading.Tasks;
 
     using SysML2.NET.Common;
+    using SysML2.NET.PSM;
     using SysML2.NET.PSM.DTO;
 
     /// <summary>

SysML2.NET.Serializer.Json/PSM/ConstraintValueReader.cs

@@ -22,6 +22,7 @@ namespace SysML2.NET.Serializer.Json.PSM
 {
     using System.Text.Json;
 
+    using SysML2.NET.PSM;
     using SysML2.NET.PSM.DTO;
     using SysML2.NET.Serializer.Json.Utility;
 

SysML2.NET.Serializer.Json/PSM/DeSerializeRequestDelegate.cs

@@ -24,6 +24,7 @@ namespace SysML2.NET.Serializer.Json.PSM
 
     using Microsoft.Extensions.Logging;
 
+    using SysML2.NET.PSM;
     using SysML2.NET.PSM.DTO;
 
     /// <summary>

SysML2.NET.Serializer.Json/PSM/DeSerializeResponseDelegate.cs

@@ -24,6 +24,7 @@ namespace SysML2.NET.Serializer.Json.PSM
 
     using Microsoft.Extensions.Logging;
 
+    using SysML2.NET.PSM;
     using SysML2.NET.PSM.DTO;
 
     /// <summary>

SysML2.NET.Serializer.Json/PSM/PsmDeSerializationDispatcher.cs

@@ -26,6 +26,7 @@ namespace SysML2.NET.Serializer.Json.PSM
     using Microsoft.Extensions.Logging;
 
     using SysML2.NET.Common;
+    using SysML2.NET.PSM;
     using SysML2.NET.PSM.DTO;
     using SysML2.NET.Serializer.Json.Utility;