Skip to content

Commit a692b6b

Browse files
surgicalcodersurgicalcoder
committed
No prefixing on it's own output
1 parent 3538150 commit a692b6b

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎GoLive.Generator.ApiClientGenerator.Tests.WebApi/GeneratedURLs.cs

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -17,240 +17,240 @@
1717
namespace GoLive.Generator.ApiClientGenerator.URLs;
1818
public class GeneratedURLs
1919
{
20-
public static string InheritingTwo_GetPagedApiTest_Url(int Page = 1, string Filter = null, int PageSize = 20, QueryString queryString = default)
20+
public static string InheritingTwo_GetPagedApiTest(int Page = 1, string Filter = null, int PageSize = 20, QueryString queryString = default)
2121
{
2222
queryString = queryString.Add("Filter", Filter.ToString());
2323
return $"/InheritingTwo/InheritingTwo/{Page}/{PageSize}{queryString}";
2424
}
2525

26-
public static string InheritingTwo_GetApiTest2_Url(int Page = 1, QueryString queryString = default)
26+
public static string InheritingTwo_GetApiTest2(int Page = 1, QueryString queryString = default)
2727
{
2828
return $"/ThisIsTestTwo/{Page}{queryString}";
2929
}
3030

31-
public static string InheritingTwo_Get_Url(QueryString queryString = default)
31+
public static string InheritingTwo_Get(QueryString queryString = default)
3232
{
3333
return $"/InheritingTwo{queryString}";
3434
}
3535

36-
public static string InheritingTwo_GetUser_Url(int Id, QueryString queryString = default)
36+
public static string InheritingTwo_GetUser(int Id, QueryString queryString = default)
3737
{
3838
queryString = queryString.Add("Id", Id.ToString());
3939
return $"/InheritingTwo{queryString}";
4040
}
4141

42-
public static string InheritingTwo_GetUser_Url(QueryString queryString = default)
42+
public static string InheritingTwo_GetUser(QueryString queryString = default)
4343
{
4444
return $"/InheritingTwo{queryString}";
4545
}
4646

47-
public static string InheritingTwo_GetUser2_Url(string Id, string Id2, QueryString queryString = default)
47+
public static string InheritingTwo_GetUser2(string Id, string Id2, QueryString queryString = default)
4848
{
4949
queryString = queryString.Add("Id", Id.ToString());
5050
queryString = queryString.Add("Id2", Id2.ToString());
5151
return $"/InheritingTwo{queryString}";
5252
}
5353

54-
public static string InheritingTwo_OverrideTest_Url(string Id, QueryString queryString = default)
54+
public static string InheritingTwo_OverrideTest(string Id, QueryString queryString = default)
5555
{
5656
queryString = queryString.Add("Id", Id.ToString());
5757
return $"/InheritingTwo{queryString}";
5858
}
5959

60-
public static string InheritingTwo_GetUser4_Url(int Id3, QueryString queryString = default)
60+
public static string InheritingTwo_GetUser4(int Id3, QueryString queryString = default)
6161
{
6262
queryString = queryString.Add("Id3", Id3.ToString());
6363
return $"/InheritingTwo{queryString}";
6464
}
6565

66-
public static string InheritingUser2_Get_Url(QueryString queryString = default)
66+
public static string InheritingUser2_Get(QueryString queryString = default)
6767
{
6868
return $"/InheritingUser2{queryString}";
6969
}
7070

71-
public static string InheritingUser2_GetUser_Url(int Id, QueryString queryString = default)
71+
public static string InheritingUser2_GetUser(int Id, QueryString queryString = default)
7272
{
7373
queryString = queryString.Add("Id", Id.ToString());
7474
return $"/InheritingUser2{queryString}";
7575
}
7676

77-
public static string InheritingUser2_GetUser_Url(QueryString queryString = default)
77+
public static string InheritingUser2_GetUser(QueryString queryString = default)
7878
{
7979
return $"/InheritingUser2{queryString}";
8080
}
8181

82-
public static string InheritingUser2_GetUser2_Url(string Id, string Id2, QueryString queryString = default)
82+
public static string InheritingUser2_GetUser2(string Id, string Id2, QueryString queryString = default)
8383
{
8484
queryString = queryString.Add("Id", Id.ToString());
8585
queryString = queryString.Add("Id2", Id2.ToString());
8686
return $"/InheritingUser2{queryString}";
8787
}
8888

89-
public static string InheritingUser2_OverrideTest_Url(string Id, QueryString queryString = default)
89+
public static string InheritingUser2_OverrideTest(string Id, QueryString queryString = default)
9090
{
9191
queryString = queryString.Add("Id", Id.ToString());
9292
return $"/InheritingUser2{queryString}";
9393
}
9494

95-
public static string InheritingUser2_GetUser4_Url(int Id3, QueryString queryString = default)
95+
public static string InheritingUser2_GetUser4(int Id3, QueryString queryString = default)
9696
{
9797
queryString = queryString.Add("Id3", Id3.ToString());
9898
return $"/InheritingUser2{queryString}";
9999
}
100100

101-
public static string NonApi_TestModelBinderDifferentNameUnderId_Url(System.String Id, QueryString queryString = default)
101+
public static string NonApi_TestModelBinderDifferentNameUnderId(System.String Id, QueryString queryString = default)
102102
{
103103
return $"/api/NonApi/TestModelBinderDifferentNameUnderId/{Id}{queryString}";
104104
}
105105

106-
public static string NonApi_TestModelBinderDifferentNameUnderId3_Url(System.String Id, QueryString queryString = default)
106+
public static string NonApi_TestModelBinderDifferentNameUnderId3(System.String Id, QueryString queryString = default)
107107
{
108108
return $"/api/NonApi/TestModelBinderDifferentNameUnderId3/{Id}{queryString}";
109109
}
110110

111-
public static string TestIssue_Get_Url(string Id = "", QueryString queryString = default)
111+
public static string TestIssue_Get(string Id = "", QueryString queryString = default)
112112
{
113113
return $"/api/TestIssue/Get/{Id}{queryString}";
114114
}
115115

116-
public static string User_Get_Url(QueryString queryString = default)
116+
public static string User_Get(QueryString queryString = default)
117117
{
118118
return $"/User{queryString}";
119119
}
120120

121-
public static string User_GetUser_Url(int Id, QueryString queryString = default)
121+
public static string User_GetUser(int Id, QueryString queryString = default)
122122
{
123123
queryString = queryString.Add("Id", Id.ToString());
124124
return $"/User{queryString}";
125125
}
126126

127-
public static string User_GetUser_Url(QueryString queryString = default)
127+
public static string User_GetUser(QueryString queryString = default)
128128
{
129129
return $"/User{queryString}";
130130
}
131131

132-
public static string User_GetUser2_Url(string Id, string Id2, QueryString queryString = default)
132+
public static string User_GetUser2(string Id, string Id2, QueryString queryString = default)
133133
{
134134
queryString = queryString.Add("Id", Id.ToString());
135135
queryString = queryString.Add("Id2", Id2.ToString());
136136
return $"/User{queryString}";
137137
}
138138

139-
public static string User_OverrideTest_Url(string Id, QueryString queryString = default)
139+
public static string User_OverrideTest(string Id, QueryString queryString = default)
140140
{
141141
queryString = queryString.Add("Id", Id.ToString());
142142
return $"/User{queryString}";
143143
}
144144

145-
public static string User_GetUser4_Url(int Id3, QueryString queryString = default)
145+
public static string User_GetUser4(int Id3, QueryString queryString = default)
146146
{
147147
queryString = queryString.Add("Id3", Id3.ToString());
148148
return $"/User{queryString}";
149149
}
150150

151-
public static string WeatherForecast_TestIgnoreGenericParmaeter_Url(string optionNotRemoved, QueryString queryString = default)
151+
public static string WeatherForecast_TestIgnoreGenericParmaeter(string optionNotRemoved, QueryString queryString = default)
152152
{
153153
queryString = queryString.Add("optionNotRemoved", optionNotRemoved.ToString());
154154
return $"/WeatherForecast{queryString}";
155155
}
156156

157-
public static string WeatherForecast_TestIgnoreNormalParameter_Url(string optionNotRemoved, QueryString queryString = default)
157+
public static string WeatherForecast_TestIgnoreNormalParameter(string optionNotRemoved, QueryString queryString = default)
158158
{
159159
queryString = queryString.Add("optionNotRemoved", optionNotRemoved.ToString());
160160
return $"/WeatherForecast{queryString}";
161161
}
162162

163-
public static string WeatherForecast_TestIgnoreWithCustomAttribute_Url(string optionNotRemoved, QueryString queryString = default)
163+
public static string WeatherForecast_TestIgnoreWithCustomAttribute(string optionNotRemoved, QueryString queryString = default)
164164
{
165165
queryString = queryString.Add("optionNotRemoved", optionNotRemoved.ToString());
166166
return $"/WeatherForecast{queryString}";
167167
}
168168

169-
public static string WeatherForecast_TestModelBinderDifferentName_Url(System.String OtherName, QueryString queryString = default)
169+
public static string WeatherForecast_TestModelBinderDifferentName(System.String OtherName, QueryString queryString = default)
170170
{
171171
queryString = queryString.Add("OtherName", OtherName.ToString());
172172
return $"/WeatherForecast{queryString}";
173173
}
174174

175-
public static string WeatherForecast_TestRemapTypeWithAnotherType_Url(QueryString queryString = default)
175+
public static string WeatherForecast_TestRemapTypeWithAnotherType(QueryString queryString = default)
176176
{
177177
return $"/WeatherForecast{queryString}";
178178
}
179179

180-
public static string WeatherForecast_TestRemapTypeWithAnotherType2_Url(System.String option, QueryString queryString = default)
180+
public static string WeatherForecast_TestRemapTypeWithAnotherType2(System.String option, QueryString queryString = default)
181181
{
182182
queryString = queryString.Add("option", option.ToString());
183183
return $"/WeatherForecast{queryString}";
184184
}
185185

186-
public static string WeatherForecast_Get_Url(QueryString queryString = default)
186+
public static string WeatherForecast_Get(QueryString queryString = default)
187187
{
188188
return $"/WeatherForecast{queryString}";
189189
}
190190

191-
public static string WeatherForecast_UrlWithParametersFromRoute_Url(string Input1, string Input2, QueryString queryString = default)
191+
public static string WeatherForecast_UrlWithParametersFromRoute(string Input1, string Input2, QueryString queryString = default)
192192
{
193193
return $"/WeatherForecast/UrlWithParametersFromRoute/{Input1}/{Input2}{queryString}";
194194
}
195195

196-
public static string WeatherForecast_UrlWithParametersFromRoute2_Url(string Input1, string Input2, string Input3, QueryString queryString = default)
196+
public static string WeatherForecast_UrlWithParametersFromRoute2(string Input1, string Input2, string Input3, QueryString queryString = default)
197197
{
198198
queryString = queryString.Add("Input3", Input3.ToString());
199199
return $"/WeatherForecast/UrlWithParametersFromRoute2/{Input1}/{Input2}{queryString}";
200200
}
201201

202-
public static string WeatherForecast_GetBytes_Url(QueryString queryString = default)
202+
public static string WeatherForecast_GetBytes(QueryString queryString = default)
203203
{
204204
return $"/WeatherForecast{queryString}";
205205
}
206206

207-
public static string WeatherForecast_GetSingle_Url(int Id, QueryString queryString = default)
207+
public static string WeatherForecast_GetSingle(int Id, QueryString queryString = default)
208208
{
209209
queryString = queryString.Add("Id", Id.ToString());
210210
return $"/WeatherForecast{queryString}";
211211
}
212212

213-
public static string WeatherForecast_GetSingleFromServiceExample_Url(QueryString queryString = default)
213+
public static string WeatherForecast_GetSingleFromServiceExample(QueryString queryString = default)
214214
{
215215
return $"/WeatherForecast{queryString}";
216216
}
217217

218-
public static string WeatherForecast_FormUploadTest1_Url(QueryString queryString = default)
218+
public static string WeatherForecast_FormUploadTest1(QueryString queryString = default)
219219
{
220220
return $"/WeatherForecast{queryString}";
221221
}
222222

223-
public static string WeatherForecast_FormUploadTest2_Url(QueryString queryString = default)
223+
public static string WeatherForecast_FormUploadTest2(QueryString queryString = default)
224224
{
225225
return $"/WeatherForecast{queryString}";
226226
}
227227

228-
public static string WeatherForecast_TaskIssue_Url(QueryString queryString = default)
228+
public static string WeatherForecast_TaskIssue(QueryString queryString = default)
229229
{
230230
return $"/WeatherForecast{queryString}";
231231
}
232232

233-
public static string YetAnother_YetAnotherTest_Url(string Id, QueryString queryString = default)
233+
public static string YetAnother_YetAnotherTest(string Id, QueryString queryString = default)
234234
{
235235
return $"/api/YetAnother/YetAnotherTest/{Id}{queryString}";
236236
}
237237

238-
public static string YetAnother_JSONDynamicTestDynamic_Url(QueryString queryString = default)
238+
public static string YetAnother_JSONDynamicTestDynamic(QueryString queryString = default)
239239
{
240240
return $"/api/YetAnother/JSONDynamicTestDynamic{queryString}";
241241
}
242242

243-
public static string YetAnother_HttpOptionsTest_Url(QueryString queryString = default)
243+
public static string YetAnother_HttpOptionsTest(QueryString queryString = default)
244244
{
245245
return $"/api/YetAnother/HttpOptionsTest{queryString}";
246246
}
247247

248-
public static string YetAnother_HttpHeadTest_Url(QueryString queryString = default)
248+
public static string YetAnother_HttpHeadTest(QueryString queryString = default)
249249
{
250250
return $"/api/YetAnother/HttpHeadTest{queryString}";
251251
}
252252

253-
public static string YetAnother_HttpPatchTest_Url(QueryString queryString = default)
253+
public static string YetAnother_HttpPatchTest(QueryString queryString = default)
254254
{
255255
return $"/api/YetAnother/HttpPatchTest{queryString}";
256256
}

‎GoLive.Generator.ApiClientGenerator/ApiClientGenerator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -741,12 +741,12 @@ private static void SetUpSingleApi(RouteGeneratorSettings config, ControllerRout
741741
source.AppendCloseCurlyBracketLine();
742742
}
743743

744-
CreateURLOutput(config, urlSourceBuilder, controllerRoute, action, actionValues, routeString);
744+
CreateURLOutput(urlSourceBuilder, controllerRoute, action, actionValues, routeString);
745745
}
746746
}
747747
}
748748

