Skip to content

Commit 700e7a4

Browse files
josh-burtonmichaelpro1
authored andcommitted
[dart-dio] Fixes --model-name-suffix having no effect (OpenAPITools#5669)
Fixes OpenAPITools#5409
1 parent 2c78bc5 commit 700e7a4

File tree

20 files changed

+14
-2302
lines changed

20 files changed

+14
-2302
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import io.swagger.v3.oas.models.media.ArraySchema;
2121
import io.swagger.v3.oas.models.media.Schema;
22+
2223
import org.apache.commons.io.FilenameUtils;
2324
import org.apache.commons.lang3.StringUtils;
2425
import org.openapitools.codegen.*;
@@ -366,16 +367,23 @@ public String toModelName(String name) {
366367
name = "model_" + name; // e.g. 200Response => Model200Response (after camelize)
367368
}
368369

369-
// camelize the model name
370-
// phone_number => PhoneNumber
371-
return camelize(name);
370+
if (typeMapping.containsValue(name)) {
371+
return camelize(name);
372+
} else {
373+
// camelize the model name
374+
return camelize(modelNamePrefix + "_" + name + "_" + modelNameSuffix);
375+
}
372376
}
373377

374378
@Override
375379
public String toModelFilename(String name) {
376380
return underscore(toModelName(name));
377381
}
378382

383+
@Override public String toModelDocFilename(String name) {
384+
return super.toModelDocFilename(toModelName(name));
385+
}
386+
379387
@Override
380388
public String toApiFilename(String name) {
381389
return underscore(toApiName(name));

modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartModelTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public void modelNameTest(String name, String expectedName) {
293293
final CodegenModel cm = codegen.fromModel(name, model);
294294

295295
Assert.assertEquals(cm.name, name);
296-
Assert.assertEquals(cm.classname, expectedName);
296+
Assert.assertEquals(cm.classname, codegen.toModelName(expectedName));
297297
}
298298

299299
@Test(description = "test enum variable names for reserved words")

modules/openapi-generator/src/test/java/org/openapitools/codegen/dartdio/DartDioModelTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ public static Object[][] primeNumbers() {
366366
{"sample_name", "SampleName"},
367367
{"sample__name", "SampleName"},
368368
{"/sample", "Sample"},
369-
{"\\sample", "\\Sample"},
369+
{"\\sample", "Sample"},
370370
{"sample.name", "SampleName"},
371371
{"_sample", "Sample"},
372372
};
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.3-SNAPSHOT
1+
4.3.0-SNAPSHOT

samples/client/petstore/dart-dio/docs/ApiResponse.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

samples/client/petstore/dart-dio/docs/Category.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

samples/client/petstore/dart-dio/docs/Order.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

samples/client/petstore/dart-dio/docs/Pet.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)