Properly resolve a inner model with a self reference.

Author: msimons

modules/swagger-core/src/main/java/io/swagger/converter/ModelConverterContextImpl.java

@@ -49,14 +49,14 @@ public void defineModel(String name, Model model) {
     }
 
     @Override
-    public void defineModel(String name, Model model, Type type, String oldName) {
+    public void defineModel(String name, Model model, Type type, String prevName) {
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug(String.format("defineModel %s %s", name, model));
         }
         modelByName.put(name, model);
 
-        if(StringUtils.isNotBlank(oldName)) {
-            modelByName.remove(oldName);
+        if(StringUtils.isNotBlank(prevName)) {
+            modelByName.remove(prevName);
         }
 
         if(type != null) {

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

@@ -190,7 +190,11 @@ public Model resolve(JavaType type, ModelConverterContext context, Iterator<Mode
 
         final ModelImpl model = new ModelImpl().type(ModelImpl.OBJECT).name(name)
                 .description(_description(beanDesc.getClassInfo()));
-        context.defineModel(name,model,type,null);
+
+        if(!type.isContainerType()) {
+            // define the model here to support self/cyclic referencing of models
+            context.defineModel(name, model, type, null);
+        }
 
         if (type.isContainerType()) {
             // We treat collections as primitive types, just need to add models for values (if any)

modules/swagger-jaxrs/src/test/scala/SimpleScannerTest.scala

@@ -306,7 +306,7 @@ class SimpleScannerTest extends FlatSpec with Matchers {
     schema.getType() should be("integer")
     schema.getFormat() should be("int32")
 
-    swagger.getDefinitions().keySet().asScala should be(Set("Tag","Array"))
+    swagger.getDefinitions().keySet().asScala should be(Set("Tag"))
 
     def testParam(path: String, name: String, description: String): Model = {
       val param = swagger.getPath(path).getPost().getParameters().get(0).asInstanceOf[BodyParameter]
@@ -362,7 +362,7 @@ class SimpleScannerTest extends FlatSpec with Matchers {
 
   it should "check response models processing" in {
     val swagger = new Reader(new Swagger()).read(classOf[ResourceWithTypedResponses])
-    swagger.getDefinitions.keySet().asScala should be(Set("Map","Tag","List"))
+    swagger.getDefinitions.keySet().asScala should be(Set("Tag"))
     for ((key, path) <- swagger.getPaths.asScala) {
       key.substring(key.lastIndexOf("/") + 1) match {
         case "testPrimitiveResponses" =>