Rename Microsoft.OData.Service.Library to Microsoft.Restier.Providers…

… InMemory, since it is actually a new provider. In memory model's entity set won't be added into model automatically as EF, add them in RestierModelExtender. Add entity with collection of EdmStructuredObject ADD/UPDATE support. Add Etag support. Add Derived Entity ADD/UPDATE support. Add TrippinInMemory client for test.
chinadragon0515 · Aug 11, 2016 · e1cc300 · e1cc300
1 parent 36da89f
commit e1cc300
Show file tree

Hide file tree

Showing 31 changed files with 8,663 additions and 367 deletions.
diff --git a/RESTier.sln b/RESTier.sln
@@ -39,66 +39,122 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Restier.Publisher
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Restier.Providers.EntityFramework", "src\Microsoft.Restier.Providers.EntityFramework\Microsoft.Restier.Providers.EntityFramework.csproj", "{F7EC910E-17CE-4579-84C5-36D3777B3218}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OData.Service.Library", "test\ODataEndToEnd\Microsoft.OData.Service.Library\Microsoft.OData.Service.Library.csproj", "{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Restier.Providers.InMemory", "test\ODataEndToEnd\Microsoft.Restier.Providers.InMemory\Microsoft.Restier.Providers.InMemory.csproj", "{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508}.Release|x64.ActiveCfg = Release|Any CPU
+		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508}.Release|x86.ActiveCfg = Release|Any CPU
 		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F}.Release|x64.ActiveCfg = Release|Any CPU
+		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F}.Release|x86.ActiveCfg = Release|Any CPU
 		{C2CC463B-9F69-401E-89B3-FA1F9A44E253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C2CC463B-9F69-401E-89B3-FA1F9A44E253}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2CC463B-9F69-401E-89B3-FA1F9A44E253}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C2CC463B-9F69-401E-89B3-FA1F9A44E253}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C2CC463B-9F69-401E-89B3-FA1F9A44E253}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2CC463B-9F69-401E-89B3-FA1F9A44E253}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2CC463B-9F69-401E-89B3-FA1F9A44E253}.Release|x64.ActiveCfg = Release|Any CPU
+		{C2CC463B-9F69-401E-89B3-FA1F9A44E253}.Release|x86.ActiveCfg = Release|Any CPU
 		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6}.Release|x64.ActiveCfg = Release|Any CPU
+		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6}.Release|x86.ActiveCfg = Release|Any CPU
 		{B10AC223-BB61-4229-A063-353AD5D7E3C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B10AC223-BB61-4229-A063-353AD5D7E3C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B10AC223-BB61-4229-A063-353AD5D7E3C6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B10AC223-BB61-4229-A063-353AD5D7E3C6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B10AC223-BB61-4229-A063-353AD5D7E3C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B10AC223-BB61-4229-A063-353AD5D7E3C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B10AC223-BB61-4229-A063-353AD5D7E3C6}.Release|x64.ActiveCfg = Release|Any CPU
+		{B10AC223-BB61-4229-A063-353AD5D7E3C6}.Release|x86.ActiveCfg = Release|Any CPU
 		{B263C1E5-0184-4A1D-B438-8233559FD76B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B263C1E5-0184-4A1D-B438-8233559FD76B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B263C1E5-0184-4A1D-B438-8233559FD76B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B263C1E5-0184-4A1D-B438-8233559FD76B}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B263C1E5-0184-4A1D-B438-8233559FD76B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B263C1E5-0184-4A1D-B438-8233559FD76B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B263C1E5-0184-4A1D-B438-8233559FD76B}.Release|x64.ActiveCfg = Release|Any CPU
+		{B263C1E5-0184-4A1D-B438-8233559FD76B}.Release|x86.ActiveCfg = Release|Any CPU
 		{B379640E-9064-438D-8DA5-6F7B394C2C46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B379640E-9064-438D-8DA5-6F7B394C2C46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B379640E-9064-438D-8DA5-6F7B394C2C46}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B379640E-9064-438D-8DA5-6F7B394C2C46}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{B379640E-9064-438D-8DA5-6F7B394C2C46}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B379640E-9064-438D-8DA5-6F7B394C2C46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B379640E-9064-438D-8DA5-6F7B394C2C46}.Release|x64.ActiveCfg = Release|Any CPU
+		{B379640E-9064-438D-8DA5-6F7B394C2C46}.Release|x86.ActiveCfg = Release|Any CPU
 		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7}.Release|x64.ActiveCfg = Release|Any CPU
