ref #2972 - fixes resolving multiple map properties

modules/swagger-core/src/main/java/io/swagger/v3/core/jackson/ModelResolver.java

@@ -618,7 +618,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
 
                 if (property != null) {
                     if (property.get$ref() == null) {
-                        if (!"object".equals(property.getType())) {
+                        if (!"object".equals(property.getType()) || (property instanceof MapSchema)) {
                             try {
                                 String cloneName = property.getName();
                                 property = Json.mapper().readValue(Json.pretty(property), Schema.class);

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/Ticket2972Test.java

@@ -0,0 +1,36 @@
+package io.swagger.v3.core.resolving;
+
+import io.swagger.v3.core.converter.AnnotatedType;
+import io.swagger.v3.core.converter.ModelConverterContextImpl;
+import io.swagger.v3.core.jackson.ModelResolver;
+import io.swagger.v3.core.matchers.SerializationMatchers;
+import io.swagger.v3.core.resolving.resources.TestObject2972;
+import io.swagger.v3.oas.models.media.Schema;
+import org.testng.annotations.Test;
+
+public class Ticket2972Test extends SwaggerTestBase {
+
+    @Test
+    public void testLocalTime() throws Exception {
+
+        final ModelResolver modelResolver = new ModelResolver(mapper());
+
+        ModelConverterContextImpl context = new ModelConverterContextImpl(modelResolver);
+
+        Schema model = context
+                .resolve(new AnnotatedType(TestObject2972.class));
+
+        SerializationMatchers.assertEqualsToYaml(context.getDefinedModels(), "TestObject2972:\n" +
+                "  type: object\n" +
+                "  properties:\n" +
+                "    myField1:\n" +
+                "      type: object\n" +
+                "      additionalProperties:\n" +
+                "        type: string\n" +
+                "    myField2:\n" +
+                "      type: object\n" +
+                "      additionalProperties:\n" +
+                "        type: string");
+    }
+
+}

modules/swagger-core/src/test/java/io/swagger/v3/core/resolving/resources/TestObject2972.java

@@ -0,0 +1,9 @@
+package io.swagger.v3.core.resolving.resources;
+
+import java.util.Map;
+
+public class TestObject2972 {
+
+    public Map<String, String> myField1;
+    public Map<String, String> myField2;
+}