refs #3348 - clone all resolved properties

Author: rozzamozza

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

@@ -638,19 +638,10 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                         //return context.resolve(t);
                     }
                 });
-                property = context.resolve(aType);
+                property = clone(context.resolve(aType));
 
                 if (property != null) {
                     if (property.get$ref() == null) {
-                        if (!"object".equals(property.getType()) || (property instanceof MapSchema)) {
-                            try {
-                                String cloneName = property.getName();
-                                property = Json.mapper().readValue(Json.pretty(property), Schema.class);
-                                property.setName(cloneName);
-                            } catch (IOException e) {
-                                LOGGER.error("Could not clone property, e");
-                            }
-                        }
                         Boolean required = md.getRequired();
                         if (required != null && !Boolean.FALSE.equals(required)) {
                             addRequiredItem(model, propName);
@@ -865,6 +856,19 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
         return model;
     }
 
+    private Schema clone(Schema property) {
+        if(property == null)
+            return property;
+        try {
+            String cloneName = property.getName();
+            property = Json.mapper().readValue(Json.pretty(property), Schema.class);
+            property.setName(cloneName);
+        } catch (IOException e) {
+            LOGGER.error("Could not clone property, e");
+        }
+        return property;
+    }
+
     private boolean isSubtype(AnnotatedClass childClass, Class<?> parentClass) {
         final BeanDescription parentDesc = _mapper.getSerializationConfig().introspectClassAnnotations(parentClass);
         List<NamedType> subTypes =_intr.findSubtypes(parentDesc.getClassInfo());

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

@@ -0,0 +1,41 @@
+package io.swagger.v3.core.resolving;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
+
+import java.util.Map;
+
+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.oas.models.media.Schema;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
+public class Ticket3348Test extends SwaggerTestBase {
+
+    private ModelResolver modelResolver;
+    private ModelConverterContextImpl context;
+
+    @BeforeMethod
+    public void beforeMethod() {
+        modelResolver = new ModelResolver(new ObjectMapper());
+        context = new ModelConverterContextImpl(modelResolver);
+    }
+
+    @Test
+    public void testTicket3348() {
+        final Schema model = context.resolve(new AnnotatedType(WithObjects.class));
+        assertNotNull(model);
+        final Map<String, Schema> props = model.getProperties();
+        assertEquals(props.size(), 2);
+    }
+
+    static class WithObjects  {
+        public Object param1;
+        public Object param2;
+    }
+}