Fix duplicate param strings in operationId

rbeauchamp · Jan 5, 2016 · 7861490 · 7861490
1 parent 0fc7fd8
commit 7861490
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Swashbuckle.OData.Nuget/Swashbuckle.OData.NuGet.nuproj b/Swashbuckle.OData.Nuget/Swashbuckle.OData.NuGet.nuproj
@@ -30,7 +30,7 @@
  <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.9.1</Version>
+ <Version>2.9.2</Version>
  </PropertyGroup>
  <ItemGroup>
  <ProjectReference Include="..\Swashbuckle.OData\Swashbuckle.OData.csproj" />

diff --git a/Swashbuckle.OData/EnsureUniqueOperationIdsFilter.cs b/Swashbuckle.OData/EnsureUniqueOperationIdsFilter.cs
@@ -42,18 +42,17 @@ private static void AppendParameterNamesToOperationId(List<Operation> allOperati
  {
  Contract.Requires(allOperations != null);
 
- foreach (var operation in allOperations)
+ foreach (var operation in allOperations.Where(operation => !operation.operationId.Contains("By") 
+ && operation.parameters != null
+ && operation.parameters.Any(p => p.@in == "path")))
  {
- if (operation.parameters != null && operation.parameters.Any(p => p.@in == "body" || p.@in == "path"))
- {
- // Select the capitalized parameter names
- var parameters = operation.parameters
- .Where(p => p.@in == "body" || p.@in == "path")
- .Select(p => CultureInfo.InvariantCulture.TextInfo.ToTitleCase(p.name));
+ // Select the capitalized parameter names
+ var parameters = operation.parameters
+ .Where(p => p.@in == "path")
+ .Select(p => CultureInfo.InvariantCulture.TextInfo.ToTitleCase(p.name));
 
- // Set the operation id to match the format "OperationByParam1AndParam2"
- operation.operationId = $"{operation.operationId}By{string.Join("And", parameters)}";
- }
+ // Set the operation id to match the format "OperationByParam1AndParam2"
+ operation.operationId = $"{operation.operationId}By{string.Join("And", parameters)}";
  }
  }
 

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.9.1")]
+[assembly: AssemblyInformationalVersion("2.9.2")]
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.9.1.{build}
+version: 2.9.2.{build}
 
 before_build:
 - cmd: nuget restore