Skip to content

Commit 0be3fe6

Browse files
wing328wing328
authored
Set skipFormModel to true by default (#8125)
* set skipFormModel to true by default * update tests * regenerate ruby faraday client * remove inline object spec files * more clean up on inline object files * update samples
1 parent 52c63bb commit 0be3fe6

170 files changed

Lines changed: 71 additions & 5032 deletions

File tree

Some content is hidden

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

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultGenerator.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ void generateModels(List<File> files, List<Object> allModels, List<String> unuse
426426

427427
Boolean skipFormModel = GlobalSettings.getProperty(CodegenConstants.SKIP_FORM_MODEL) != null ?
428428
Boolean.valueOf(GlobalSettings.getProperty(CodegenConstants.SKIP_FORM_MODEL)) :
429-
getGeneratorPropertyDefaultSwitch(CodegenConstants.SKIP_FORM_MODEL, false);
429+
getGeneratorPropertyDefaultSwitch(CodegenConstants.SKIP_FORM_MODEL, true);
430430

431431
// process models only
432432
for (String name : modelKeys) {
@@ -448,9 +448,9 @@ void generateModels(List<File> files, List<Object> allModels, List<String> unuse
448448
if (unusedModels.contains(name)) {
449449
if (Boolean.FALSE.equals(skipFormModel)) {
450450
// if skipFormModel sets to true, still generate the model and log the result
451-
LOGGER.info("Model {} (marked as unused due to form parameters) is generated due to the system property skipFormModel=false (default)", name);
451+
LOGGER.info("Model {} (marked as unused due to form parameters) is generated due to the global property `skipFormModel` set to false", name);
452452
} else {
453-
LOGGER.info("Model {} not generated since it's marked as unused (due to form parameters) and skipFormModel (system property) set to true", name);
453+
LOGGER.info("Model {} not generated since it's marked as unused (due to form parameters) and `skipFormModel` (global property) set to true (default)", name);
454454
// TODO: Should this be added to dryRun? If not, this seems like a weird place to return early from processing.
455455
continue;
456456
}

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java‎

Lines changed: 55 additions & 52 deletions
Large diffs are not rendered by default.

‎modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultGeneratorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void testIgnoreFileProcessing() throws IOException {
6464

6565
List<File> files = generator.opts(clientOptInput).generate();
6666

67-
Assert.assertEquals(files.size(), 44);
67+
Assert.assertEquals(files.size(), 42);
6868

6969
// Check expected generated files
7070
// api sanity check
@@ -149,7 +149,7 @@ public void testFilesAreNeverOverwritten() throws IOException {
149149

150150
List<File> files = generator.opts(clientOptInput).generate();
151151

152-
Assert.assertEquals(files.size(), 20);
152+
Assert.assertEquals(files.size(), 16);
153153

154154
// Check API is written and Test is not
155155
TestUtils.ensureContainsFile(files, output, "src/main/java/org/openapitools/client/api/PetApi.java");

‎samples/client/petstore/apex/.openapi-generator/FILES‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ force-app/main/default/classes/OASCategory.cls
88
force-app/main/default/classes/OASCategory.cls-meta.xml
99
force-app/main/default/classes/OASClient.cls
1010
force-app/main/default/classes/OASClient.cls-meta.xml
11-
force-app/main/default/classes/OASInlineObject.cls
12-
force-app/main/default/classes/OASInlineObject.cls-meta.xml
13-
force-app/main/default/classes/OASInlineObject1.cls
14-
force-app/main/default/classes/OASInlineObject1.cls-meta.xml
1511
force-app/main/default/classes/OASOrder.cls
1612
force-app/main/default/classes/OASOrder.cls-meta.xml
1713
force-app/main/default/classes/OASPet.cls

‎samples/client/petstore/apex/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ Class | Method | HTTP request | Description
9191

9292
- [OASApiResponse](OASApiResponse.md)
9393
- [OASCategory](OASCategory.md)
94-
- [OASInlineObject](OASInlineObject.md)
95-
- [OASInlineObject1](OASInlineObject1.md)
9694
- [OASOrder](OASOrder.md)
9795
- [OASPet](OASPet.md)
9896
- [OASTag](OASTag.md)

‎samples/client/petstore/csharp-netcore/OpenAPIClient-net47/.openapi-generator/FILES‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ docs/GmFruit.md
4343
docs/GrandparentAnimal.md
4444
docs/HasOnlyReadOnly.md
4545
docs/HealthCheckResult.md
46-
docs/InlineObject.md
47-
docs/InlineObject1.md
48-
docs/InlineObject2.md
49-
docs/InlineObject3.md
50-
docs/InlineObject4.md
51-
docs/InlineObject5.md
5246
docs/InlineResponseDefault.md
5347
docs/IsoscelesTriangle.md
5448
docs/List.md
@@ -153,12 +147,6 @@ src/Org.OpenAPITools/Model/GmFruit.cs
153147
src/Org.OpenAPITools/Model/GrandparentAnimal.cs
154148
src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
155149
src/Org.OpenAPITools/Model/HealthCheckResult.cs
156-
src/Org.OpenAPITools/Model/InlineObject.cs
157-
src/Org.OpenAPITools/Model/InlineObject1.cs
158-
src/Org.OpenAPITools/Model/InlineObject2.cs
159-
src/Org.OpenAPITools/Model/InlineObject3.cs
160-
src/Org.OpenAPITools/Model/InlineObject4.cs
161-
src/Org.OpenAPITools/Model/InlineObject5.cs
162150
src/Org.OpenAPITools/Model/InlineResponseDefault.cs
163151
src/Org.OpenAPITools/Model/IsoscelesTriangle.cs
164152
src/Org.OpenAPITools/Model/List.cs

‎samples/client/petstore/csharp-netcore/OpenAPIClient-net47/README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,12 +195,6 @@ Class | Method | HTTP request | Description
195195
- [Model.GrandparentAnimal](docs/GrandparentAnimal.md)
196196
- [Model.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
197197
- [Model.HealthCheckResult](docs/HealthCheckResult.md)
198-
- [Model.InlineObject](docs/InlineObject.md)
199-
- [Model.InlineObject1](docs/InlineObject1.md)
200-
- [Model.InlineObject2](docs/InlineObject2.md)
201-
- [Model.InlineObject3](docs/InlineObject3.md)
202-
- [Model.InlineObject4](docs/InlineObject4.md)
203-
- [Model.InlineObject5](docs/InlineObject5.md)
204198
- [Model.InlineResponseDefault](docs/InlineResponseDefault.md)
205199
- [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md)
206200
- [Model.List](docs/List.md)

‎samples/client/petstore/csharp-netcore/OpenAPIClient/.openapi-generator/FILES‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ docs/GmFruit.md
4343
docs/GrandparentAnimal.md
4444
docs/HasOnlyReadOnly.md
4545
docs/HealthCheckResult.md
46-
docs/InlineObject.md
47-
docs/InlineObject1.md
48-
docs/InlineObject2.md
49-
docs/InlineObject3.md
50-
docs/InlineObject4.md
51-
docs/InlineObject5.md
5246
docs/InlineResponseDefault.md
5347
docs/IsoscelesTriangle.md
5448
docs/List.md
@@ -152,12 +146,6 @@ src/Org.OpenAPITools/Model/GmFruit.cs
152146
src/Org.OpenAPITools/Model/GrandparentAnimal.cs
153147
src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
154148
src/Org.OpenAPITools/Model/HealthCheckResult.cs
155-
src/Org.OpenAPITools/Model/InlineObject.cs
156-
src/Org.OpenAPITools/Model/InlineObject1.cs
157-
src/Org.OpenAPITools/Model/InlineObject2.cs
158-
src/Org.OpenAPITools/Model/InlineObject3.cs
159-
src/Org.OpenAPITools/Model/InlineObject4.cs
160-
src/Org.OpenAPITools/Model/InlineObject5.cs
161149
src/Org.OpenAPITools/Model/InlineResponseDefault.cs
162150
src/Org.OpenAPITools/Model/IsoscelesTriangle.cs
163151
src/Org.OpenAPITools/Model/List.cs

‎samples/client/petstore/csharp-netcore/OpenAPIClient/README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,6 @@ Class | Method | HTTP request | Description
183183
- [Model.GrandparentAnimal](docs/GrandparentAnimal.md)
184184
- [Model.HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
185185
- [Model.HealthCheckResult](docs/HealthCheckResult.md)
186-
- [Model.InlineObject](docs/InlineObject.md)
187-
- [Model.InlineObject1](docs/InlineObject1.md)
188-
- [Model.InlineObject2](docs/InlineObject2.md)
189-
- [Model.InlineObject3](docs/InlineObject3.md)
190-
- [Model.InlineObject4](docs/InlineObject4.md)
191-
- [Model.InlineObject5](docs/InlineObject5.md)
192186
- [Model.InlineResponseDefault](docs/InlineResponseDefault.md)
193187
- [Model.IsoscelesTriangle](docs/IsoscelesTriangle.md)
194188
- [Model.List](docs/List.md)

‎samples/client/petstore/csharp-netcore/OpenAPIClientCore/.openapi-generator/FILES‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ docs/GmFruit.md
4343
docs/GrandparentAnimal.md
4444
docs/HasOnlyReadOnly.md
4545
docs/HealthCheckResult.md
46-
docs/InlineObject.md
47-
docs/InlineObject1.md
48-
docs/InlineObject2.md
49-
docs/InlineObject3.md
50-
docs/InlineObject4.md
51-
docs/InlineObject5.md
5246
docs/InlineResponseDefault.md
5347
docs/IsoscelesTriangle.md
5448
docs/List.md
@@ -152,12 +146,6 @@ src/Org.OpenAPITools/Model/GmFruit.cs
152146
src/Org.OpenAPITools/Model/GrandparentAnimal.cs
153147
src/Org.OpenAPITools/Model/HasOnlyReadOnly.cs
154148
src/Org.OpenAPITools/Model/HealthCheckResult.cs
155-
src/Org.OpenAPITools/Model/InlineObject.cs
156-
src/Org.OpenAPITools/Model/InlineObject1.cs
157-
src/Org.OpenAPITools/Model/InlineObject2.cs
158-
src/Org.OpenAPITools/Model/InlineObject3.cs
159-
src/Org.OpenAPITools/Model/InlineObject4.cs
160-
src/Org.OpenAPITools/Model/InlineObject5.cs
161149
src/Org.OpenAPITools/Model/InlineResponseDefault.cs
162150
src/Org.OpenAPITools/Model/IsoscelesTriangle.cs
163151
src/Org.OpenAPITools/Model/List.cs

0 commit comments

Comments
 (0)