Merge pull request #3707 from swagger-api/ticket-3703

Author: frantuma

modules/swagger-core/src/main/java/io/swagger/v3/core/util/OptionalUtils.java

@@ -42,7 +42,7 @@ public static AnnotatedType unwrapOptional(AnnotatedType type) {
                         .name(type.getName())
                         .parent(type.getParent())
                         .jsonUnwrappedHandler(type.getJsonUnwrappedHandler())
-                        .skipOverride(true)
+                        .skipOverride(type.isSkipOverride())
                         .schemaProperty(type.isSchemaProperty())
                         .ctxAnnotations(type.getCtxAnnotations())
                         .resolveAsRef(type.isResolveAsRef())

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

@@ -0,0 +1,59 @@
+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.oas.models.media.Schema;
+import org.testng.annotations.Test;
+
+import java.util.Optional;
+
+public class Ticket3703Test extends SwaggerTestBase {
+
+    @Test
+    public void testSelfReferencingOptional() throws Exception {
+
+        final ModelResolver modelResolver = new ModelResolver(mapper());
+
+        ModelConverterContextImpl context = new ModelConverterContextImpl(modelResolver);
+
+        Schema model = context
+                .resolve(new AnnotatedType(ModelContainer.class));
+
+        SerializationMatchers.assertEqualsToYaml(context.getDefinedModels(), "Model:\n" +
+                "  type: object\n" +
+                "  properties:\n" +
+                "    model:\n" +
+                "      $ref: '#/components/schemas/Model'\n" +
+                "ModelContainer:\n" +
+                "  type: object\n" +
+                "  properties:\n" +
+                "    model:\n" +
+                "      $ref: '#/components/schemas/Model'\n" +
+                "    bytes:\n" +
+                "      type: string\n" +
+                "      format: byte");
+
+    }
+
+    static class ModelContainer {
+        public Optional<Model> model;
+
+        @io.swagger.v3.oas.annotations.media.Schema(type = "string", format = "byte")
+        public Optional<Bytes> getBytes() {
+            return null;
+        }
+
+    }
+
+    static class Model {
+        public Optional<Model> model;
+    }
+
+    static class Bytes {
+        public String foo;
+        public String bar;
+    }
+
+}

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

@@ -2248,7 +2248,7 @@ public void testTicket3587() {
         SerializationMatchers.assertEqualsToYamlExact(openAPI, yaml);
     }
 
-    @Test(description = "Optional hanlding")
+    @Test(description = "Optional handling")
     public void testTicket3624() {
         Reader reader = new Reader(new OpenAPI());