From c211f9689dd73997249e1503a221c6e9466daeaa Mon Sep 17 00:00:00 2001 From: igorsych Date: Tue, 23 May 2017 16:39:22 +0300 Subject: [PATCH] swagger/ui to swagger url fix --- .../Basket/Basket.API/Controllers/HomeController.cs | 10 ++-------- src/Services/Basket/Basket.API/Model/Basket.cs | 5 +---- src/Services/Basket/Basket.API/Model/BasketItem.cs | 7 +------ .../Basket/Basket.API/Properties/launchSettings.json | 4 ++-- src/Services/Basket/Basket.API/Startup.cs | 2 +- .../Catalog/Catalog.API/Controllers/HomeController.cs | 2 +- .../Catalog/Catalog.API/Properties/launchSettings.json | 2 +- src/Services/Catalog/Catalog.API/Startup.cs | 2 +- .../Ordering.API/Controllers/HomeController.cs | 10 ++-------- .../Ordering.API/Properties/launchSettings.json | 2 +- src/Services/Ordering/Ordering.API/Startup.cs | 2 +- 11 files changed, 14 insertions(+), 34 deletions(-) diff --git a/src/Services/Basket/Basket.API/Controllers/HomeController.cs b/src/Services/Basket/Basket.API/Controllers/HomeController.cs index 5cf7ab855..d0c37a205 100644 --- a/src/Services/Basket/Basket.API/Controllers/HomeController.cs +++ b/src/Services/Basket/Basket.API/Controllers/HomeController.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 +using Microsoft.AspNetCore.Mvc; namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers { @@ -13,7 +7,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API.Controllers // GET: // public IActionResult Index() { - return new RedirectResult("~/swagger/ui"); + return new RedirectResult("~/swagger"); } } } diff --git a/src/Services/Basket/Basket.API/Model/Basket.cs b/src/Services/Basket/Basket.API/Model/Basket.cs index d07c710e7..7f43b2a4b 100644 --- a/src/Services/Basket/Basket.API/Model/Basket.cs +++ b/src/Services/Basket/Basket.API/Model/Basket.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; +using System.Collections.Generic; namespace Microsoft.eShopOnContainers.Services.Basket.API.Model { diff --git a/src/Services/Basket/Basket.API/Model/BasketItem.cs b/src/Services/Basket/Basket.API/Model/BasketItem.cs index 76835ade9..8b98befcc 100644 --- a/src/Services/Basket/Basket.API/Model/BasketItem.cs +++ b/src/Services/Basket/Basket.API/Model/BasketItem.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace Microsoft.eShopOnContainers.Services.Basket.API.Model +namespace Microsoft.eShopOnContainers.Services.Basket.API.Model { public class BasketItem { diff --git a/src/Services/Basket/Basket.API/Properties/launchSettings.json b/src/Services/Basket/Basket.API/Properties/launchSettings.json index 63edfecb1..36effc287 100644 --- a/src/Services/Basket/Basket.API/Properties/launchSettings.json +++ b/src/Services/Basket/Basket.API/Properties/launchSettings.json @@ -11,7 +11,7 @@ "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, - "launchUrl": "api/values", + "launchUrl": "swagger", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } @@ -19,7 +19,7 @@ "Microsoft.eShopOnContainers.Services.Basket.API": { "commandName": "Project", "launchBrowser": true, - "launchUrl": "http://localhost:5000/api/values", + "launchUrl": "http://localhost:5000/swagger", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/Services/Basket/Basket.API/Startup.cs b/src/Services/Basket/Basket.API/Startup.cs index c21b163da..b2fb838d6 100644 --- a/src/Services/Basket/Basket.API/Startup.cs +++ b/src/Services/Basket/Basket.API/Startup.cs @@ -85,7 +85,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API services.AddSwaggerGen(options => { options.DescribeAllEnumsAsStrings(); - options.SwaggerDoc("eShopOnContainers - Basket HTTP API", new Swashbuckle.AspNetCore.Swagger.Info + options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info { Title = "Basket HTTP API", Version = "v1", diff --git a/src/Services/Catalog/Catalog.API/Controllers/HomeController.cs b/src/Services/Catalog/Catalog.API/Controllers/HomeController.cs index 9401b56f9..37792fb04 100644 --- a/src/Services/Catalog/Catalog.API/Controllers/HomeController.cs +++ b/src/Services/Catalog/Catalog.API/Controllers/HomeController.cs @@ -9,7 +9,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API.Controllers // GET: // public IActionResult Index() { - return new RedirectResult("~/swagger/ui"); + return new RedirectResult("~/swagger"); } } } diff --git a/src/Services/Catalog/Catalog.API/Properties/launchSettings.json b/src/Services/Catalog/Catalog.API/Properties/launchSettings.json index 8a69fa6af..1bf8eb1f3 100644 --- a/src/Services/Catalog/Catalog.API/Properties/launchSettings.json +++ b/src/Services/Catalog/Catalog.API/Properties/launchSettings.json @@ -11,7 +11,7 @@ "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, - "launchUrl": "/swagger/ui", + "launchUrl": "/swagger", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/Services/Catalog/Catalog.API/Startup.cs b/src/Services/Catalog/Catalog.API/Startup.cs index 2daa15a07..c0b643377 100644 --- a/src/Services/Catalog/Catalog.API/Startup.cs +++ b/src/Services/Catalog/Catalog.API/Startup.cs @@ -85,7 +85,7 @@ services.AddSwaggerGen(options => { options.DescribeAllEnumsAsStrings(); - options.SwaggerDoc("eShopOnContainers - Catalog HTTP API",new Swashbuckle.AspNetCore.Swagger.Info + options.SwaggerDoc("v1",new Swashbuckle.AspNetCore.Swagger.Info { Title = "eShopOnContainers - Catalog HTTP API", Version = "v1", diff --git a/src/Services/Ordering/Ordering.API/Controllers/HomeController.cs b/src/Services/Ordering/Ordering.API/Controllers/HomeController.cs index 496fc57fc..ba4620b23 100644 --- a/src/Services/Ordering/Ordering.API/Controllers/HomeController.cs +++ b/src/Services/Ordering/Ordering.API/Controllers/HomeController.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; - -// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860 +using Microsoft.AspNetCore.Mvc; namespace Microsoft.eShopOnContainers.Services.Ordering.API.Controllers { @@ -13,7 +7,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API.Controllers // GET: // public IActionResult Index() { - return new RedirectResult("~/swagger/ui"); + return new RedirectResult("~/swagger"); } } } diff --git a/src/Services/Ordering/Ordering.API/Properties/launchSettings.json b/src/Services/Ordering/Ordering.API/Properties/launchSettings.json index 3ee9281ae..a6e47ca2d 100644 --- a/src/Services/Ordering/Ordering.API/Properties/launchSettings.json +++ b/src/Services/Ordering/Ordering.API/Properties/launchSettings.json @@ -11,7 +11,7 @@ "IIS Express": { "commandName": "IISExpress", "launchBrowser": true, - "launchUrl": "/swagger/ui", + "launchUrl": "/swagger", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/Services/Ordering/Ordering.API/Startup.cs b/src/Services/Ordering/Ordering.API/Startup.cs index 0158e14bf..d596ac63a 100644 --- a/src/Services/Ordering/Ordering.API/Startup.cs +++ b/src/Services/Ordering/Ordering.API/Startup.cs @@ -85,7 +85,7 @@ services.AddSwaggerGen(options => { options.DescribeAllEnumsAsStrings(); - options.SwaggerDoc("eShopOnContainers - Ordering HTTP API", new Swashbuckle.AspNetCore.Swagger.Info + options.SwaggerDoc("v1", new Swashbuckle.AspNetCore.Swagger.Info { Title = "Ordering HTTP API", Version = "v1",