From 316ee69c794ccd62be044ae47d343ff4f0cd998e Mon Sep 17 00:00:00 2001 From: Jeremie Bresson <dev@jmini.fr> Date: Tue, 9 Apr 2019 07:07:28 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Fix=20=E2=80=9CThe=20field=20JavascriptFlow?= =?UTF-8?q?typedClientCodegen.SNAPSHOT=5FSUFFIX=5FFORMAT=20is=20hiding=20a?= =?UTF-8?q?=20field=20from=20type=20AbstractTypeScriptClientCodegen?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../codegen/languages/JavascriptFlowtypedClientCodegen.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java index 879d04aacac..c7390d785e9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptFlowtypedClientCodegen.java @@ -32,8 +32,6 @@ import java.util.*; import static org.openapitools.codegen.utils.StringUtils.dashize; public class JavascriptFlowtypedClientCodegen extends AbstractTypeScriptClientCodegen { - private final SimpleDateFormat SNAPSHOT_SUFFIX_FORMAT = new SimpleDateFormat("yyyyMMddHHmm", Locale.ROOT); - public static final String NPM_NAME = "npmName"; public static final String NPM_VERSION = "npmVersion"; public static final String NPM_REPOSITORY = "npmRepository"; -- GitLab From 3ad4e9c6a3f20e6d5141996de95de708c9cfdb9b Mon Sep 17 00:00:00 2001 From: Jeremie Bresson <dev@jmini.fr> Date: Tue, 9 Apr 2019 07:08:34 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Fix=20=E2=80=9CThe=20field=20JavaCXFExtServ?= =?UTF-8?q?erCodegen.CodegenVariable.vendorExtensions=20is=20hiding=20a=20?= =?UTF-8?q?field=20from=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DefaultCodegen†--- .../codegen/languages/JavaCXFExtServerCodegen.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java index caf2ec4c41c..f26731cd955 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFExtServerCodegen.java @@ -93,10 +93,10 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF String setter; String testDataPath; int index; - Map<String, Object> vendorExtensions; + Map<String, Object> varVendorExtensions; private CodegenVariable() { - vendorExtensions = new HashMap<>(); + varVendorExtensions = new HashMap<>(); } private CodegenVariable(CodegenVariable parent, CodegenOperation op, String testDataPath, @@ -120,7 +120,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF maxLength = null;// op.maxLength; pattern = null;// op.pattern; setter = null;// op.getSetter(); - vendorExtensions = op.vendorExtensions; + varVendorExtensions = op.vendorExtensions; init(parent, testDataPath, models); if (op.isListContainer || op.isMapContainer) { @@ -155,7 +155,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF maxLength = param.maxLength; pattern = param.pattern; setter = null; - vendorExtensions = param.vendorExtensions; + varVendorExtensions = param.vendorExtensions; init(parent, testDataPath, models); items = param.items == null ? null : new CodegenVariable(this, param.items, null, models); @@ -182,7 +182,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF maxLength = prop.maxLength; pattern = prop.pattern; setter = prop.getSetter(); - vendorExtensions = prop.vendorExtensions; + varVendorExtensions = prop.vendorExtensions; init(parent, testDataPath, models); items = prop.items == null ? null : new CodegenVariable(this, prop.items, null, models); @@ -267,7 +267,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF + minItems + ", itemCount=" + itemCount + ", minimum=" + minimum + ", maximum=" + maximum + ", exclusiveMinimum=" + exclusiveMinimum + ", exclusiveMaximum=" + exclusiveMaximum + ", minLength=" + minLength + ", maxLength=" + maxLength + ", pattern=" + pattern + ", setter=" - + setter + ", vendorExtensions=" + vendorExtensions + "]"; + + setter + ", vendorExtensions=" + varVendorExtensions + "]"; } } @@ -659,7 +659,7 @@ public class JavaCXFExtServerCodegen extends JavaCXFServerCodegen implements CXF int i = (int) (values.size() * Math.random()); Object randomEnum = values.get(i); boolean usingEnumLiteral = false; - String definingClass = (String) var.vendorExtensions.get("x-defining-class"); + String definingClass = (String) var.varVendorExtensions.get("x-defining-class"); if (definingClass != null) { @SuppressWarnings("unchecked") List<Map<String, Object>> enumVars = (List<Map<String, Object>>) var.allowableValues.get("enumVars"); -- GitLab From d844f863ecb0b6d6f892fbb83b538c2427740480 Mon Sep 17 00:00:00 2001 From: Jeremie Bresson <dev@jmini.fr> Date: Tue, 9 Apr 2019 07:22:44 +0200 Subject: [PATCH 3/3] =?UTF-8?q?Fix=20=E2=80=9CJavadoc:=20Invalid=20URL=20r?= =?UTF-8?q?eference.=20Double=20quote=20the=20=20reference=20or=20use=20th?= =?UTF-8?q?e=20href=20syntax=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/openapitools/codegen/utils/JsonCacheImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonCacheImpl.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonCacheImpl.java index 52bdde3bfb2..9409372b4d4 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonCacheImpl.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/JsonCacheImpl.java @@ -863,7 +863,7 @@ class JsonCacheImpl implements JsonCache.Root { /** * Ensures that a suitable container exists for the specified JSON pointer. * - * @param ptr A {@link https://tools.ietf.org/html/rfc6901 JSON Pointer} to the property to set. + * @param ptr A <a href="https://tools.ietf.org/html/rfc6901">JSON Pointer</a> to the property to set. * @return The container that owns the property identified by <code>path</code>. */ protected ContainerNode<?> ensureContainerExists(JsonPointer ptr) { @@ -873,7 +873,7 @@ class JsonCacheImpl implements JsonCache.Root { /** * Ensures that all ancestor containers exist for the specified JSON pointer. * - * @param ptr A {@link https://tools.ietf.org/html/rfc6901 JSON Pointer} to the property to set. + * @param ptr A <a href="https://tools.ietf.org/html/rfc6901">JSON Pointer</a> to the property to set. * @param forceArray <code>true</code> to create an array for the last segment of the pointer if it is non-integral. * @return The container that owns the property identified by <code>path</code>. */ -- GitLab