Skip to content

Commit 2f5f2b3

Browse files
wing328wing328
committed
update package name to confirm to csharp convention, fix default header
1 parent e7b170b commit 2f5f2b3

File tree

13 files changed

+146
-20
lines changed

13 files changed

+146
-20
lines changed

‎modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.io.File;
88

99
public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig {
10-
protected String invokerPackage = "io.swagger.client";
10+
protected String invokerPackage = "IO.Swagger.Client";
1111
protected String groupId = "io.swagger";
1212
protected String artifactId = "swagger-csharp-client";
1313
protected String artifactVersion = "1.0.0";
@@ -31,8 +31,8 @@ public CSharpClientCodegen() {
3131
modelTemplateFiles.put("model.mustache", ".cs");
3232
apiTemplateFiles.put("api.mustache", ".cs");
3333
templateDir = "csharp";
34-
apiPackage = "io.swagger.Api";
35-
modelPackage = "io.swagger.Model";
34+
apiPackage = "IO.Swagger.Api";
35+
modelPackage = "IO.Swagger.Model";
3636

3737
reservedWords = new HashSet<String> (
3838
Arrays.asList(

‎modules/swagger-codegen/src/main/resources/csharp/api.mustache

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ namespace {{package}} {
5252
if ({{paramName}} == null) throw new ApiException(400, "Missing required parameter '{{paramName}}' when calling {{nickname}}");
5353
{{/required}}{{/allParams}}
5454

55+
// add default header, if any
56+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
57+
{
58+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
59+
}
60+
5561
_request.AddUrlSegment("format", "json"); // set format to json by default
5662
{{#pathParams}}_request.AddUrlSegment("{{baseName}}", ApiInvoker.ParameterToString({{{paramName}}})); // path (url segment) parameter
5763
{{/pathParams}}

‎samples/client/petstore/csharp/compile.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
SET CSCPATH=%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319
2-
%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/io.swagger.client.dll /recurse:src\*.cs /doc:bin/io.swagger.client.xml
2+
%CSCPATH%\csc /reference:bin/Newtonsoft.Json.dll /target:library /out:bin/IO.Swagger.Client.dll /recurse:src\*.cs /doc:bin/IO.Swagger.Client.xml

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/PetApi.cs

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.Collections.Generic;
33
using RestSharp;
4-
using io.swagger.client;
5-
using io.swagger.Model;
4+
using IO.Swagger.Client;
5+
using IO.Swagger.Model;
66

7-
namespace io.swagger.Api {
7+
namespace IO.Swagger.Api {
88

99
public class PetApi {
1010
string basePath;
@@ -46,6 +46,12 @@ public void UpdatePet (Pet Body) {
4646

4747

4848

49+
// add default header, if any
50+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
51+
{
52+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
53+
}
54+
4955
_request.AddUrlSegment("format", "json"); // set format to json by default
5056

5157

@@ -80,6 +86,12 @@ public void AddPet (Pet Body) {
8086

8187

8288

89+
// add default header, if any
90+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
91+
{
92+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
93+
}
94+
8395
_request.AddUrlSegment("format", "json"); // set format to json by default
8496

8597

@@ -114,6 +126,12 @@ public List<Pet> FindPetsByStatus (List<string> Status) {
114126

115127

116128

129+
// add default header, if any
130+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
131+
{
132+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
133+
}
134+
117135
_request.AddUrlSegment("format", "json"); // set format to json by default
118136

119137
if (Status != null) _request.AddParameter("status", ApiInvoker.ParameterToString(Status)); // query parameter
@@ -148,6 +166,12 @@ public List<Pet> FindPetsByTags (List<string> Tags) {
148166

149167

150168

169+
// add default header, if any
170+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
171+
{
172+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
173+
}
174+
151175
_request.AddUrlSegment("format", "json"); // set format to json by default
152176

153177
if (Tags != null) _request.AddParameter("tags", ApiInvoker.ParameterToString(Tags)); // query parameter
@@ -185,6 +209,12 @@ public Pet GetPetById (long? PetId) {
185209
if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling GetPetById");
186210

187211

212+
// add default header, if any
213+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
214+
{
215+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
216+
}
217+
188218
_request.AddUrlSegment("format", "json"); // set format to json by default
189219
_request.AddUrlSegment("petId", ApiInvoker.ParameterToString(PetId)); // path (url segment) parameter
190220

@@ -224,6 +254,12 @@ public void UpdatePetWithForm (string PetId, string Name, string Status) {
224254
if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UpdatePetWithForm");
225255

226256

257+
// add default header, if any
258+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
259+
{
260+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
261+
}
262+
227263
_request.AddUrlSegment("format", "json"); // set format to json by default
228264
_request.AddUrlSegment("petId", ApiInvoker.ParameterToString(PetId)); // path (url segment) parameter
229265

@@ -264,6 +300,12 @@ public void DeletePet (string ApiKey, long? PetId) {
264300
if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling DeletePet");
265301

266302

303+
// add default header, if any
304+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
305+
{
306+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
307+
}
308+
267309
_request.AddUrlSegment("format", "json"); // set format to json by default
268310
_request.AddUrlSegment("petId", ApiInvoker.ParameterToString(PetId)); // path (url segment) parameter
269311

@@ -304,6 +346,12 @@ public void UploadFile (long? PetId, string AdditionalMetadata, string File) {
304346
if (PetId == null) throw new ApiException(400, "Missing required parameter 'PetId' when calling UploadFile");
305347

306348

349+
// add default header, if any
350+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
351+
{
352+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
353+
}
354+
307355
_request.AddUrlSegment("format", "json"); // set format to json by default
308356
_request.AddUrlSegment("petId", ApiInvoker.ParameterToString(PetId)); // path (url segment) parameter
309357

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/StoreApi.cs

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.Collections.Generic;
33
using RestSharp;
4-
using io.swagger.client;
5-
using io.swagger.Model;
4+
using IO.Swagger.Client;
5+
using IO.Swagger.Model;
66

7-
namespace io.swagger.Api {
7+
namespace IO.Swagger.Api {
88

99
public class StoreApi {
1010
string basePath;
@@ -45,6 +45,12 @@ public String GetBasePath() {
4545

4646

4747

48+
// add default header, if any
49+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
50+
{
51+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
52+
}
53+
4854
_request.AddUrlSegment("format", "json"); // set format to json by default
4955

5056

@@ -78,6 +84,12 @@ public Order PlaceOrder (Order Body) {
7884

7985

8086

87+
// add default header, if any
88+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
89+
{
90+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
91+
}
92+
8193
_request.AddUrlSegment("format", "json"); // set format to json by default
8294

8395

@@ -115,6 +127,12 @@ public Order GetOrderById (string OrderId) {
115127
if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling GetOrderById");
116128

117129

130+
// add default header, if any
131+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
132+
{
133+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
134+
}
135+
118136
_request.AddUrlSegment("format", "json"); // set format to json by default
119137
_request.AddUrlSegment("orderId", ApiInvoker.ParameterToString(OrderId)); // path (url segment) parameter
120138

@@ -152,6 +170,12 @@ public void DeleteOrder (string OrderId) {
152170
if (OrderId == null) throw new ApiException(400, "Missing required parameter 'OrderId' when calling DeleteOrder");
153171

154172

173+
// add default header, if any
174+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
175+
{
176+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
177+
}
178+
155179
_request.AddUrlSegment("format", "json"); // set format to json by default
156180
_request.AddUrlSegment("orderId", ApiInvoker.ParameterToString(OrderId)); // path (url segment) parameter
157181

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/Api/UserApi.cs

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.Collections.Generic;
33
using RestSharp;
4-
using io.swagger.client;
5-
using io.swagger.Model;
4+
using IO.Swagger.Client;
5+
using IO.Swagger.Model;
66

7-
namespace io.swagger.Api {
7+
namespace IO.Swagger.Api {
88

99
public class UserApi {
1010
string basePath;
@@ -46,6 +46,12 @@ public void CreateUser (User Body) {
4646

4747

4848

49+
// add default header, if any
50+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
51+
{
52+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
53+
}
54+
4955
_request.AddUrlSegment("format", "json"); // set format to json by default
5056

5157

@@ -80,6 +86,12 @@ public void CreateUsersWithArrayInput (List<User> Body) {
8086

8187

8288

89+
// add default header, if any
90+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
91+
{
92+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
93+
}
94+
8395
_request.AddUrlSegment("format", "json"); // set format to json by default
8496

8597

@@ -114,6 +126,12 @@ public void CreateUsersWithListInput (List<User> Body) {
114126

115127

116128

129+
// add default header, if any
130+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
131+
{
132+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
133+
}
134+
117135
_request.AddUrlSegment("format", "json"); // set format to json by default
118136

119137

@@ -149,6 +167,12 @@ public string LoginUser (string Username, string Password) {
149167

150168

151169

170+
// add default header, if any
171+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
172+
{
173+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
174+
}
175+
152176
_request.AddUrlSegment("format", "json"); // set format to json by default
153177

154178
if (Username != null) _request.AddParameter("username", ApiInvoker.ParameterToString(Username)); // query parameter
@@ -183,6 +207,12 @@ public void LogoutUser () {
183207

184208

185209

210+
// add default header, if any
211+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
212+
{
213+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
214+
}
215+
186216
_request.AddUrlSegment("format", "json"); // set format to json by default
187217

188218

@@ -219,6 +249,12 @@ public User GetUserByName (string Username) {
219249
if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling GetUserByName");
220250

221251

252+
// add default header, if any
253+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
254+
{
255+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
256+
}
257+
222258
_request.AddUrlSegment("format", "json"); // set format to json by default
223259
_request.AddUrlSegment("username", ApiInvoker.ParameterToString(Username)); // path (url segment) parameter
224260

@@ -257,6 +293,12 @@ public void UpdateUser (string Username, User Body) {
257293
if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling UpdateUser");
258294

259295

296+
// add default header, if any
297+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
298+
{
299+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
300+
}
301+
260302
_request.AddUrlSegment("format", "json"); // set format to json by default
261303
_request.AddUrlSegment("username", ApiInvoker.ParameterToString(Username)); // path (url segment) parameter
262304

@@ -295,6 +337,12 @@ public void DeleteUser (string Username) {
295337
if (Username == null) throw new ApiException(400, "Missing required parameter 'Username' when calling DeleteUser");
296338

297339

340+
// add default header, if any
341+
foreach(KeyValuePair<string, string> defaultHeader in ApiInvoker.GetDefaultHeader())
342+
{
343+
_request.AddHeader(defaultHeader.Key, defaultHeader.Value);
344+
}
345+
298346
_request.AddUrlSegment("format", "json"); // set format to json by default
299347
_request.AddUrlSegment("username", ApiInvoker.ParameterToString(Username)); // path (url segment) parameter
300348

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Category.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using System.Runtime.Serialization;
66

7-
namespace io.swagger.Model {
7+
namespace IO.Swagger.Model {
88
[DataContract]
99
public class Category {
1010

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Order.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using System.Runtime.Serialization;
66

7-
namespace io.swagger.Model {
7+
namespace IO.Swagger.Model {
88
[DataContract]
99
public class Order {
1010

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Pet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using System.Runtime.Serialization;
66

7-
namespace io.swagger.Model {
7+
namespace IO.Swagger.Model {
88
[DataContract]
99
public class Pet {
1010

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/Tag.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using System.Runtime.Serialization;
66

7-
namespace io.swagger.Model {
7+
namespace IO.Swagger.Model {
88
[DataContract]
99
public class Tag {
1010

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/Model/User.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Generic;
55
using System.Runtime.Serialization;
66

7-
namespace io.swagger.Model {
7+
namespace IO.Swagger.Model {
88
[DataContract]
99
public class User {
1010

‎samples/client/petstore/csharp/src/main/csharp/io/swagger/client/ApiException.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace io.swagger.client {
3+
namespace IO.Swagger.Client {
44
public class ApiException : Exception {
55

66
private int errorCode = 0;

0 commit comments

Comments
 (0)