Skip to content

Commit 3f8a444

Browse files
committed
Revert 'Added ServiceFullName to IServiceMetadata'
1 parent ed1afcf commit 3f8a444

File tree

5 files changed

+26
-47
lines changed

5 files changed

+26
-47
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"core": {
3+
"updateMinimum": true,
4+
"type": "Patch",
5+
"changeLogMessages": [
6+
"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."
7+
]
8+
}
9+
}

generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceMetadata.cs

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was generated by a tool.
4-
// Runtime Version: 18.0.0.0
4+
// Runtime Version: 17.0.0.0
55
//
66
// Changes to this file may cause incorrect behavior and will be lost if
77
// the code is regenerated.
@@ -18,8 +18,8 @@ namespace ServiceClientGenerator.Generators.SourceFiles
1818
/// Class to produce the template output
1919
/// </summary>
2020

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

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

3434
AddLicenseHeader();
3535

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

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

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

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

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

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

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

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

67-
#line default
68-
#line hidden
69-
this.Write("\";\r\n }\r\n }\r\n\r\n /// <summary>\r\n /// Gets the value" +
70-
" of the Service Full Name.\r\n /// </summary>\r\n public string Servic" +
71-
"eFullName\r\n {\r\n get\r\n {\r\n return \"");
72-
73-
#line 39 "C:\git\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceMetadata.tt"
74-
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceModel.ServiceFullName));
75-
7667
#line default
7768
#line hidden
7869
this.Write(@""";
@@ -88,14 +79,14 @@ public System.Collections.Generic.IDictionary<string, string> OperationNameMappi
8879
{
8980
return new System.Collections.Generic.Dictionary<string, string>(");
9081

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

9485
#line default
9586
#line hidden
9687
this.Write(")\r\n {\r\n");
9788

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

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

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

111102
#line default
112103
#line hidden
113104
this.Write("\", \"");
114105

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

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

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

124115
}
125116

126117

127118
#line default
128119
#line hidden
129-
this.Write(" };\r\n }\r\n }\r\n }\r\n}\r\n");
120+
this.Write(" };\r\n }\r\n }\r\n }\r\n}");
130121
return this.GenerationEnvironment.ToString();
131122
}
132123
}

generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceMetadata.tt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,6 @@ namespace <#=this.Config.Namespace#>.Internal
2929
}
3030
}
3131

32-
/// <summary>
33-
/// Gets the value of the Service Full Name.
34-
/// </summary>
35-
public string ServiceFullName
36-
{
37-
get
38-
{
39-
return "<#=this.Config.ServiceModel.ServiceFullName#>";
40-
}
41-
}
42-
4332
/// <summary>
4433
/// Gets the dictionary that gives mapping of renamed operations
4534
/// </summary>
@@ -61,4 +50,4 @@ namespace <#=this.Config.Namespace#>.Internal
6150
}
6251
}
6352
}
64-
}
53+
}

sdk/src/Core/Amazon.Runtime/Internal/IServiceMetadata.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,9 @@ public interface IServiceMetadata
2222
/// </summary>
2323
string ServiceId { get; }
2424

25-
/// <summary>
26-
/// Gets the value of the Service Full Name.
27-
/// </summary>
28-
string ServiceFullName { get; }
29-
3025
/// <summary>
3126
/// Gets the dictionary that gives mapping of renamed operations
3227
/// </summary>
3328
System.Collections.Generic.IDictionary<string, string> OperationNameMapping { get; }
3429
}
35-
}
30+
}

sdk/src/Core/Amazon.Runtime/Internal/ServiceMetadata.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,9 @@ internal class ServiceMetadata : IServiceMetadata
3030
/// </summary>
3131
public string ServiceId { get; }
3232

33-
/// <summary>
34-
/// Gets the value of the Service Full Name.
35-
/// </summary>
36-
public string ServiceFullName { get; }
37-
3833
/// <summary>
3934
/// Gets the dictionary that gives mapping of renamed operations
4035
/// </summary>
4136
public IDictionary<string, string> OperationNameMapping { get; } = new Dictionary<string, string>();
4237
}
43-
}
38+
}

0 commit comments

Comments
 (0)