From be8e05db2dcc1458eaf7814641166e7190b78fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20Grammeltvedt?= Date: Mon, 10 Feb 2020 19:40:13 +0100 Subject: [PATCH 1/6] [typescript] Don't hardcode the date type if user has mapped it If the user has set --type-mappings Date=foo, respect this setting instead of hardcoding the date type. --- .../codegen/languages/TypeScriptFetchClientCodegen.java | 5 +++-- .../codegen/languages/TypeScriptReduxQueryClientCodegen.java | 5 +++-- .../codegen/languages/TypeScriptRxjsClientCodegen.java | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index d4f7e979de51..286a1d9fc440 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -134,14 +134,15 @@ public void processOpts() { @Override public String getTypeDeclaration(Schema p) { + String oasType = getSchemaType(p); if (ModelUtils.isFileSchema(p)) { return "Blob"; } else if (ModelUtils.isBinarySchema(p)) { return "Blob"; } else if (ModelUtils.isDateSchema(p)) { - return "Date"; + return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } else if (ModelUtils.isDateTimeSchema(p)) { - return "Date"; + return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } return super.getTypeDeclaration(p); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java index ac7c0d8d2400..f08698949439 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java @@ -103,14 +103,15 @@ public void processOpts() { @Override public String getTypeDeclaration(Schema p) { + String oasType = getSchemaType(p); if (ModelUtils.isFileSchema(p)) { return "Blob"; } else if (ModelUtils.isBinarySchema(p)) { return "Blob"; } else if (ModelUtils.isDateSchema(p)) { - return "Date"; + return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } else if (ModelUtils.isDateTimeSchema(p)) { - return "Date"; + return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } return super.getTypeDeclaration(p); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java index fb421d1255d5..3dd087d96e04 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java @@ -109,14 +109,15 @@ public boolean isDataTypeFile(final String dataType) { @Override public String getTypeDeclaration(Schema p) { + String oasType = getSchemaType(p); if (ModelUtils.isFileSchema(p)) { return "Blob"; } else if (ModelUtils.isBinarySchema(p)) { return "Blob"; } else if (ModelUtils.isDateSchema(p)) { - return "Date"; + return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } else if (ModelUtils.isDateTimeSchema(p)) { - return "Date"; + return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } return super.getTypeDeclaration(p); } From 2f446eec0ab2b75a12eae1f77aa0c956f20404ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20Grammeltvedt?= Date: Mon, 10 Feb 2020 23:11:00 +0100 Subject: [PATCH 2/6] Use default type mappings for date/date-time --- .../codegen/languages/TypeScriptFetchClientCodegen.java | 5 ----- .../codegen/languages/TypeScriptReduxQueryClientCodegen.java | 5 ----- .../codegen/languages/TypeScriptRxjsClientCodegen.java | 5 ----- .../codegen/typescript/fetch/TypeScriptFetchModelTest.java | 2 +- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index 286a1d9fc440..378d661bce43 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -134,15 +134,10 @@ public void processOpts() { @Override public String getTypeDeclaration(Schema p) { - String oasType = getSchemaType(p); if (ModelUtils.isFileSchema(p)) { return "Blob"; } else if (ModelUtils.isBinarySchema(p)) { return "Blob"; - } else if (ModelUtils.isDateSchema(p)) { - return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; - } else if (ModelUtils.isDateTimeSchema(p)) { - return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } return super.getTypeDeclaration(p); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java index f08698949439..e7c869af2424 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java @@ -103,15 +103,10 @@ public void processOpts() { @Override public String getTypeDeclaration(Schema p) { - String oasType = getSchemaType(p); if (ModelUtils.isFileSchema(p)) { return "Blob"; } else if (ModelUtils.isBinarySchema(p)) { return "Blob"; - } else if (ModelUtils.isDateSchema(p)) { - return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; - } else if (ModelUtils.isDateTimeSchema(p)) { - return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } return super.getTypeDeclaration(p); } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java index 3dd087d96e04..646e1e7f0bc7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java @@ -109,15 +109,10 @@ public boolean isDataTypeFile(final String dataType) { @Override public String getTypeDeclaration(Schema p) { - String oasType = getSchemaType(p); if (ModelUtils.isFileSchema(p)) { return "Blob"; } else if (ModelUtils.isBinarySchema(p)) { return "Blob"; - } else if (ModelUtils.isDateSchema(p)) { - return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; - } else if (ModelUtils.isDateTimeSchema(p)) { - return typeMapping.containsKey("Date") ? typeMapping.get("Date") : "Date"; } return super.getTypeDeclaration(p); } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java index 1cd429fbeb9b..57419104e79b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java @@ -95,7 +95,7 @@ public void simpleModelTest() { final CodegenProperty property4 = cm.vars.get(3); Assert.assertEquals(property4.baseName, "birthDate"); Assert.assertEquals(property4.complexType, null); - Assert.assertEquals(property4.dataType, "Date"); + Assert.assertEquals(property4.dataType, "string"); Assert.assertEquals(property4.name, "birthDate"); Assert.assertEquals(property4.defaultValue, "undefined"); Assert.assertFalse(property4.hasMore); From fa6d77ca01e11f21b0e42249a2bc1f749b3d520b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20Grammeltvedt?= Date: Tue, 11 Feb 2020 09:54:45 +0100 Subject: [PATCH 3/6] Use typeMapping mechanism correctly --- .../codegen/languages/AbstractTypeScriptClientCodegen.java | 2 +- .../codegen/languages/TypeScriptFetchClientCodegen.java | 3 +++ .../codegen/languages/TypeScriptReduxQueryClientCodegen.java | 3 +++ .../codegen/typescript/fetch/TypeScriptFetchModelTest.java | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java index ef1b689b7af5..6a52dacf7427 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractTypeScriptClientCodegen.java @@ -158,7 +158,7 @@ public AbstractTypeScriptClientCodegen() { typeMapping.put("Map", "any"); typeMapping.put("map", "any"); typeMapping.put("date", "string"); - typeMapping.put("DateTime", "Date"); + typeMapping.put("DateTime", "string"); typeMapping.put("binary", "any"); typeMapping.put("File", "any"); typeMapping.put("file", "any"); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java index 378d661bce43..9ea63beb2cf7 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java @@ -63,6 +63,9 @@ public TypeScriptFetchClientCodegen() { this.modelTemplateFiles.put("models.mustache", ".ts"); this.addExtraReservedWords(); + typeMapping.put("date", "Date"); + typeMapping.put("DateTime", "Date"); + this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(USE_SINGLE_REQUEST_PARAMETER, "Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.TRUE.toString())); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java index e7c869af2424..33e82b8e87b8 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptReduxQueryClientCodegen.java @@ -58,6 +58,9 @@ public TypeScriptReduxQueryClientCodegen() { this.modelTemplateFiles.put("models.mustache", ".ts"); this.addExtraReservedWords(); + typeMapping.put("date", "Date"); + typeMapping.put("DateTime", "Date"); + this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(USE_SINGLE_REQUEST_PARAMETER, "Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.TRUE.toString())); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java index 57419104e79b..1cd429fbeb9b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/fetch/TypeScriptFetchModelTest.java @@ -95,7 +95,7 @@ public void simpleModelTest() { final CodegenProperty property4 = cm.vars.get(3); Assert.assertEquals(property4.baseName, "birthDate"); Assert.assertEquals(property4.complexType, null); - Assert.assertEquals(property4.dataType, "string"); + Assert.assertEquals(property4.dataType, "Date"); Assert.assertEquals(property4.name, "birthDate"); Assert.assertEquals(property4.defaultValue, "undefined"); Assert.assertFalse(property4.hasMore); From 317a3a49492215053212cc643b2b8db2cafb9364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20Grammeltvedt?= Date: Tue, 11 Feb 2020 14:07:05 +0100 Subject: [PATCH 4/6] Add default mapping for angular and node to preserve behavior --- .../codegen/languages/TypeScriptAngularClientCodegen.java | 2 ++ .../codegen/languages/TypeScriptNodeClientCodegen.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java index bbf91dbd9b46..e0862844b482 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularClientCodegen.java @@ -86,6 +86,8 @@ public TypeScriptAngularClientCodegen() { apiPackage = "api"; modelPackage = "model"; + typeMapping.put("DateTime", "Date"); + this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(CliOption.newBoolean(WITH_INTERFACES, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java index 9eac980e3630..499fb0f309bf 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptNodeClientCodegen.java @@ -55,6 +55,8 @@ public TypeScriptNodeClientCodegen() { // at the moment importMapping.clear(); + typeMapping.put("DateTime", "Date"); + outputFolder = "generated-code/typescript-node"; embeddedTemplateDir = templateDir = "typescript-node"; modelTemplateFiles.put("model.mustache", ".ts"); From 976d7b27330e0d503e8768a4add511cbff3bc7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20Grammeltvedt?= Date: Tue, 11 Feb 2020 15:33:01 +0100 Subject: [PATCH 5/6] One more change to keep current behavior --- .../codegen/languages/TypeScriptAngularJsClientCodegen.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java index 3b514117189d..b87271157b23 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAngularJsClientCodegen.java @@ -34,6 +34,8 @@ public TypeScriptAngularJsClientCodegen() { apiPackage = "api"; modelPackage = "model"; + typeMapping.put("DateTime", "Date"); + removeOption(NPM_NAME); removeOption(NPM_VERSION); removeOption(SNAPSHOT); From 515850cb4a9cbae631c0801dbb7694c68d8a6007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85smund=20Grammeltvedt?= Date: Wed, 12 Feb 2020 10:04:53 +0100 Subject: [PATCH 6/6] Add default type mappings to the other TS generators --- .../codegen/languages/TypeScriptAureliaClientCodegen.java | 1 + .../codegen/languages/TypeScriptAxiosClientCodegen.java | 2 ++ .../codegen/languages/TypeScriptInversifyClientCodegen.java | 2 ++ .../codegen/languages/TypeScriptJqueryClientCodegen.java | 2 ++ .../codegen/languages/TypeScriptRxjsClientCodegen.java | 5 ++--- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java index e989b00638d7..0f5c23937b64 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAureliaClientCodegen.java @@ -37,6 +37,7 @@ public TypeScriptAureliaClientCodegen() { outputFolder = "generated-code/typescript-aurelia"; embeddedTemplateDir = templateDir = "typescript-aurelia"; + typeMapping.put("DateTime", "Date"); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java index 4d9f14383500..f652bae2c572 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptAxiosClientCodegen.java @@ -55,6 +55,8 @@ public TypeScriptAxiosClientCodegen() { outputFolder = "generated-code/typescript-axios"; embeddedTemplateDir = templateDir = "typescript-axios"; + typeMapping.put("DateTime", "Date"); + this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url of your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); this.cliOptions.add(new CliOption(SEPARATE_MODELS_AND_API, "Put the model and api in separate folders and in separate classes", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java index 75b91392fa1a..07113268d90b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptInversifyClientCodegen.java @@ -58,6 +58,8 @@ public TypeScriptInversifyClientCodegen() { apiPackage = "api"; modelPackage = "model"; + typeMapping.put("DateTime", "Date"); + this.reservedWords.add("map"); this.cliOptions.add(new CliOption(NPM_REPOSITORY, diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java index 275af5c82e2d..4b62e5b57503 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptJqueryClientCodegen.java @@ -53,6 +53,8 @@ public TypeScriptJqueryClientCodegen() { outputFolder = "generated-code/typescript-jquery"; embeddedTemplateDir = templateDir = "typescript-jquery"; + typeMapping.put("DateTime", "Date"); + this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(JQUERY_ALREADY_IMPORTED, "When using this in legacy app using mix of typescript and javascript, this will only declare jquery and not import it", diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java index 646e1e7f0bc7..8c5a6392d683 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java @@ -58,6 +58,7 @@ public TypeScriptRxjsClientCodegen() { languageSpecificPrimitives.add("Blob"); typeMapping.put("file", "Blob"); + typeMapping.put("DateTime", "Date"); this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json")); this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString())); @@ -109,9 +110,7 @@ public boolean isDataTypeFile(final String dataType) { @Override public String getTypeDeclaration(Schema p) { - if (ModelUtils.isFileSchema(p)) { - return "Blob"; - } else if (ModelUtils.isBinarySchema(p)) { + if (ModelUtils.isBinarySchema(p)) { return "Blob"; } return super.getTypeDeclaration(p);