+		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7}.Release|x86.ActiveCfg = Release|Any CPU
 		{04B29D57-8004-45FF-8C41-C49E0F20707C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{04B29D57-8004-45FF-8C41-C49E0F20707C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04B29D57-8004-45FF-8C41-C49E0F20707C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{04B29D57-8004-45FF-8C41-C49E0F20707C}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{04B29D57-8004-45FF-8C41-C49E0F20707C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{04B29D57-8004-45FF-8C41-C49E0F20707C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04B29D57-8004-45FF-8C41-C49E0F20707C}.Release|x64.ActiveCfg = Release|Any CPU
+		{04B29D57-8004-45FF-8C41-C49E0F20707C}.Release|x86.ActiveCfg = Release|Any CPU
 		{31FE1F5B-7CD8-48F1-9CE3-4E57A0066440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{31FE1F5B-7CD8-48F1-9CE3-4E57A0066440}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31FE1F5B-7CD8-48F1-9CE3-4E57A0066440}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{31FE1F5B-7CD8-48F1-9CE3-4E57A0066440}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{31FE1F5B-7CD8-48F1-9CE3-4E57A0066440}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31FE1F5B-7CD8-48F1-9CE3-4E57A0066440}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31FE1F5B-7CD8-48F1-9CE3-4E57A0066440}.Release|x64.ActiveCfg = Release|Any CPU
+		{31FE1F5B-7CD8-48F1-9CE3-4E57A0066440}.Release|x86.ActiveCfg = Release|Any CPU
 		{186F667E-54E5-4B57-9998-21D74CB77C24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{186F667E-54E5-4B57-9998-21D74CB77C24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{186F667E-54E5-4B57-9998-21D74CB77C24}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{186F667E-54E5-4B57-9998-21D74CB77C24}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{186F667E-54E5-4B57-9998-21D74CB77C24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{186F667E-54E5-4B57-9998-21D74CB77C24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{186F667E-54E5-4B57-9998-21D74CB77C24}.Release|x64.ActiveCfg = Release|Any CPU
+		{186F667E-54E5-4B57-9998-21D74CB77C24}.Release|x86.ActiveCfg = Release|Any CPU
 		{F7EC910E-17CE-4579-84C5-36D3777B3218}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F7EC910E-17CE-4579-84C5-36D3777B3218}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F7EC910E-17CE-4579-84C5-36D3777B3218}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F7EC910E-17CE-4579-84C5-36D3777B3218}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F7EC910E-17CE-4579-84C5-36D3777B3218}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F7EC910E-17CE-4579-84C5-36D3777B3218}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F7EC910E-17CE-4579-84C5-36D3777B3218}.Release|x64.ActiveCfg = Release|Any CPU
+		{F7EC910E-17CE-4579-84C5-36D3777B3218}.Release|x86.ActiveCfg = Release|Any CPU
 		{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}.Release|x64.ActiveCfg = Release|Any CPU
+		{1CA9B17F-D3F8-4FC3-A992-5135DCCAB9DE}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Microsoft.Restier.Publishers.OData/Model/RestierModelExtender.cs b/src/Microsoft.Restier.Publishers.OData/Model/RestierModelExtender.cs
@@ -218,6 +218,17 @@ private void BuildEntitySetsAndSingletons(ModelContext context, EdmModel model)
                         var addedEntitySet = container.AddEntitySet(property.Name, entityType);
                         this.addedNavigationSources.Add(addedEntitySet);
                     }
+                    else
+                    {
+                        // If ODataConventionModelBuilder is used to build the model, and a entity set is added,
+                        // i.e. the entity set is already in the container,
+                        // we should add it into entitySetProperties and addedNavigationSources
+                        if (!this.entitySetProperties.Contains(property))
+                        {
+                            this.entitySetProperties.Add(property);
+                            this.addedNavigationSources.Add(container.FindEntitySet(property.Name) as EdmEntitySet);
+                        }
+                    }
                 }
                 else
                 {

diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Library/DataStoreManager/IDataStoreManager.cs b/test/ODataEndToEnd/Microsoft.OData.Service.Library/DataStoreManager/IDataStoreManager.cs
diff --git a/test/ODataEndToEnd/Microsoft.OData.Service.Library/packages.config b/test/ODataEndToEnd/Microsoft.OData.Service.Library/packages.config
diff --git a/...EndToEnd/Microsoft.OData.Service.Sample.Tests/Microsoft.OData.Service.Sample.Tests.csproj b/...EndToEnd/Microsoft.OData.Service.Sample.Tests/Microsoft.OData.Service.Sample.Tests.csproj
@@ -34,6 +34,13 @@
     <Compile Include="BatchTests.cs" />
     <Compile Include="HttpResponseCodeTests.cs" />
     <Compile Include="PropertyAccessTests.cs" />
+    <Compile Include="ServiceReference\TrippinInMemoryProxy.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>TrippinInMemoryProxy.tt</DependentUpon>
+    </Compile>
+    <Compile Include="TrippinInMemoryE2ETestBase.cs" />
+    <Compile Include="TrippinInMemoryE2EEtagTestCases.cs" />
     <Compile Include="TrippinE2EEtagTestCases.cs" />
     <Compile Include="TrippinE2EOnFilterTestCases.cs" />
     <Compile Include="TrippinE2ETestBase.cs" />
@@ -53,6 +60,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="ServiceReference\TrippinInMemoryProxy.ttinclude" />
     <None Include="ServiceReference\TrippinProxy.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>TrippinProxy.cs</LastGenOutput>
@@ -110,7 +118,6 @@
       <Private>True</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Content Include="Baselines\OnFilterCastExpand1.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -226,6 +233,10 @@
     <Content Include="Baselines\OnfilterSimpleExpand3.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="ServiceReference\TrippinInMemoryProxy.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>TrippinInMemoryProxy.cs</LastGenOutput>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">