AspNetCore support

Ihar Yakimush · Ihar Yakimush · commit d4492cc493d4 · 2018-04-12T12:21:01.000+03:00
diff --git a/Community.Data.OData.Linq.xTests/JsonTests.cs b/Community.Data.OData.Linq.xTests/JsonTests.cs
@@ -20,5 +20,14 @@ public void SerializeSelectExpand()
 
             Assert.DoesNotContain("ModelID", token.ToString(Formatting.None));
         }
+
+        [Fact]
+        public void SerializeSelectExpand2()
+        {
+            JToken token = ClassWithCollection.CreateQuery().OData().SelectExpand("Name", "Link2($filter=Id eq 311;$select=Name)").ToJson();
+            Assert.NotNull(token);
+
+            Assert.DoesNotContain("ModelID", token.ToString(Formatting.None));
+        }
     }
 }
diff --git a/Community.Data.OData.Linq/Community.OData.Linq.csproj b/Community.Data.OData.Linq/Community.OData.Linq.csproj
@@ -11,7 +11,7 @@
     <PackageProjectUrl>https://github.com/IharYakimush/comminity-data-odata-linq</PackageProjectUrl>
     <RepositoryType></RepositoryType>
     <PackageTags>odata filter linq netstandard</PackageTags>
-    <PackageReleaseNotes>Add support for ApplyRawQueryOptionsWithSelectExpand and ApplyRawQueryOptionsWithoutSelectExpand</PackageReleaseNotes>
+    <PackageReleaseNotes>Add support for ApplyQueryOptions and ApplyQueryOptionsWithoutSelectExpand methods.</PackageReleaseNotes>
     <Description>Use OData filter text query in linq expresson for any IQuerable without ASP.NET dependency. Support netstandard2.0</Description>
     <Company />
     <RepositoryUrl></RepositoryUrl>
diff --git a/Community.Data.OData.Linq/IODataQueryOptions.cs b/Community.Data.OData.Linq/IODataQueryOptions.cs
@@ -3,7 +3,7 @@
     using System.Collections.Generic;
     using System.Linq;
 
