Corrected group name generation from API version

Author: Chris Martinez

samples/webapi/SwaggerODataWebApiSample/Startup.cs

@@ -61,15 +61,14 @@ public void Configuration( IAppBuilder builder )
                                   {
                                       foreach ( var group in apiExplorer.ApiDescriptions )
                                       {
-                                          var apiVersion = group.ApiVersion;
                                           var description = "A sample application with Swagger, Swashbuckle, OData, and API versioning.";
 
                                           if ( group.IsDeprecated )
                                           {
                                               description += " This API version has been deprecated.";
                                           }
 
-                                          info.Version( apiExplorer.GetGroupName( apiVersion ), $"Sample API {apiVersion}" )
+                                          info.Version( group.Name, $"Sample API {group.ApiVersion}" )
                                               .Contact( c => c.Name( "Bill Mei" ).Email( "bill.mei@somewhere.com" ) )
                                               .Description( description )
                                               .License( l => l.Name( "MIT" ).Url( "https://opensource.org/licenses/MIT" ) )

samples/webapi/SwaggerWebApiSample/Startup.cs

@@ -46,15 +46,14 @@ public void Configuration( IAppBuilder builder )
                                     {
                                         foreach ( var group in apiExplorer.ApiDescriptions )
                                         {
-                                            var apiVersion = group.ApiVersion;
                                             var description = "A sample application with Swagger, Swashbuckle, and API versioning.";
 
                                             if ( group.IsDeprecated )
                                             {
                                                 description += " This API version has been deprecated.";
                                             }
 
-                                            info.Version( apiExplorer.GetGroupName( apiVersion ), $"Sample API {apiVersion}" )
+                                            info.Version( group.Name, $"Sample API {group.ApiVersion}" )
                                                 .Contact( c => c.Name( "Bill Mei" ).Email( "bill.mei@somewhere.com" ) )
                                                 .Description( description )
                                                 .License( l => l.Name( "MIT" ).Url( "https://opensource.org/licenses/MIT" ) )

src/Microsoft.AspNet.WebApi.Versioning.ApiExplorer/Description/ApiDescriptionGroupCollection.cs

@@ -23,7 +23,7 @@ public class ApiDescriptionGroupCollection : KeyedCollection<ApiVersion, ApiDesc
         /// </summary>
         /// <param name="apiVersion">The <see cref="ApiVersion">API version</see> to get a description group for.</param>
         /// <returns>A new or existing <see cref="ApiDescriptionGroup">API description group</see>.</returns>
-        public virtual ApiDescriptionGroup GetOrAdd( ApiVersion apiVersion ) => GetOrAdd( apiVersion, _ => null );
+        public virtual ApiDescriptionGroup GetOrAdd( ApiVersion apiVersion ) => GetOrAdd( apiVersion, v => v.ToString() );
 
         /// <summary>
         /// Gets or adds a new API description group for the specified API version.

src/Microsoft.AspNet.WebApi.Versioning.ApiExplorer/Description/VersionedApiExplorer.cs

@@ -188,57 +188,12 @@ protected virtual bool ShouldExploreController( string controllerRouteParameterV
         /// </summary>
         /// <param name="apiVersion">The <see cref="ApiVersion">API version</see> to retrieve a group name for.</param>
         /// <returns>The group name for the specified <paramref name="apiVersion">API version</paramref>.</returns>
-        public virtual string GetGroupName( ApiVersion apiVersion )
+        protected virtual string GetGroupName( ApiVersion apiVersion )
         {
             Arg.NotNull( apiVersion, nameof( apiVersion ) );
             Contract.Ensures( !IsNullOrEmpty( Contract.Result<string>() ) );
 
-            var format = new StringBuilder();
-            var formatProvider = InvariantCulture;
-
-            if ( apiVersion.GroupVersion == null )
-            {
-                format.Append( 'v' );
-                format.Append( apiVersion.MajorVersion ?? 0 );
-
-                if ( apiVersion.MinorVersion != null && apiVersion.MinorVersion.Value > 0 )
-                {
-                    format.Append( '.' );
-                    format.Append( apiVersion.MinorVersion );
-                }
-            }
-            else
-            {
-                format.Append( apiVersion.GroupVersion.Value.ToString( "yyyy-MM-dd", formatProvider ) );
-
-                if ( apiVersion.MajorVersion == null )
-                {
-                    if ( apiVersion.MinorVersion != null )
-                    {
-                        format.Append( "-0." );
-                        format.Append( apiVersion.MinorVersion.Value );
-                    }
-                }
-                else
-                {
-                    format.Append( '-' );
-                    format.Append( apiVersion.MajorVersion.Value );
-
-                    if ( apiVersion.MinorVersion != null && apiVersion.MinorVersion.Value > 0 )
-                    {
-                        format.Append( '.' );
-                        format.Append( apiVersion.MinorVersion.Value );
-                    }
-                }
-            }
-
-            if ( !IsNullOrEmpty( apiVersion.Status ) )
-            {
-                format.Append( '-' );
-                format.Append( apiVersion.Status );
-            }
-
-            return format.ToString();
+            return apiVersion.ToString( Options.GroupNameFormat, InvariantCulture );
         }
 
         /// <summary>