Small logic change and update some test cases

chinadragon0515 · Aug 23, 2016 · 9d055f2 · 9d055f2
1 parent 535ec39
commit 9d055f2
Show file tree

Hide file tree

Showing 54 changed files with 276 additions and 397 deletions.
diff --git a/src/Microsoft.Restier.Core/Microsoft.Restier.Core.csproj b/src/Microsoft.Restier.Core/Microsoft.Restier.Core.csproj
@@ -22,6 +22,10 @@
       <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.0.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.OData.Core, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.OData.Core.7.0.0-beta\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.OData.Edm, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.OData.Edm.7.0.0-beta\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll</HintPath>
       <Private>True</Private>
@@ -85,6 +89,7 @@
     <Compile Include="Operation\IOperationAuthorizer.cs" />
     <Compile Include="Operation\IOperationExecutor.cs" />
     <Compile Include="Operation\OperationContext.cs" />
+    <Compile Include="RestierContainerBuilder.cs" />
     <Compile Include="ServiceCollectionExtensions.cs" />
     <Compile Include="Model\IModelBuilder.cs" />
     <Compile Include="Model\IModelMapper.cs" />

diff --git a/....Restier.Publishers.OData/Formatter/Deserialization/DefaultRestierDeserializerProvider.cs b/....Restier.Publishers.OData/Formatter/Deserialization/DefaultRestierDeserializerProvider.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
+using System;
 using System.Web.OData.Formatter.Deserialization;
 using Microsoft.OData.Edm;
 
