From 7595baef00abd15e3b2b2b787309c5159522948d Mon Sep 17 00:00:00 2001 From: zigen Date: Mon, 24 Dec 2018 18:46:42 +0900 Subject: [PATCH] Fix composed oneof type 1749 (#1750) * add test to check that DefaultCodegen generates composed oneof schema properly * fix composed-oneof type generation bug (#1749) --- .../src/main/java/org/openapitools/codegen/DefaultCodegen.java | 2 +- .../test/java/org/openapitools/codegen/DefaultCodegenTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index 2e8815959a4..d4728dea6d3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -1413,8 +1413,8 @@ public class DefaultCodegen implements CodegenConfig { // primitive type or model names.add(getAlias(getPrimitiveType(s))); } - return "oneOf<" + String.join(",", names) + ">"; } + return "oneOf<" + String.join(",", names) + ">"; } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index 6a3f790cdba..8463bb220f8 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -252,6 +252,7 @@ public class DefaultCodegenTest { String type = codegen.getSchemaType(schema); Assert.assertNotNull(type); + Assert.assertEquals(type, "oneOf"); } @Test