From 6e50bc6604076255243a96f9691b7455233536f2 Mon Sep 17 00:00:00 2001 From: Rainer Hermanns <hermanns@aixcept.de> Date: Mon, 17 Jun 2019 13:39:50 +0200 Subject: [PATCH] Added special handling for 'string' types with format 'uri' (OpenAPITools#3160) - implemented Kotlin - implemented Java Fixes OpenAPITools#3160 --- .../openapitools/codegen/languages/AbstractJavaCodegen.java | 5 +++++ .../codegen/languages/AbstractKotlinCodegen.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 0ef33cf0480..f1b035cf74a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -784,6 +784,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code return p.getDefault().toString(); } return null; + } else if (ModelUtils.isURISchema(p)) { + if (p.getDefault() != null) { + return "URI.create(\"" + escapeText((String) p.getDefault()) + "\")"; + } + return null; } else if (ModelUtils.isStringSchema(p)) { if (p.getDefault() != null) { String _default = (String) p.getDefault(); diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java index 58d22e51650..438ce57def4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java @@ -834,6 +834,10 @@ public abstract class AbstractKotlinCodegen extends DefaultCodegen implements Co if (p.getDefault() != null) { return p.getDefault().toString(); } + } else if (ModelUtils.isURISchema(p)) { + if (p.getDefault() != null) { + return "URI.create('" + p.getDefault() + "')"; + } } else if (ModelUtils.isStringSchema(p)) { if (p.getDefault() != null) { return "'" + p.getDefault() + "'"; -- GitLab