Simplify mock requests. Fixes #41

rbeauchamp · Dec 30, 2015 · a139e32 · a139e32
1 parent dfef2be
commit a139e32
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Swashbuckle.OData.Nuget/Swashbuckle.OData.NuGet.nuproj b/Swashbuckle.OData.Nuget/Swashbuckle.OData.NuGet.nuproj
@@ -25,12 +25,12 @@
     <Owners>Richard Beauchamp</Owners>
     <Summary>Extends Swashbuckle with OData v4 support!</Summary>
     <Description>Extends Swashbuckle with OData v4 support!</Description>
-    <ReleaseNotes>Support constructor dependency injection. Improve error detection and handling.</ReleaseNotes>
+    <ReleaseNotes>Support constructor dependency injection. Improve error detection and handling. Fix issue 41.</ReleaseNotes>
     <ProjectUrl>https://github.com/rbeauchamp/Swashbuckle.OData</ProjectUrl>
     <LicenseUrl>https://github.com/rbeauchamp/Swashbuckle.OData/blob/master/License.txt</LicenseUrl>
     <Copyright>Copyright 2015</Copyright>
     <Tags>Swashbuckle Swagger SwaggerUi OData Documentation Discovery Help WebApi AspNet AspNetWebApi Docs WebHost IIS</Tags>
-    <Version>2.8.3</Version>
+    <Version>2.8.4</Version>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Swashbuckle.OData\Swashbuckle.OData.csproj" />

diff --git a/Swashbuckle.OData/Descriptions/SwaggerRouteStrategy.cs b/Swashbuckle.OData/Descriptions/SwaggerRouteStrategy.cs
@@ -104,10 +104,7 @@ private static HttpRequestMessage CreateHttpRequestMessage(HttpMethod httpMethod
             httpRequestMessageProperties.RouteName = oDataRoute.GetODataPathRouteConstraint().RouteName;
             httpRequestMessageProperties.RoutingConventions = oDataRoute.GetODataPathRouteConstraint().RoutingConventions;
             httpRequestMessageProperties.PathHandler = oDataRoute.GetODataPathRouteConstraint().PathHandler;
-            var httpRouteCollection = httpConfig.Routes;
-            Contract.Assume(httpRouteCollection != null);
-            var routeData = httpRouteCollection.GetRouteData(httpRequestMessage);
-            httpRequestMessage.SetRouteData(routeData);
+            httpRequestMessage.SetRouteData(oDataRoute.GetRouteData("/", httpRequestMessage));
             return httpRequestMessage;
         }
 

diff --git a/Swashbuckle.OData/Properties/AssemblyInfo.cs b/Swashbuckle.OData/Properties/AssemblyInfo.cs
@@ -37,4 +37,4 @@
 
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: AssemblyInformationalVersion("2.8.3")]
+[assembly: AssemblyInformationalVersion("2.8.4")]