749-
private static void CreateURLOutput(RouteGeneratorSettings config, SourceStringBuilder urlSourceBuilder, ControllerRoute controllerRoute, ActionRoute action, CaseInSensitiveDictionary actionValues, string routeString)
749+
private static void CreateURLOutput(SourceStringBuilder urlSourceBuilder, ControllerRoute controllerRoute, ActionRoute action, CaseInSensitiveDictionary actionValues, string routeString)
750750
{
751751
List<string> secondParamList = new();
752752

@@ -774,11 +774,11 @@ private static void CreateURLOutput(RouteGeneratorSettings config, SourceStringB
774774
if (methodParameterMappings.Any())
775775
{
776776
var parameterListWithoutFile = string.Join(", ", methodParameterMappings.Select(m => $"{m.Parameter.FullTypeName} {m.Key} {GetDefaultValue(m.Parameter)}"));
777-
urlSourceBuilder.AppendLine($"public static string {methodName}_{config.OutputUrlsPrefix}{action.Name}{config.OutputUrlsPostfix} ({string.Join(",", parameterListWithoutFile)}, QueryString queryString = default)");
777+
urlSourceBuilder.AppendLine($"public static string {methodName}_{action.Name} ({string.Join(",", parameterListWithoutFile)}, QueryString queryString = default)");
778778
}
779779
else
780780
{
781-
urlSourceBuilder.AppendLine($"public static string {methodName}_{config.OutputUrlsPrefix}{action.Name}{config.OutputUrlsPostfix} (QueryString queryString = default)");
781+
urlSourceBuilder.AppendLine($"public static string {methodName}_{action.Name} (QueryString queryString = default)");
782782
}
783783

784784
using (urlSourceBuilder.CreateBracket())

0 commit comments

Comments
 (0)