From 83cf2cdc72ce81c537dd1efd74483c7191f32fef Mon Sep 17 00:00:00 2001 From: frantuma Date: Wed, 20 Feb 2019 19:39:28 +0100 Subject: [PATCH] fix generator types endpoint --- .../v3/generator/online/GeneratorController.java | 15 +++++++++++++-- .../src/main/resources/openapi.yaml | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/swagger-generator/src/main/java/io/swagger/v3/generator/online/GeneratorController.java b/modules/swagger-generator/src/main/java/io/swagger/v3/generator/online/GeneratorController.java index 559254d4adc4..c33c976d50ef 100644 --- a/modules/swagger-generator/src/main/java/io/swagger/v3/generator/online/GeneratorController.java +++ b/modules/swagger-generator/src/main/java/io/swagger/v3/generator/online/GeneratorController.java @@ -255,16 +255,27 @@ public ResponseContext languages(RequestContext requestContext, String type, Str } public ResponseContext languagesMulti(RequestContext requestContext, List types, String version) { + Yaml.prettyPrint(types); final List languages = new ArrayList<>(); if ("V2".equals(version)) { - types.forEach(s -> languages.addAll(TYPESV2.get(io.swagger.codegen.CodegenType.forValue(s)))); + types.forEach(s -> { + List typeLanguages = TYPESV2.get(io.swagger.codegen.CodegenType.forValue(s)); + if (typeLanguages != null) { + languages.addAll(typeLanguages); + } + }); Collections.sort(languages, String.CASE_INSENSITIVE_ORDER); return new ResponseContext() .status(Response.Status.OK.getStatusCode()) .entity(languages); } - types.forEach(s -> languages.addAll(TYPES.get(CodegenType.forValue(s)))); + types.forEach(s -> { + List typeLanguages = TYPES.get(CodegenType.forValue(s)); + if (typeLanguages != null) { + languages.addAll(typeLanguages); + } + }); Collections.sort(languages, String.CASE_INSENSITIVE_ORDER); return new ResponseContext() .status(Response.Status.OK.getStatusCode()) diff --git a/modules/swagger-generator/src/main/resources/openapi.yaml b/modules/swagger-generator/src/main/resources/openapi.yaml index 4f2247924e10..08e793982e23 100644 --- a/modules/swagger-generator/src/main/resources/openapi.yaml +++ b/modules/swagger-generator/src/main/resources/openapi.yaml @@ -234,7 +234,7 @@ components: style: form explode: false required: true - description: pipe-separated list of generator types + description: comma-separated list of generator types schema: type: array items: