Skip to content

Commit 5be3a14

Browse files
HugoMarioHugoMario
authored
Merge pull request #9238 from swagger-api/generator-issue-321-sample-updates
Generator issue 321 sample updates
2 parents aca7e39 + bbbc1c2 commit 5be3a14

File tree

205 files changed

+19562
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

205 files changed

+19562
-490
lines changed

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenContent.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.List;
66
import java.util.Map;
77

8-
public class CodegenContent implements VendorExtendable {
8+
public class CodegenContent {
99

1010
private String contentType;
1111

@@ -17,13 +17,13 @@ public CodegenContent(String contentType) {
1717
}
1818

1919
private List<CodegenParameter> parameters = new ArrayList<CodegenParameter>();
20-
private Map<String, Object> vendorExtensions = new HashMap<>();
20+
private Map<String, Object> contentExtensions = new HashMap<>();
2121

2222
public boolean getIsForm() {
23-
if (vendorExtensions.get(CodegenConstants.IS_FORM_EXT_NAME) == null) {
23+
if (contentExtensions.get(CodegenConstants.IS_FORM_EXT_NAME) == null) {
2424
return Boolean.FALSE;
2525
}
26-
return Boolean.parseBoolean(vendorExtensions.get(CodegenConstants.IS_FORM_EXT_NAME).toString());
26+
return Boolean.parseBoolean(contentExtensions.get(CodegenConstants.IS_FORM_EXT_NAME).toString());
2727
}
2828

2929
public List<CodegenParameter> getParameters() {
@@ -38,8 +38,7 @@ public void setContentType(String contentType) {
3838
this.contentType = contentType;
3939
}
4040

41-
@Override
42-
public Map<String, Object> getVendorExtensions() {
43-
return vendorExtensions;
41+
public Map<String, Object> getContentExtensions() {
42+
return contentExtensions;
4443
}
4544
}

‎modules/swagger-codegen/src/test/java/io/swagger/codegen/v3/service/GeneratorServiceTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
public class GeneratorServiceTest {
1818

19-
@Test(description = "test generator service with java 3.0")
19+
@Test(enabled = false, description = "test generator service with java 3.0")
2020
public void testGeneratorServiceJava3() {
2121

2222
GenerationRequest request = new GenerationRequest();
@@ -33,7 +33,7 @@ public void testGeneratorServiceJava3() {
3333
Assert.assertFalse(files.isEmpty());
3434
}
3535

36-
@Test(description = "test generator service with java 2.0")
36+
@Test(enabled = false, description = "test generator service with java 2.0")
3737
public void testGeneratorServiceJava2() {
3838

3939
GenerationRequest request = new GenerationRequest();
@@ -50,7 +50,7 @@ public void testGeneratorServiceJava2() {
5050
Assert.assertFalse(files.isEmpty());
5151
}
5252

53-
@Test(description = "test generator service with java 3.0 and spec 2.0")
53+
@Test(enabled = false, description = "test generator service with java 3.0 and spec 2.0")
5454
public void testGeneratorServiceJava3Spec2() {
5555

5656
GenerationRequest request = new GenerationRequest();
@@ -67,7 +67,7 @@ public void testGeneratorServiceJava3Spec2() {
6767
Assert.assertFalse(files.isEmpty());
6868
}
6969

70-
@Test(description = "test generator service with java 3.0, spec as ref to file")
70+
@Test(enabled = false, description = "test generator service with java 3.0, spec as ref to file")
7171
public void testGeneratorServiceJava3RefSpec() {
7272
GenerationRequest request = new GenerationRequest();
7373
request
@@ -84,7 +84,7 @@ public void testGeneratorServiceJava3RefSpec() {
8484
}
8585

8686

87-
@Test(description = "test generator service with java client 3.0")
87+
@Test(enabled = false, description = "test generator service with java client 3.0")
8888
public void testGeneratorServiceJavaClient3() {
8989

9090
GenerationRequest request = new GenerationRequest();
@@ -105,7 +105,7 @@ public void testGeneratorServiceJavaClient3() {
105105
Assert.assertFalse(files.isEmpty());
106106
}
107107

108-
@Test(description = "test generator service with java client 2.0")
108+
@Test(enabled = false, description = "test generator service with java client 2.0")
109109
public void testGeneratorServiceJavaClient2() {
110110
GenerationRequest request = new GenerationRequest();
111111
request

‎modules/swagger-codegen/src/test/resources/3_0_0/petstore-with-fake-endpoints-models-for-testing.yaml‎

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,257 @@ paths:
10401040
application/json:
10411041
schema:
10421042
$ref: '#/components/schemas/Client'
1043+
/animal:
1044+
put:
1045+
tags:
1046+
- animal
1047+
summary: Update an existing animal
1048+
operationId: updateAnimal
1049+
requestBody:
1050+
description: Animal object that needs to be added.
1051+
content:
1052+
application/json:
1053+
schema:
1054+
$ref: '#/components/schemas/Animal'
1055+
application/xml:
1056+
schema:
1057+
$ref: '#/components/schemas/Animal'
1058+
required: true
1059+
responses:
1060+
400:
1061+
description: Invalid ID supplied
1062+
content: {}
1063+
404:
1064+
description: Animal not found
1065+
content: {}
1066+
405:
1067+
description: Validation exception
1068+
content: {}
1069+
post:
1070+
tags:
1071+
- animal
1072+
summary: Add a new animal to the store
1073+
operationId: addAnimal
1074+
requestBody:
1075+
description: Animal object that needs to be added to the store
1076+
content:
1077+
application/json:
1078+
schema:
1079+
$ref: '#/components/schemas/Animal'
1080+
application/xml:
1081+
schema:
1082+
$ref: '#/components/schemas/Animal'
1083+
required: true
1084+
responses:
1085+
405:
1086+
description: Invalid input
1087+
content: {}
1088+
/animal/{animalId}:
1089+
get:
1090+
tags:
1091+
- animal
1092+
summary: Find animal by ID
1093+
description: Returns a single animal
1094+
operationId: getAnimalById
1095+
parameters:
1096+
- name: animalId
1097+
in: path
1098+
description: ID of pet to return
1099+
required: true
1100+
schema:
1101+
type: integer
1102+
format: int64
1103+
responses:
1104+
200:
1105+
description: successful operation
1106+
content:
1107+
application/xml:
1108+
schema:
1109+
$ref: '#/components/schemas/Animal'
1110+
application/json:
1111+
schema:
1112+
$ref: '#/components/schemas/Animal'
1113+
400:
1114+
description: Invalid ID supplied
1115+
content: {}
1116+
404:
1117+
description: Pet not found
1118+
content: {}
1119+
post:
1120+
tags:
1121+
- animal
1122+
summary: Updates a animal
1123+
operationId: updateAnimalWithForm
1124+
parameters:
1125+
- name: animalId
1126+
in: path
1127+
description: ID of animal that needs to be updated
1128+
required: true
1129+
schema:
1130+
type: integer
1131+
format: int64
1132+
requestBody:
1133+
content:
1134+
application/x-www-form-urlencoded:
1135+
schema:
1136+
properties:
1137+
name:
1138+
type: string
1139+
description: Updated name of the animal
1140+
status:
1141+
type: string
1142+
description: Updated status of the animal
1143+
responses:
1144+
405:
1145+
description: Invalid input
1146+
content: {}
1147+
delete:
1148+
tags:
1149+
- animal
1150+
summary: Deletes a animal
1151+
operationId: deleteAnimal
1152+
parameters:
1153+
- name: api_key
1154+
in: header
1155+
schema:
1156+
type: string
1157+
- name: animalId
1158+
in: path
1159+
description: Animal id to delete
1160+
required: true
1161+
schema:
1162+
type: integer
1163+
format: int64
1164+
responses:
1165+
400:
1166+
description: Invalid animal value
1167+
content: {}
1168+
/dog:
1169+
put:
1170+
tags:
1171+
- dog
1172+
summary: Update an existing dog
1173+
operationId: updateDog
1174+
requestBody:
1175+
description: Dog object that needs to be added.
1176+
content:
1177+
application/json:
1178+
schema:
1179+
$ref: '#/components/schemas/Dog'
1180+
application/xml:
1181+
schema:
1182+
$ref: '#/components/schemas/Dog'
1183+
required: true
1184+
responses:
1185+
400:
1186+
description: Invalid ID supplied
1187+
content: {}
1188+
404:
1189+
description: Animal not found
1190+
content: {}
1191+
405:
1192+
description: Validation exception
1193+
content: {}
1194+
post:
1195+
tags:
1196+
- dog
1197+
summary: Add a new dog to the store
1198+
operationId: addDog
1199+
requestBody:
1200+
description: Dog object that needs to be added to the store
1201+
content:
1202+
application/json:
1203+
schema:
1204+
$ref: '#/components/schemas/Dog'
1205+
application/xml:
1206+
schema:
1207+
$ref: '#/components/schemas/Dog'
1208+
required: true
1209+
responses:
1210+
405:
1211+
description: Invalid input
1212+
content: {}
1213+
/dog/{dogId}:
1214+
get:
1215+
tags:
1216+
- dog
1217+
summary: Find dog by ID
1218+
description: Returns a single dog
1219+
operationId: getDogById
1220+
parameters:
1221+
- name: dogId
1222+
in: path
1223+
description: ID of dog to return
1224+
required: true
1225+
schema:
1226+
type: integer
1227+
format: int64
1228+
responses:
1229+
200:
1230+
description: successful operation
1231+
content:
1232+
application/xml:
1233+
schema:
1234+
$ref: '#/components/schemas/Dog'
1235+
application/json:
1236+
schema:
1237+
$ref: '#/components/schemas/Dog'
1238+
400:
1239+
description: Invalid ID supplied
1240+
content: {}
1241+
404:
1242+
description: Pet not found
1243+
content: {}
1244+
post:
1245+
tags:
1246+
- dog
1247+
summary: Updates a dog
1248+
operationId: updateDogWithForm
1249+
parameters:
1250+
- name: animalId
1251+
in: path
1252+
description: ID of dog that needs to be updated
1253+
required: true
1254+
schema:
1255+
type: integer
1256+
format: int64
1257+
requestBody:
1258+
content:
1259+
application/x-www-form-urlencoded:
1260+
schema:
1261+
properties:
1262+
name:
1263+
type: string
1264+
description: Updated name of the dog
1265+
status:
1266+
type: string
1267+
description: Updated status of the dog
1268+
responses:
1269+
405:
1270+
description: Invalid input
1271+
content: {}
1272+
delete:
1273+
tags:
1274+
- dog
1275+
summary: Deletes a dog
1276+
operationId: deleteDog
1277+
parameters:
1278+
- name: api_key
1279+
in: header
1280+
schema:
1281+
type: string
1282+
- name: dogId
1283+
in: path
1284+
description: Dog id to delete
1285+
required: true
1286+
schema:
1287+
type: integer
1288+
format: int64
1289+
responses:
1290+
400:
1291+
description: Invalid dog value
1292+
content: {}
1293+
10431294
components:
10441295
schemas:
10451296
Category:

‎samples/client/petstore/csharp-dotnet2/SwaggerClientTest/Lib/SwaggerClient/.swagger-codegen/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.3-SNAPSHOT
1+
3.0.6-SNAPSHOT

0 commit comments

Comments
 (0)