From 18c57a65ed5def618be6495e86fd2d0c73f89882 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sat, 5 Aug 2017 22:24:46 +0800
Subject: [PATCH] Fix returnBaseType in Map response (#6246)

* fix returnBaseType for map response

* fix javadoc string
---
 .../src/main/java/io/swagger/codegen/DefaultCodegen.java  | 6 +++++-
 .../main/java/io/swagger/codegen/InlineModelResolver.java | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
index 4ca3daeab06..bc0dbf5530b 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -2181,6 +2181,10 @@ public class DefaultCodegen {
                         ArrayProperty ap = (ArrayProperty) responseProperty;
                         CodegenProperty innerProperty = fromProperty("response", ap.getItems());
                         op.returnBaseType = innerProperty.baseType;
+                    } else if (responseProperty instanceof MapProperty) {
+                        MapProperty ap = (MapProperty) responseProperty;
+                        CodegenProperty innerProperty = fromProperty("response", ap.getAdditionalProperties());
+                        op.returnBaseType = innerProperty.baseType;
                     } else {
                         if (cm.complexType != null) {
                             op.returnBaseType = cm.complexType;
@@ -3658,7 +3662,7 @@ public class DefaultCodegen {
      * writes it back to additionalProperties to be usable as a boolean in
      * mustache files.
      *
-     * @param propertyKey
+     * @param propertyKey property key
      * @return property value as boolean
      */
     public boolean convertPropertyToBooleanAndWriteBack(String propertyKey) {
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
index 283c4c3099a..4159f36aaa2 100644
--- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
+++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/InlineModelResolver.java
@@ -400,8 +400,8 @@ public class InlineModelResolver {
     /**
      * Make a RefProperty
      * 
-     * @param ref
-     * @param property
+     * @param ref new property name
+     * @param property Property
      * @return
      */
     public Property makeRefProperty(String ref, Property property) {
@@ -413,8 +413,8 @@ public class InlineModelResolver {
     /**
      * Copy vendor extensions from Property to another Property
      * 
-     * @param source
-     * @param target
+     * @param source soruce property
+     * @param target target property
      */
     public void copyVendorExtensions(Property source, AbstractProperty target) {
         Map<String, Object> vendorExtensions = source.getVendorExtensions();