@@ -11,30 +12,17 @@ namespace Microsoft.Restier.Publishers.OData.Formatter
     /// </summary>
     public class DefaultRestierDeserializerProvider : DefaultODataDeserializerProvider
     {
-        private static readonly DefaultRestierDeserializerProvider SingletonInstanceField
-            = new DefaultRestierDeserializerProvider();
-
         private RestierEnumDeserializer enumDeserializer;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DefaultRestierDeserializerProvider" /> class.
         /// </summary>
-        public DefaultRestierDeserializerProvider()
+        /// <param name="rootContainer">The container to get the service</param>
+        public DefaultRestierDeserializerProvider(IServiceProvider rootContainer) : base(rootContainer)
         {
             this.enumDeserializer = new RestierEnumDeserializer();
         }
 
-        /// <summary>
-        /// Gets the default instance of the <see cref="DefaultRestierDeserializerProvider"/>.
-        /// </summary>
-        internal static DefaultRestierDeserializerProvider SingletonInstance
-        {
-            get
-            {
-                return SingletonInstanceField;
-            }
-        }
-
         /// <inheritdoc />
         public override ODataEdmTypeDeserializer GetEdmTypeDeserializer(IEdmTypeReference edmType)
         {

diff --git a/...ft.Restier.Publishers.OData/Formatter/Deserialization/RestierDeserializerProviderProxy.cs b/...ft.Restier.Publishers.OData/Formatter/Deserialization/RestierDeserializerProviderProxy.cs
diff --git a/src/Microsoft.Restier.Publishers.OData/Formatter/RestierFormattingAttribute.cs b/src/Microsoft.Restier.Publishers.OData/Formatter/RestierFormattingAttribute.cs
diff --git a/...Microsoft.Restier.Publishers.OData/Formatter/Serialization/RestierCollectionSerializer.cs b/...Microsoft.Restier.Publishers.OData/Formatter/Serialization/RestierCollectionSerializer.cs
@@ -34,7 +34,7 @@ public override void WriteObject(
             ODataMessageWriter messageWriter,
             ODataSerializerContext writeContext)
         {
-            NonEntityCollectionResult collectionResult = graph as NonEntityCollectionResult;
+            NonResourceCollectionResult collectionResult = graph as NonResourceCollectionResult;
             if (collectionResult != null)
             {
                 graph = collectionResult.Query;

diff --git a/src/Microsoft.Restier.Publishers.OData/Formatter/Serialization/RestierPrimitiveSerializer.cs b/src/Microsoft.Restier.Publishers.OData/Formatter/Serialization/RestierPrimitiveSerializer.cs
@@ -2,10 +2,11 @@
 // Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
+using System.Web.OData.Extensions;
 using System.Web.OData.Formatter.Serialization;
-using Microsoft.OData.Core;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.OData;
 using Microsoft.OData.Edm;
-using Microsoft.OData.Edm.Library;
 
 namespace Microsoft.Restier.Publishers.OData.Formatter
 {
@@ -93,7 +94,8 @@ internal static object ConvertToPayloadValue(object value, ODataSerializerContex
                 }
             }
 
-            var payloadValueConverter = writeContext.Model.GetPayloadValueConverter();
+            var payloadValueConverter
+                = writeContext.Request.GetRequestContainer().GetService<ODataPayloadValueConverter>();
             return payloadValueConverter.ConvertToPayloadValue(value, edmTypeReference);
         }
     }

diff --git a/...alization/RestierComplexTypeSerializer.cs → ...erialization/RestierResourceSerializer.cs b/...alization/RestierComplexTypeSerializer.cs → ...erialization/RestierResourceSerializer.cs
@@ -3,21 +3,22 @@
 
 using System;
 using System.Web.OData.Formatter.Serialization;
-using Microsoft.OData.Core;
+using Microsoft.OData;
 
 namespace Microsoft.Restier.Publishers.OData.Formatter
 {
     /// <summary>
-    /// The serializer for complex result.
+    /// The serializer for resource result, and now for complex only,
+    /// for entity type, WebApi OData resource serializer will be used.
     /// </summary>
-    public class RestierComplexTypeSerializer : ODataComplexTypeSerializer
+    public class RestierResourceSerializer : ODataResourceSerializer
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="RestierComplexTypeSerializer" /> class.
+        /// Initializes a new instance of the <see cref="RestierResourceSerializer" /> class.
         /// </summary>
         /// <param name="provider">The serializer provider.</param>
-        public RestierComplexTypeSerializer(ODataSerializerProvider provider)
-            : base(provider)
+        public RestierResourceSerializer(ODataSerializerProvider provider)
+             : base(provider)
         {
         }
 

diff --git a/...icrosoft.Restier.Publishers.OData/Formatter/Serialization/RestierResourceSetSerializer.cs b/...icrosoft.Restier.Publishers.OData/Formatter/Serialization/RestierResourceSetSerializer.cs
@@ -37,7 +37,7 @@ public override void WriteObject(
             ODataMessageWriter messageWriter,
             ODataSerializerContext writeContext)
         {
-            EntityCollectionResult collectionResult = graph as EntityCollectionResult;
+            ResourceSetResult collectionResult = graph as ResourceSetResult;
             if (collectionResult != null)
             {
                 graph = collectionResult.Query;
@@ -63,9 +63,9 @@ private bool TryWriteAggregationResult(
                 IEdmTypeReference elementType = feedType.AsCollection().ElementType();
                 if (elementType.IsEntity())
                 {
-                    IEdmEntitySetBase entitySet = writeContext.NavigationSource as IEdmEntitySetBase;
-                    IEdmEntityTypeReference entityType = elementType.AsEntity();
-                    ODataWriter writer = messageWriter.CreateODataResourceSetWriter(entitySet, entityType.EntityDefinition());
+                    var entitySet = writeContext.NavigationSource as IEdmEntitySetBase;
+                    var entityType = elementType.AsEntity();
+                    var writer = messageWriter.CreateODataResourceSetWriter(entitySet, entityType.EntityDefinition());
                     WriteObjectInline(graph, feedType, writer, writeContext);
                     return true;
                 }

diff --git a/...rosoft.Restier.Publishers.OData/Formatter/Serialization/RestierSerializerProviderProxy.cs b/...rosoft.Restier.Publishers.OData/Formatter/Serialization/RestierSerializerProviderProxy.cs
diff --git a/src/Microsoft.Restier.Publishers.OData/Microsoft.Restier.Publishers.OData.csproj b/src/Microsoft.Restier.Publishers.OData/Microsoft.Restier.Publishers.OData.csproj
@@ -50,7 +50,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Web.OData, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.OData.6.0.0-Nightly160815\lib\net45\System.Web.OData.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.OData.6.0.0-Nightly160819\lib\net45\System.Web.OData.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml" />
@@ -85,8 +85,7 @@
     <Compile Include="Batch\RestierChangeSetProperty.cs" />
     <Compile Include="Batch\RestierBatchChangeSetRequestItem.cs" />
     <Compile Include="Formatter\Deserialization\DeserializationHelpers.cs" />
-    <Compile Include="Formatter\Deserialization\RestierDeserializerProviderProxy.cs" />
-    <Compile Include="Formatter\Serialization\RestierSerializerProviderProxy.cs" />
+    <Compile Include="Formatter\Serialization\RestierResourceSerializer.cs" />
     <Compile Include="Model\ApiConfigurationExtensions.cs" />
     <Compile Include="Model\ModelMapper.cs" />
     <Compile Include="Model\OperationAttribute.cs" />
@@ -99,17 +98,17 @@
     <Compile Include="Formatter\Serialization\DefaultRestierSerializerProvider.cs" />
     <Compile Include="Formatter\Serialization\RestierCollectionSerializer.cs" />
     <Compile Include="Formatter\Serialization\RestierEnumSerializer.cs" />
-    <Compile Include="Formatter\Serialization\RestierComplexTypeSerializer.cs" />
     <Compile Include="Formatter\Serialization\RestierRawSerializer.cs" />
     <Compile Include="Formatter\Serialization\RestierPrimitiveSerializer.cs" />
-    <Compile Include="Formatter\Serialization\RestierFeedSerializer.cs" />
+    <Compile Include="Formatter\Serialization\RestierResourceSetSerializer.cs" />
     <Compile Include="Operation\OperationExecutor.cs" />
+    <Compile Include="Results\NonResourceCollectionResult.cs" />
+    <Compile Include="Results\ResourceSetResult.cs" />
     <Compile Include="Routing\HttpConfigurationExtensions.cs" />
     <Compile Include="HttpRequestMessageExtensions.cs" />
     <Compile Include="Query\RestierQueryExecutor.cs" />
     <Compile Include="Query\RestierQueryBuilder.cs" />
     <Compile Include="Extensions.cs" />
-    <Compile Include="Formatter\RestierFormattingAttribute.cs" />
     <Compile Include="Filters\RestierExceptionFilterAttribute.cs" />
     <Compile Include="RestierPayloadValueConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -121,14 +120,11 @@
     <Compile Include="RestierController.cs" />
     <Compile Include="Results\BaseCollectionResult.cs" />
     <Compile Include="Results\EnumResult.cs" />
-    <Compile Include="Results\NonEntityCollectionResult.cs" />
-    <Compile Include="Results\EntityCollectionResult.cs" />
     <Compile Include="Results\ComplexResult.cs" />
     <Compile Include="Results\RawResult.cs" />
     <Compile Include="Results\PrimitiveResult.cs" />
     <Compile Include="Results\BaseSingleResult.cs" />
     <Compile Include="Results\BaseResult.cs" />
-    <Compile Include="Routing\RestierContainerBuilder.cs" />
     <Compile Include="Routing\RestierRoutingConvention.cs" />
     <Compile Include="Filters\ValidationResultDto.cs" />
     <Compile Include="..\Shared\SharedResources\SharedResources.OData.Designer.cs">