Add constructor to ServiceDescription API (#341)

eclipse-aaspe · Aug 15, 2024 · f500250 · f500250
1 parent 3d8efc4
commit f500250
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/AasxServerBlazor/Configuration/ServerConfiguration.cs b/src/AasxServerBlazor/Configuration/ServerConfiguration.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using AasSecurity;
@@ -233,7 +233,8 @@ private static void AddSwaggerGen(IServiceCollection services) =>
                                                                                });
 
                                    swaggerGenOptions.EnableAnnotations();
-                                   swaggerGenOptions.CustomSchemaIds(type => type.FullName);
+                                   //Based on issue https://github.com/swagger-api/swagger-ui/issues/7911
+                                   swaggerGenOptions.CustomSchemaIds(type => type.FullName?.Replace("+", "."));
 
                                    var swaggerCommentedAssembly =
                                        typeof(AssetAdministrationShellRepositoryAPIApiController).Assembly.GetName().Name;

diff --git a/src/IO.Swagger.Lib.V3/Controllers/DescriptionAPIApi.cs b/src/IO.Swagger.Lib.V3/Controllers/DescriptionAPIApi.cs
@@ -25,6 +25,8 @@ public class DescriptionAPIApiController : ControllerBase
 {
     private readonly IServiceDescription _serviceDescription;
 
+    public DescriptionAPIApiController(IServiceDescription serviceDescription) => _serviceDescription = serviceDescription;
+
     /// <summary>
     /// Returns the self-describing information of a network resource (ServiceDescription)
     /// </summary>
@@ -41,7 +43,7 @@ public class DescriptionAPIApiController : ControllerBase
     public virtual IActionResult GetDescription()
     {
         var output = new ServiceDescription();
-        output.Profiles = new List<ServiceProfiles>
+        _serviceDescription.Profiles = new List<ServiceProfiles>
                                                     {
                                                         ServiceProfiles.AasxFileServerServiceSpecificationSSP001,
                                                         ServiceProfiles.SubmodelRepositoryServiceSpecificationSSP001,
@@ -53,6 +55,6 @@ public virtual IActionResult GetDescription()
                                                         ServiceProfiles.ConceptDescriptionServiceSpecificationSSP001
                                                     };
         //return new ObjectResult(_serviceDescription.ToJson());
-        return new ObjectResult(output.ToJson());
+        return new ObjectResult(_serviceDescription.ToJson());
     }
 }