-    public interface IODataRawQueryOptions
+    public interface IODataQueryOptions
     {
         /// <summary>
         ///  Gets the raw $filter query value from the incoming request Uri if exists.
diff --git a/Community.Data.OData.Linq/OData/Query/ODataRawQueryOptions.cs b/Community.Data.OData.Linq/OData/Query/ODataRawQueryOptions.cs
@@ -13,13 +13,13 @@ namespace Community.OData.Linq.OData.Query
     /// </summary>
     [DataContract]
     [Serializable]
-    public class ODataRawQueryOptions : IODataRawQueryOptions
+    public class ODataRawQueryOptions : IODataQueryOptions
     {
         /// <summary>
         ///  Gets the raw $filter query value from the incoming request Uri if exists.
         /// </summary>
         [IgnoreDataMember]
-        IReadOnlyCollection<string> IODataRawQueryOptions.Filters
+        IReadOnlyCollection<string> IODataQueryOptions.Filters
         {
             get
             {
diff --git a/Community.Data.OData.Linq/OdataLinqExtensions.cs b/Community.Data.OData.Linq/OdataLinqExtensions.cs
@@ -173,26 +173,26 @@ public static ODataQuery<T> TopSkip<T>(this ODataQuery<T> query, string topText
             return query;
         }
 
-        public static IQueryable<T> ApplyRawQueryOptionsWithoutSelectExpand<T>(
+        public static IQueryable<T> ApplyQueryOptionsWithoutSelectExpand<T>(
             this ODataQuery<T> query,
-            IODataRawQueryOptions rawQueryOptions,
+            IODataQueryOptions rawQueryOptions,
             string entitySetName = null)
         {
-            return ApplyRawQueryOptionsWithoutSelectExpandInternal(query, rawQueryOptions, entitySetName);
+            return ApplyQueryOptionsInternal(query, rawQueryOptions, entitySetName);
         }
 
-        public static IEnumerable<ISelectExpandWrapper> ApplyRawQueryOptionsWithSelectExpand<T>(
+        public static IEnumerable<ISelectExpandWrapper> ApplyQueryOptions<T>(
             this ODataQuery<T> query,
-            IODataRawQueryOptions rawQueryOptions,
+            IODataQueryOptions rawQueryOptions,
             string entitySetName = null)
         {
-            return ApplyRawQueryOptionsWithoutSelectExpandInternal(query, rawQueryOptions, entitySetName).SelectExpand(
+            return ApplyQueryOptionsInternal(query, rawQueryOptions, entitySetName).SelectExpand(
                 rawQueryOptions.Select,
                 rawQueryOptions.Expand,
                 entitySetName);
         }
 
-        private static ODataQuery<T> ApplyRawQueryOptionsWithoutSelectExpandInternal<T>(ODataQuery<T> query, IODataRawQueryOptions rawQueryOptions, string entitySetName)
+        private static ODataQuery<T> ApplyQueryOptionsInternal<T>(ODataQuery<T> query, IODataQueryOptions rawQueryOptions, string entitySetName)
         {
             if (query == null) throw new ArgumentNullException(nameof(query));
             if (rawQueryOptions == null) throw new ArgumentNullException(nameof(rawQueryOptions));
diff --git a/Community.OData.Linq.AspNetCore.IntegrationTests/Controllers/ValuesController.cs b/Community.OData.Linq.AspNetCore.IntegrationTests/Controllers/ValuesController.cs
@@ -1,12 +1,13 @@
-﻿namespace Community.OData.Linq.AspNetCore.IntegrationTests.Controllers
+﻿namespace Community.OData.Linq.AspNetCore.IntegrationTests
 {
-    using System;
-    using System.Collections.Generic;
     using System.Linq;
 
-    using Microsoft.AspNetCore.Mvc;
+    using Community.OData.Linq;
+    using Community.OData.Linq.AspNetCore;
+
     using Community.OData.Linq.Json;
 
+    using Microsoft.AspNetCore.Mvc;
     using Microsoft.OData;
 
     using Newtonsoft.Json.Linq;
@@ -15,52 +16,51 @@ public class ValuesController : Controller
     {
         [Route("/v1")]
         [HttpGet]
-        public IActionResult Get1(ODataQueryOptions queryOptions)
+        public IActionResult Get(ODataQueryOptions queryOptions)
         {
-            if (queryOptions == null && !this.ModelState.IsValid )
+            if (queryOptions == null && !this.ModelState.IsValid)
             {
                 return this.BadRequest(this.ModelState);
             }
 
-            IQueryable<SampleData> data = Enumerable.Range(1, 10)
-                .Select(i => new SampleData { Id = i, Name = $"n{i}" })
+            IQueryable<Entity> data = Enumerable.Range(1, 10)
+                .Select(i => new Entity { Id = i, Name = $"n{i}" })
                 .ToArray()
                 .AsQueryable();
-
             try
             {
-                SampleData[] result = data.OData().ApplyRawQueryOptionsWithoutSelectExpand(queryOptions).ToArray();
+                JToken result = data.OData().ApplyQueryOptions(queryOptions).ToJson();
                 return this.Ok(result);
             }
             catch (ODataException e)
             {
-                this.ModelState.TryAddModelError("odata", e.Message);
-                return this.BadRequest(this.ModelState);
+                return this.BadRequest(e.Message);
             }
         }
 
         [Route("/v2")]
         [HttpGet]
-        public IActionResult Get2(ODataQueryOptions queryOptions)
+        public IActionResult GetWithoutSelectExpand(ODataQueryOptions queryOptions)
         {
             if (queryOptions == null && !this.ModelState.IsValid)
             {
                 return this.BadRequest(this.ModelState);
             }
 
-            IQueryable<SampleData> data = Enumerable.Range(1, 10)
-                .Select(i => new SampleData { Id = i, Name = $"n{i}" })
+            IQueryable<Entity> data = Enumerable.Range(1, 10)
+                .Select(i => new Entity { Id = i, Name = $"n{i}" })
                 .ToArray()
                 .AsQueryable();
+
             try
             {
-                JToken result = data.OData().ApplyRawQueryOptionsWithSelectExpandJsonToken(queryOptions);
+                Entity[] result = data.OData().ApplyQueryOptionsWithoutSelectExpand(queryOptions).ToArray();
                 return this.Ok(result);
             }
             catch (ODataException e)
             {
                 return this.BadRequest(e.Message);
             }
-        }        
+        }
     }
 }
diff --git a/Community.OData.Linq.AspNetCore.IntegrationTests/Entity.cs b/Community.OData.Linq.AspNetCore.IntegrationTests/Entity.cs
@@ -1,6 +1,6 @@
 ﻿namespace Community.OData.Linq.AspNetCore.IntegrationTests
 {
-    public class SampleData
+    public class Entity
     {
         public int Id { get; set; }
 
diff --git a/Community.OData.Linq.AspNetCore/Community.OData.Linq.AspNetCore.csproj b/Community.OData.Linq.AspNetCore/Community.OData.Linq.AspNetCore.csproj
@@ -7,7 +7,7 @@
     <PackageLicenseUrl>https://github.com/IharYakimush/comminity-data-odata-linq/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/IharYakimush/comminity-data-odata-linq</PackageProjectUrl>
     <PackageTags>odata linq aspnetcore</PackageTags>
-    <Description>ASP.NET Core use OData query parameters in linq expressons</Description>
+    <Description>OData linq for ASP.NET Core 2.0</Description>
     <PackageReleaseNotes>IModelBinder and IModelBinderProvider for ODataQueryOptions.</PackageReleaseNotes>
   </PropertyGroup>
 
diff --git a/Community.OData.Linq.AspNetCore/ODataQueryOptions.cs b/Community.OData.Linq.AspNetCore/ODataQueryOptions.cs
@@ -12,7 +12,7 @@
     [DataContract]
     [Serializable]
     [ModelBinder(BinderType = typeof(ODataQueryOptionsModelBinder))]
-    public class ODataQueryOptions : ODataRawQueryOptions, IODataRawQueryOptions
+    public class ODataQueryOptions : ODataRawQueryOptions, IODataQueryOptions
     {
         public IReadOnlyCollection<string> Filters { get; set; }
 
diff --git a/Community.OData.Linq.Json/Community.OData.Linq.Json.csproj b/Community.OData.Linq.Json/Community.OData.Linq.Json.csproj
@@ -11,7 +11,7 @@
     <PackageProjectUrl>https://github.com/IharYakimush/comminity-data-odata-linq</PackageProjectUrl>
     <RepositoryType></RepositoryType>
     <PackageTags>odata filter linq json</PackageTags>
-    <PackageReleaseNotes>Add support for ODataRawQueryOptions in Select methods</PackageReleaseNotes>
+    <PackageReleaseNotes></PackageReleaseNotes>
     <Description>Json serialization for SelectExpand result</Description>
     <Company />
     <RepositoryUrl></RepositoryUrl>
diff --git a/Community.OData.Linq.Json/ODataLinqExtensions.cs b/Community.OData.Linq.Json/ODataLinqExtensions.cs
@@ -6,29 +6,23 @@
     using System.Linq;
     using System.Text;
 
-    using Community.OData.Linq.OData.Query;
-
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
 
     public static class ODataLinqExtensions
-    {        
+    {
+        [Obsolete("Use query.SelectExpand(...).ToJson(...) instead")]
         public static JToken SelectExpandJsonToken<T>(
             this ODataQuery<T> query,
             string selectText = null,
             string expandText = null,
             Action<JsonSerializer> configureSerializer = null,
             string entitySetName = null)
         {
-            JTokenWriter writer = new JTokenWriter();
-            using (writer)
-            {
-                SelectExpandJson(query, writer, selectText, expandText, configureSerializer, entitySetName);
-
-                return writer.Token;
-            }            
+            return query.SelectExpand(selectText, expandText, entitySetName).ToJson(configureSerializer);
         }
 
+        [Obsolete("Use query.SelectExpand(...).ToJson(...) instead")]
         public static void SelectExpandJson<T>(
             this ODataQuery<T> query,
             JsonWriter writer,
@@ -37,52 +31,57 @@ public static void SelectExpandJson<T>(
             Action<JsonSerializer> configureSerializer = null,
             string entitySetName = null)
         {
-            ISelectExpandWrapper[] result = query.SelectExpand(selectText, expandText, entitySetName).ToArray();
-
-            WriteToSerializer(writer, configureSerializer, result);
+            query.SelectExpand(selectText, expandText, entitySetName).ToJson(writer, configureSerializer);
         }
 
-        private static void WriteToSerializer(JsonWriter writer, Action<JsonSerializer> configureSerializer, ISelectExpandWrapper[] result)
-        {
-            JsonSerializer serializer = new JsonSerializer();
-
-            configureSerializer?.Invoke(serializer);
-            serializer.Converters.Add(new SelectExpandWrapperConverter());
-
-            serializer.Serialize(writer, result);
-        }
-
-        public static JToken ApplyRawQueryOptionsWithSelectExpandJsonToken<T>(
-            this ODataQuery<T> query,
-            IODataRawQueryOptions rawQueryOptions,
-            Action<JsonSerializer> configureSerializer = null,
-            string entitySetName = null)
+        /// <summary>
+        /// The to Json.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="configureSerializer">
+        /// The configure serializer.
+        /// </param>
+        /// <returns>
+        /// The <see cref="JToken"/>.
+        /// </returns>
+        public static JToken ToJson(this IEnumerable<ISelectExpandWrapper> value, Action<JsonSerializer> configureSerializer = null)
         {
             JTokenWriter writer = new JTokenWriter();
             using (writer)
             {
-                ApplyRawQueryOptionsWithSelectExpandJson(
-                    query,
-                    writer,
-                    rawQueryOptions,
-                    configureSerializer,
-                    entitySetName);
+                value.ToJson(writer, configureSerializer);
 
                 return writer.Token;
             }
         }
 
-        public static void ApplyRawQueryOptionsWithSelectExpandJson<T>(
-            this ODataQuery<T> query,
-            JsonWriter writer,
-            IODataRawQueryOptions rawQueryOptions,
-            Action<JsonSerializer> configureSerializer = null,
-            string entitySetName = null)
+        /// <summary>
+        /// The to json.
+        /// </summary>
+        /// <param name="value">
+        /// The value.
+        /// </param>
+        /// <param name="writer">
+        /// The writer.
+        /// </param>
+        /// <param name="configureSerializer">
+        /// The configure serializer.
+        /// </param>
+        public static void ToJson(this IEnumerable<ISelectExpandWrapper> value, JsonWriter writer, Action<JsonSerializer> configureSerializer = null)
         {
-            ISelectExpandWrapper[] result = query.ApplyRawQueryOptionsWithSelectExpand(rawQueryOptions, entitySetName)
-                .ToArray();
+            WriteToSerializer(writer, configureSerializer, value);
+        }
+
+        private static void WriteToSerializer(JsonWriter writer, Action<JsonSerializer> configureSerializer, IEnumerable<ISelectExpandWrapper> result)
+        {
+            JsonSerializer serializer = new JsonSerializer();
+
+            configureSerializer?.Invoke(serializer);
+            serializer.Converters.Add(new SelectExpandWrapperConverter());
 
-            WriteToSerializer(writer, configureSerializer, result);
+            serializer.Serialize(writer, result.ToArray());
         }
     }
 }
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Community.OData.Linq
-Use OData filter text query in linq expresson for any IQuerable without ASP.NET dependency
+Use OData filter text query in linq expresson for any IQuerable. Support web and desktop applications.
 
 # Sample
-Please check simple code below to get started:
+Please check samples below to get started:
 ### .NET Fiddle
 https://dotnetfiddle.net/7Ndwot
-### Code
+### Console app
 ```
     using System;
     using System.Linq;
@@ -42,6 +42,54 @@ https://dotnetfiddle.net/7Ndwot
         }
     }
 ```
+### ASP.NET Core 2.0
+```
+	using System.Linq;
+
+    using Community.OData.Linq;
+    using Community.OData.Linq.AspNetCore;
+
+    using Community.OData.Linq.Json;
+
+    using Microsoft.AspNetCore.Mvc;
+    using Microsoft.OData;
+
+    using Newtonsoft.Json.Linq;
+
+	public class Entity
+    {
+        public int Id { get; set; }
+
+        public string Name { get; set; }
+    }
+
+    public class ValuesController : Controller
+    {
+        [Route("/v1")]
+        [HttpGet]
+        public IActionResult Get(ODataQueryOptions queryOptions)
+        {
+            if (queryOptions == null && !this.ModelState.IsValid)
+            {
+                return this.BadRequest(this.ModelState);
+            }
+
+            IQueryable<Entity> data = Enumerable.Range(1, 10)
+                .Select(i => new Entity { Id = i, Name = $"n{i}" })
+                .ToArray()
+                .AsQueryable();
+            try
+            {
+                JToken result = data.OData().ApplyQueryOptions(queryOptions).ToJson();
+                return this.Ok(result);
+            }
+            catch (ODataException e)
+            {
+                return this.BadRequest(e.Message);
+            }
+        }
+	}
+```
 # Advanced code samples at wiki
 https://github.com/IharYakimush/comminity-data-odata-linq/wiki
 

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,14 @@ public void SerializeSelectExpand()`
`20`	`20`
`21`	`21`	`Assert.DoesNotContain("ModelID", token.ToString(Formatting.None));`
`22`	`22`	`}`
	`23`	`+`
	`24`	`+ [Fact]`
	`25`	`+ public void SerializeSelectExpand2()`
	`26`	`+ {`
	`27`	`+ JToken token = ClassWithCollection.CreateQuery().OData().SelectExpand("Name", "Link2($filter=Id eq 311;$select=Name)").ToJson();`
	`28`	`+ Assert.NotNull(token);`
	`29`	`+`
	`30`	`+ Assert.DoesNotContain("ModelID", token.ToString(Formatting.None));`
	`31`	`+ }`
`23`	`32`	`}`
`24`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Linq;`
`5`	`5`
`6`		`- public interface IODataRawQueryOptions`
	`6`	`+ public interface IODataQueryOptions`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Gets the raw $filter query value from the incoming request Uri if exists.`
Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ namespace Community.OData.Linq.OData.Query`
`13`	`13`	`/// </summary>`
`14`	`14`	`[DataContract]`
`15`	`15`	`[Serializable]`
`16`		`- public class ODataRawQueryOptions : IODataRawQueryOptions`
	`16`	`+ public class ODataRawQueryOptions : IODataQueryOptions`
`17`	`17`	`{`
`18`	`18`	`/// <summary>`
`19`	`19`	`/// Gets the raw $filter query value from the incoming request Uri if exists.`
`20`	`20`	`/// </summary>`
`21`	`21`	`[IgnoreDataMember]`
`22`		`- IReadOnlyCollection<string> IODataRawQueryOptions.Filters`
	`22`	`+ IReadOnlyCollection<string> IODataQueryOptions.Filters`
`23`	`23`	`{`
`24`	`24`	`get`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -173,26 +173,26 @@ public static ODataQuery<T> TopSkip<T>(this ODataQuery<T> query, string topText`
`173`	`173`	`return query;`
`174`	`174`	`}`
`175`	`175`
`176`		`- public static IQueryable<T> ApplyRawQueryOptionsWithoutSelectExpand<T>(`
	`176`	`+ public static IQueryable<T> ApplyQueryOptionsWithoutSelectExpand<T>(`
`177`	`177`	`this ODataQuery<T> query,`
`178`		`- IODataRawQueryOptions rawQueryOptions,`
	`178`	`+ IODataQueryOptions rawQueryOptions,`
`179`	`179`	`string entitySetName = null)`
`180`	`180`	`{`
`181`		`- return ApplyRawQueryOptionsWithoutSelectExpandInternal(query, rawQueryOptions, entitySetName);`
	`181`	`+ return ApplyQueryOptionsInternal(query, rawQueryOptions, entitySetName);`
`182`	`182`	`}`
`183`	`183`
`184`		`- public static IEnumerable<ISelectExpandWrapper> ApplyRawQueryOptionsWithSelectExpand<T>(`
	`184`	`+ public static IEnumerable<ISelectExpandWrapper> ApplyQueryOptions<T>(`
`185`	`185`	`this ODataQuery<T> query,`
`186`		`- IODataRawQueryOptions rawQueryOptions,`
	`186`	`+ IODataQueryOptions rawQueryOptions,`
`187`	`187`	`string entitySetName = null)`
`188`	`188`	`{`
`189`		`- return ApplyRawQueryOptionsWithoutSelectExpandInternal(query, rawQueryOptions, entitySetName).SelectExpand(`
	`189`	`+ return ApplyQueryOptionsInternal(query, rawQueryOptions, entitySetName).SelectExpand(`
`190`	`190`	`rawQueryOptions.Select,`
`191`	`191`	`rawQueryOptions.Expand,`
`192`	`192`	`entitySetName);`
`193`	`193`	`}`
`194`	`194`
`195`		`- private static ODataQuery<T> ApplyRawQueryOptionsWithoutSelectExpandInternal<T>(ODataQuery<T> query, IODataRawQueryOptions rawQueryOptions, string entitySetName)`
	`195`	`+ private static ODataQuery<T> ApplyQueryOptionsInternal<T>(ODataQuery<T> query, IODataQueryOptions rawQueryOptions, string entitySetName)`
`196`	`196`	`{`
`197`	`197`	`if (query == null) throw new ArgumentNullException(nameof(query));`
`198`	`198`	`if (rawQueryOptions == null) throw new ArgumentNullException(nameof(rawQueryOptions));`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`		`-namespace Community.OData.Linq.AspNetCore.IntegrationTests.Controllers`
	`1`	`+namespace Community.OData.Linq.AspNetCore.IntegrationTests`
`2`	`2`	`{`
`3`		`- using System;`
`4`		`- using System.Collections.Generic;`
`5`	`3`	`using System.Linq;`
`6`	`4`
`7`		`- using Microsoft.AspNetCore.Mvc;`
	`5`	`+ using Community.OData.Linq;`
	`6`	`+ using Community.OData.Linq.AspNetCore;`
	`7`	`+`
`8`	`8`	`using Community.OData.Linq.Json;`
`9`	`9`
	`10`	`+ using Microsoft.AspNetCore.Mvc;`
`10`	`11`	`using Microsoft.OData;`
`11`	`12`
`12`	`13`	`using Newtonsoft.Json.Linq;`
`@@ -15,52 +16,51 @@ public class ValuesController : Controller`
`15`	`16`	`{`
`16`	`17`	`[Route("/v1")]`
`17`	`18`	`[HttpGet]`
`18`		`- public IActionResult Get1(ODataQueryOptions queryOptions)`
	`19`	`+ public IActionResult Get(ODataQueryOptions queryOptions)`
`19`	`20`	`{`
`20`		`- if (queryOptions == null && !this.ModelState.IsValid )`
	`21`	`+ if (queryOptions == null && !this.ModelState.IsValid)`
`21`	`22`	`{`
`22`	`23`	`return this.BadRequest(this.ModelState);`
`23`	`24`	`}`
`24`	`25`
`25`		`- IQueryable<SampleData> data = Enumerable.Range(1, 10)`
`26`		`- .Select(i => new SampleData { Id = i, Name = $"n{i}" })`
	`26`	`+ IQueryable<Entity> data = Enumerable.Range(1, 10)`
	`27`	`+ .Select(i => new Entity { Id = i, Name = $"n{i}" })`
`27`	`28`	`.ToArray()`
`28`	`29`	`.AsQueryable();`
`29`		`-`
`30`	`30`	`try`
`31`	`31`	`{`
`32`		`- SampleData[] result = data.OData().ApplyRawQueryOptionsWithoutSelectExpand(queryOptions).ToArray();`
	`32`	`+ JToken result = data.OData().ApplyQueryOptions(queryOptions).ToJson();`
`33`	`33`	`return this.Ok(result);`
`34`	`34`	`}`
`35`	`35`	`catch (ODataException e)`
`36`	`36`	`{`
`37`		`- this.ModelState.TryAddModelError("odata", e.Message);`
`38`		`- return this.BadRequest(this.ModelState);`
	`37`	`+ return this.BadRequest(e.Message);`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`[Route("/v2")]`
`43`	`42`	`[HttpGet]`
`44`		`- public IActionResult Get2(ODataQueryOptions queryOptions)`
	`43`	`+ public IActionResult GetWithoutSelectExpand(ODataQueryOptions queryOptions)`
`45`	`44`	`{`
`46`	`45`	`if (queryOptions == null && !this.ModelState.IsValid)`
`47`	`46`	`{`
`48`	`47`	`return this.BadRequest(this.ModelState);`
`49`	`48`	`}`
`50`	`49`
`51`		`- IQueryable<SampleData> data = Enumerable.Range(1, 10)`
`52`		`- .Select(i => new SampleData { Id = i, Name = $"n{i}" })`
	`50`	`+ IQueryable<Entity> data = Enumerable.Range(1, 10)`
	`51`	`+ .Select(i => new Entity { Id = i, Name = $"n{i}" })`
`53`	`52`	`.ToArray()`
`54`	`53`	`.AsQueryable();`
	`54`	`+`
`55`	`55`	`try`
`56`	`56`	`{`
`57`		`- JToken result = data.OData().ApplyRawQueryOptionsWithSelectExpandJsonToken(queryOptions);`
	`57`	`+ Entity[] result = data.OData().ApplyQueryOptionsWithoutSelectExpand(queryOptions).ToArray();`
`58`	`58`	`return this.Ok(result);`
`59`	`59`	`}`
`60`	`60`	`catch (ODataException e)`
`61`	`61`	`{`
`62`	`62`	`return this.BadRequest(e.Message);`
`63`	`63`	`}`
`64`		`- }`
	`64`	`+ }`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`namespace Community.OData.Linq.AspNetCore.IntegrationTests`
`2`	`2`	`{`
`3`		`- public class SampleData`
	`3`	`+ public class Entity`
`4`	`4`	`{`
`5`	`5`	`public int Id { get; set; }`
`6`	`6`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`[DataContract]`
`13`	`13`	`[Serializable]`
`14`	`14`	`[ModelBinder(BinderType = typeof(ODataQueryOptionsModelBinder))]`
`15`		`- public class ODataQueryOptions : ODataRawQueryOptions, IODataRawQueryOptions`
	`15`	`+ public class ODataQueryOptions : ODataRawQueryOptions, IODataQueryOptions`
`16`	`16`	`{`
`17`	`17`	`public IReadOnlyCollection<string> Filters { get; set; }`
`18`	`18`