Removes caching of List element schema processing result to avoid over-applied XML annotations.

Author: eak24

modules/swagger-core/src/main/java/io/swagger/v3/core/converter/AnnotatedType.java

@@ -29,6 +29,7 @@ public class AnnotatedType {
     private boolean skipSchemaName;
     private boolean skipJsonIdentity;
     private String propertyName;
+    private boolean collectionElement;
 
     public AnnotatedType() {
     }
@@ -50,6 +51,19 @@ public AnnotatedType skipOverride(boolean skipOverride) {
         return this;
     }
 
+    public boolean isCollectionElement() {
+        return collectionElement;
+    }
+
+    public void setCollectionElement(boolean collectionElement) {
+        this.collectionElement = collectionElement;
+    }
+
+    public AnnotatedType collectionElement(boolean collectionElement) {
+        this.collectionElement = collectionElement;
+        return this;
+    }
+
     public boolean isSkipJsonIdentity() {
         return skipJsonIdentity;
     }

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

@@ -17,9 +17,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 
-import com.fasterxml.jackson.databind.type.SimpleType;
-import com.fasterxml.jackson.databind.type.TypeBase;
-
 public class ModelConverterContextImpl implements ModelConverterContext {
     private static final Logger LOGGER = LoggerFactory.getLogger(ModelConverterContextImpl.class);
 
@@ -93,7 +90,7 @@ public Schema resolve(AnnotatedType type) {
             LOGGER.trace("trying extension " + converter);
             resolved = converter.resolve(type, this, converters);
         }
-        if (resolved != null) {
+        if (resolved != null && !type.isCollectionElement()) {
             modelByType.put(type, resolved);
 
             Schema resolvedImpl = resolved;

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

@@ -432,7 +432,8 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                         .resolveAsRef(annotatedType.isResolveAsRef())
                         .propertyName(annotatedType.getPropertyName())
                         .jsonViewAnnotation(annotatedType.getJsonViewAnnotation())
-                        .parent(annotatedType.getParent()));
+                        .parent(annotatedType.getParent())
+                        .collectionElement(true));
 
                 if (items == null) {
                     return null;

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/PetResourceTest.java

@@ -1,5 +1,6 @@
 package io.swagger.v3.jaxrs2;
 
+import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.jaxrs2.annotations.AbstractAnnotationTest;
 import io.swagger.v3.jaxrs2.matchers.SerializationMatchers;
 import io.swagger.v3.jaxrs2.petstore.EmptyPetResource;
@@ -256,6 +257,7 @@ private static List<Class> findClasses(final File directory, final String packag
      * @param source where is the yaml.
      */
     private void compare(final Class clazz, final String source) {
+        ModelConverters.getInstance().resetContext();
         final String file = source + clazz.getSimpleName() + YAML_EXTENSION;
         try {
             compareAsYaml(clazz, getOpenAPIAsString(file));

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/ReaderTest.java

@@ -90,6 +90,8 @@
 import io.swagger.v3.oas.models.responses.ApiResponses;
 import io.swagger.v3.oas.models.security.SecurityRequirement;
 import io.swagger.v3.oas.models.security.SecurityScheme;
+
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import javax.validation.constraints.AssertTrue;
@@ -159,6 +161,11 @@ public class ReaderTest {
     private static final int SCOPE_NUMBER = 2;
     private static final int PATHS_NUMBER = 1;
 
+    @BeforeMethod
+    public void beforeTest() {
+        ModelConverters.getInstance().resetContext();
+    }
+
     @Test(description = "test a simple resource class")
     public void testSimpleReadClass() {
         Reader reader = new Reader(new OpenAPI());
@@ -2107,7 +2114,7 @@ public void testTicket3074() {
         Reader reader = new Reader(new OpenAPI());
         OpenAPI oasResult = reader.read(RefParameter3074Resource.class);
         SerializationMatchers.assertEqualsToYaml(oasResult, RefParameter3074Resource.EXPECTED_YAML_WITH_WRAPPER);
-
+        ModelConverters.getInstance().resetContext();
         ModelConverters.getInstance().addClassToSkip("io.swagger.v3.jaxrs2.resources.RefParameter3074Resource$Wrapper");
 
         reader = new Reader(new OpenAPI());

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/annotations/AbstractAnnotationTest.java

@@ -2,11 +2,15 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.JsonNode;
+
+import io.swagger.v3.core.converter.ModelConverter;
+import io.swagger.v3.core.converter.ModelConverters;
 import io.swagger.v3.core.util.Yaml;
 import io.swagger.v3.jaxrs2.Reader;
 import io.swagger.v3.jaxrs2.matchers.SerializationMatchers;
 import io.swagger.v3.oas.models.OpenAPI;
 import org.apache.commons.io.IOUtils;
+import org.testng.annotations.BeforeMethod;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -15,6 +19,11 @@
 import static org.testng.Assert.fail;
 
 public abstract class AbstractAnnotationTest {
+    @BeforeMethod
+    public void beforeTest() {
+        ModelConverters.getInstance().resetContext();
+    }
+
     public String readIntoYaml(final Class<?> cls) {
         Reader reader = new Reader(new OpenAPI());
         OpenAPI openAPI = reader.read(cls);
@@ -42,6 +51,7 @@ public void compareToYamlFile(final Class<?> cls, String source){
     }
 
     public void compareAsYaml(final Class<?> cls, final String yaml) throws IOException {
+        ModelConverters.getInstance().resetContext();
         Reader reader = new Reader(new OpenAPI());
         OpenAPI openAPI = reader.read(cls);
         SerializationMatchers.assertEqualsToYaml(openAPI, yaml);