Update convention-based link generation. Fixes #265

Author: Chris Martinez

src/Microsoft.AspNet.OData.Versioning.ApiExplorer/Description/ODataRouteBuilder.cs

@@ -21,13 +21,13 @@ sealed class ODataRouteBuilder
     {
         static readonly Type ODataQueryOptionsType = typeof( ODataQueryOptions );
         static readonly Type ODataActionParametersType = typeof( ODataActionParameters );
-        static readonly Type GeographyType = typeof( Spatial.Geography );
-        static readonly Type GeometryType = typeof( Spatial.Geometry );
-        static readonly Dictionary<Type, string> quotedTypes = new Dictionary<Type, string>()
+        static readonly Dictionary<Type, string> quotedTypes = new Dictionary<Type, string>( new TypeComparer() )
         {
             [typeof( string )] = string.Empty,
             [typeof( TimeSpan )] = "duration",
             [typeof( byte[] )] = "binary",
+            [typeof( Spatial.Geography )] = "geography",
+            [typeof( Spatial.Geometry )] = "geometry",
         };
 
         internal ODataRouteBuilder( ODataRouteBuilderContext context )
@@ -220,20 +220,23 @@ void ExpandParameterTemplate( StringBuilder template, IEdmTypeReference typeRefe
             Contract.Requires( !IsNullOrEmpty( name ) );
 
             var typeDef = typeReference.Definition;
+            var offset = template.Length;
 
             template.Append( "{" );
             template.Append( name );
             template.Append( "}" );
 
             if ( typeDef.TypeKind == EdmTypeKind.Enum )
             {
-                template.Insert( 0, '\'' );
+                var fullName = typeReference.FullName();
 
                 if ( !Context.AllowUnqualifiedEnum )
                 {
-                    template.Insert( 0, typeReference.FullName() );
+                    template.Insert( offset, fullName );
+                    offset += fullName.Length;
                 }
 
+                template.Insert( offset, '\'' );
                 template.Append( '\'' );
                 return;
             }
@@ -242,18 +245,9 @@ void ExpandParameterTemplate( StringBuilder template, IEdmTypeReference typeRefe
 
             if ( quotedTypes.TryGetValue( type, out var prefix ) )
             {
-                template.Insert( 0, '\'' );
-                template.Insert( 0, prefix );
-                template.Append( '\'' );
-            }
-            else if ( GeographyType.IsAssignableFrom( type ) )
-            {
-                template.Insert( 0, "geography'" );
-                template.Append( '\'' );
-            }
-            else if ( GeometryType.IsAssignableFrom( type ) )
-            {
-                template.Insert( 0, "geometry'" );
+                template.Insert( offset, prefix );
+                offset += prefix.Length;
+                template.Insert( offset, '\'' );
                 template.Append( '\'' );
             }
         }
@@ -364,5 +358,27 @@ static bool IsFunctionParameter( IEdmOperation operation, ApiParameterDescriptio
 
             return operation.Parameters.Any( p => p.Name.Equals( name, OrdinalIgnoreCase ) );
         }
+
+        sealed class TypeComparer : IEqualityComparer<Type>
+        {
+            public bool Equals( Type x, Type y ) => x.IsAssignableFrom( y );
+
+            public int GetHashCode( Type obj )
+            {
+                if ( obj.BaseType.Equals( typeof( ValueType ) ) || obj.BaseType.Equals( typeof( Array ) ) )
+                {
+                    return obj.GetHashCode();
+                }
+
+                var baseType = typeof( object );
+
+                while ( !obj.BaseType.Equals( baseType ) )
+                {
+                    obj = obj.BaseType;
+                }
+
+                return obj.GetHashCode();
+            }
+        }
     }
 }

src/Microsoft.AspNet.OData.Versioning.ApiExplorer/Microsoft.AspNet.OData.Versioning.ApiExplorer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <VersionPrefix>1.2.0</VersionPrefix>
+  <VersionPrefix>1.2.1</VersionPrefix>
   <AssemblyVersion>1.2.0.0</AssemblyVersion>
   <TargetFramework>net45</TargetFramework>
   <AssemblyTitle>Microsoft ASP.NET Web API Versioned API Explorer for OData v4.0</AssemblyTitle>
@@ -12,7 +12,7 @@
  </PropertyGroup>
 
  <ItemGroup>
-  <ReleaseNotes Include="Support substituting API version parameter in route templates (Issue 247)" />
+  <ReleaseNotes Include="Fix convention-based link generation (Issue 265)" />
  </ItemGroup>
 
  <ItemGroup>