Skip to content

Commit 0836da3

Browse files
Chris Martinezcommonsensesoftware
authored andcommitted
Update ODataOptions configuration
1 parent 1e2ff96 commit 0836da3

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

samples/aspnetcore/ODataBasicSample/Startup.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
namespace Microsoft.Examples
22
{
3+
using Microsoft.AspNet.OData;
34
using Microsoft.AspNet.OData.Builder;
45
using Microsoft.AspNet.OData.Extensions;
56
using Microsoft.AspNetCore.Builder;
67
using Microsoft.AspNetCore.Hosting;
78
using Microsoft.Extensions.Configuration;
89
using Microsoft.Extensions.DependencyInjection;
910
using static Microsoft.AspNetCore.Mvc.CompatibilityVersion;
11+
using static Microsoft.OData.ODataUrlKeyDelimiter;
1012

1113
public class Startup
1214
{
@@ -39,6 +41,11 @@ public void Configure( IApplicationBuilder app, IHostingEnvironment env, Version
3941
routeBuilder =>
4042
{
4143
var models = modelBuilder.GetEdmModels();
44+
45+
// the following will not work as expected
46+
// BUG: https://github.com/OData/WebApi/issues/1837
47+
// routeBuilder.SetDefaultODataOptions( new ODataOptions() { UrlKeyDelimiter = Parentheses } );
48+
routeBuilder.ServiceProvider.GetRequiredService<ODataOptions>().UrlKeyDelimiter = Parentheses;
4249
routeBuilder.MapVersionedODataRoutes( "odata", "api", models );
4350
routeBuilder.MapVersionedODataRoutes( "odata-bypath", "v{version:apiVersion}", models );
4451
} );

samples/aspnetcore/SwaggerODataSample/Startup.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace Microsoft.Examples
22
{
3+
using Microsoft.AspNet.OData;
34
using Microsoft.AspNet.OData.Builder;
45
using Microsoft.AspNet.OData.Extensions;
56
using Microsoft.AspNetCore.Builder;
@@ -13,6 +14,7 @@
1314
using System.Reflection;
1415
using static Microsoft.AspNet.OData.Query.AllowedQueryOptions;
1516
using static Microsoft.AspNetCore.Mvc.CompatibilityVersion;
17+
using static Microsoft.OData.ODataUrlKeyDelimiter;
1618

1719
/// <summary>
1820
/// Represents the startup process for the application.
@@ -75,7 +77,15 @@ public void ConfigureServices( IServiceCollection services )
7577
/// <param name="provider">The API version descriptor provider used to enumerate defined API versions.</param>
7678
public void Configure( IApplicationBuilder app, IHostingEnvironment env, VersionedODataModelBuilder modelBuilder, IApiVersionDescriptionProvider provider )
7779
{
78-
app.UseMvc( routeBuilder => routeBuilder.MapVersionedODataRoutes( "odata", "api", modelBuilder.GetEdmModels() ) );
80+
app.UseMvc(
81+
routeBuilder =>
82+
{
83+
// the following will not work as expected
84+
// BUG: https://github.com/OData/WebApi/issues/1837
85+
// routeBuilder.SetDefaultODataOptions( new ODataOptions() { UrlKeyDelimiter = Parentheses } );
86+
routeBuilder.ServiceProvider.GetRequiredService<ODataOptions>().UrlKeyDelimiter = Parentheses;
87+
routeBuilder.MapVersionedODataRoutes( "odata", "api", modelBuilder.GetEdmModels() );
88+
} );
7989
app.UseSwagger();
8090
app.UseSwaggerUI(
8191
options =>

0 commit comments

Comments
 (0)