Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions generator/.DevConfigs/88a0bfca-8c33-45e0-a4a9-ec4cb83410ec.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"core": {
"updateMinimum": true,
"type": "Patch",
"changeLogMessages": [
"Revert [Added ServiceFullName to IServiceMetadata](https://github.com/aws/aws-sdk-net/pull/4266/changes/00ec2fca1e84da1a42bc815f0a1de0b4c912b323) as it caused other service packages to throw an exception."
],
"backwardIncompatibilitiesToIgnore": [
"Amazon.Runtime.Internal.IServiceMetadata/MethodRemoved"
]
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version: 18.0.0.0
// Runtime Version: 17.0.0.0
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand All @@ -18,8 +18,8 @@ namespace ServiceClientGenerator.Generators.SourceFiles
/// Class to produce the template output
/// </summary>

#line 1 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "18.0.0.0")]
#line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
public partial class ServiceMetadata : BaseGenerator
{
#line hidden
Expand All @@ -29,7 +29,7 @@ public partial class ServiceMetadata : BaseGenerator
public override string TransformText()
{

#line 6 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 6 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"

AddLicenseHeader();

Expand All @@ -38,21 +38,21 @@ public override string TransformText()
#line hidden
this.Write("\r\n\r\nusing Amazon.Runtime.Internal;\r\n\r\n\r\nnamespace ");

#line 14 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 14 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace));

#line default
#line hidden
this.Write(".Internal\r\n{\r\n /// <summary>\r\n /// Service metadata for Amazon ");

#line 17 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 17 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
#line hidden
this.Write(" service\r\n /// </summary>\r\n public partial class Amazon");

#line 19 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 19 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ClassName));

#line default
Expand All @@ -61,18 +61,9 @@ public override string TransformText()
"alue of the Service Id.\r\n /// </summary>\r\n public string ServiceId" +
"\r\n {\r\n get\r\n {\r\n return \"");

#line 28 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 28 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceId));

#line default
#line hidden
this.Write("\";\r\n }\r\n }\r\n\r\n /// <summary>\r\n /// Gets the value" +
" of the Service Full Name.\r\n /// </summary>\r\n public string Servic" +
"eFullName\r\n {\r\n get\r\n {\r\n return \"");

#line 39 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceModel.ServiceFullName));

#line default
#line hidden
this.Write(@""";
Expand All @@ -88,14 +79,14 @@ public System.Collections.Generic.IDictionary<string, string> OperationNameMappi
{
return new System.Collections.Generic.Dictionary<string, string>(");

#line 50 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 39 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceModel.OperationsNameMapping.Count));

#line default
#line hidden
this.Write(")\r\n {\r\n");

#line 52 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 41 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"

foreach(var entry in this.Config.ServiceModel.OperationsNameMapping)
{
Expand All @@ -105,28 +96,28 @@ public System.Collections.Generic.IDictionary<string, string> OperationNameMappi
#line hidden
this.Write(" {\"");

#line 56 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(entry.Key));

#line default
#line hidden
this.Write("\", \"");

#line 56 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 45 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
this.Write(this.ToStringHelper.ToStringWithCulture(entry.Value));

#line default
#line hidden
this.Write("\"},\r\n");

#line 57 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
#line 46 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"

}


#line default
#line hidden
this.Write(" };\r\n }\r\n }\r\n }\r\n}\r\n");
this.Write(" };\r\n }\r\n }\r\n }\r\n}");
return this.GenerationEnvironment.ToString();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,6 @@ namespace <#=this.Config.Namespace#>.Internal
}
}

/// <summary>
/// Gets the value of the Service Full Name.
/// </summary>
public string ServiceFullName
{
get
{
return "<#=this.Config.ServiceModel.ServiceFullName#>";
}
}

/// <summary>
/// Gets the dictionary that gives mapping of renamed operations
/// </summary>
Expand All @@ -61,4 +50,4 @@ namespace <#=this.Config.Namespace#>.Internal
}
}
}
}
}
7 changes: 1 addition & 6 deletions sdk/src/Core/Amazon.Runtime/Internal/IServiceMetadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,9 @@ public interface IServiceMetadata
/// </summary>
string ServiceId { get; }

/// <summary>
/// Gets the value of the Service Full Name.
/// </summary>
string ServiceFullName { get; }

/// <summary>
/// Gets the dictionary that gives mapping of renamed operations
/// </summary>
System.Collections.Generic.IDictionary<string, string> OperationNameMapping { get; }
}
}
}
7 changes: 1 addition & 6 deletions sdk/src/Core/Amazon.Runtime/Internal/ServiceMetadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,9 @@ internal class ServiceMetadata : IServiceMetadata
/// </summary>
public string ServiceId { get; }

/// <summary>
/// Gets the value of the Service Full Name.
/// </summary>
public string ServiceFullName { get; }

/// <summary>
/// Gets the dictionary that gives mapping of renamed operations
/// </summary>
public IDictionary<string, string> OperationNameMapping { get; } = new Dictionary<string, string>();
}
}
}