From b7b68ce0bc1321b1f42c1ed398ff7c4296eb5a05 Mon Sep 17 00:00:00 2001 From: Thibault Duperron Date: Thu, 4 Apr 2019 06:17:03 +0200 Subject: [PATCH] Change default inline object name (#2569) * Change default inline object name For #2516 * PR Review * throughout --- .../java/org/openapitools/codegen/InlineModelResolver.java | 4 ++-- .../org/openapitools/codegen/InlineModelResolverTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java index 63d937e2d1b..f11a6da3b12 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java @@ -408,8 +408,8 @@ public class InlineModelResolver { private String uniqueName(String key) { if (key == null) { - key = "NULL_UNIQUE_NAME"; - LOGGER.warn("null key found. Default to NULL_UNIQUE_NAME"); + key = "InlineObject"; + LOGGER.warn("Found an inline schema without the `title` attribute. Default the model name to InlineObject instead. To have better control of the model naming, define the model separately so that it can be reused throughout the spec."); } int count = 0; boolean done = false; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java index 92018e3f50c..52350b121f6 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java @@ -378,7 +378,7 @@ public class InlineModelResolverTest { ArraySchema requestBody = (ArraySchema) mediaType.getSchema(); assertNotNull(requestBody.getItems().get$ref()); - assertEquals("#/components/schemas/NULL_UNIQUE_NAME", requestBody.getItems().get$ref()); + assertEquals("#/components/schemas/InlineObject", requestBody.getItems().get$ref()); Schema items = ModelUtils.getReferencedSchema(openAPI, ((ArraySchema) mediaType.getSchema()).getItems()); assertTrue(items.getProperties().get("street") instanceof StringSchema);