Fixed merge issues

domaindrivendev · Apr 24, 2024 · e4fc9c9 · e4fc9c9
1 parent 9f37e68
commit e4fc9c9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/src/Swashbuckle.AspNetCore.Swagger/SwaggerMiddleware.cs b/src/Swashbuckle.AspNetCore.Swagger/SwaggerMiddleware.cs
@@ -28,30 +28,31 @@ public class SwaggerMiddleware
         public SwaggerMiddleware(
             RequestDelegate next,
             SwaggerOptions options,
+#if !NETSTANDARD
+            TemplateBinderFactory templateBinderFactory,
+#endif
             IServiceProvider serviceProvider)
         {
             _next = next;
             _options = options ?? new SwaggerOptions();
             _requestMatcher = new TemplateMatcher(TemplateParser.Parse(_options.RouteTemplate), new RouteValueDictionary());
             _swaggerDocumentSerializer = serviceProvider?.GetService<ISwaggerDocumentSerializer>();
+#if !NETSTANDARD
+            _templateBinder = templateBinderFactory.Create(RoutePatternFactory.Parse(_options.RouteTemplate));
+#endif
         }
 
         // TODO: Remove in next major release, kept for binary compatibility
         public SwaggerMiddleware(
             RequestDelegate next,
-            SwaggerOptions options) : this(next, options, null)
-        {
-        }
-
-#if !NETSTANDARD
-        public SwaggerMiddleware(
-            RequestDelegate next,
-            SwaggerOptions options,
-            TemplateBinderFactory templateBinderFactory) : this(next, options)
+            SwaggerOptions options)
+#if NETSTANDARD
+            : this(next, options, null)
+#else
+            : this(next, options, null, null)
+#endif
         {
-            _templateBinder = templateBinderFactory.Create(RoutePatternFactory.Parse(_options.RouteTemplate));
         }
-#endif
 
         public async Task Invoke(HttpContext httpContext, ISwaggerProvider swaggerProvider)
         {

diff --git a/test/WebSites/NswagClientExample/swagger.json b/test/WebSites/NswagClientExample/swagger.json
@@ -102,34 +102,38 @@
         "type": "string"
       },
       "Cat": {
-        "type": "object",
         "allOf": [
           {
             "$ref": "#/components/schemas/Animal"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "catSpecificProperty": {
+                "type": "string",
+                "nullable": true
+              }
+            },
+            "additionalProperties": false
           }
-        ],
-        "properties": {
-          "catSpecificProperty": {
-            "type": "string",
-            "nullable": true
-          }
-        },
-        "additionalProperties": false
+        ]
       },
       "Dog": {
-        "type": "object",
         "allOf": [
           {
             "$ref": "#/components/schemas/Animal"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "dogSpecificProperty": {
+                "type": "string",
+                "nullable": true
+              }
+            },
+            "additionalProperties": false
           }
-        ],
-        "properties": {
-          "dogSpecificProperty": {
-            "type": "string",
-            "nullable": true
-          }
-        },
-        "additionalProperties": false
+        ]
       }
     }
   }