refs #4850 - fix extension 'x-' prefix decoration

Author: frantuma

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

@@ -53,7 +53,6 @@
 import io.swagger.v3.oas.annotations.media.SchemaProperty;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.ExternalDocumentation;
-import io.swagger.v3.oas.models.SpecVersion;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.ComposedSchema;
 import io.swagger.v3.oas.models.media.Discriminator;
@@ -227,7 +226,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
             if (resolvedArrayAnnotation == null) {
                 schemaRefFromAnnotation = resolvedSchemaAnnotation.ref();
                 if (!openapi31) {
-                    return new JsonSchema().$ref(resolvedSchemaAnnotation.ref()).name(name);
+                    return new Schema().$ref(resolvedSchemaAnnotation.ref()).name(name);
                 }
             } else {
                 ArraySchema schema = new ArraySchema();
@@ -2799,7 +2798,8 @@ protected Map<String, Object> resolveExtensions(AnnotatedType a, io.swagger.v3.o
         if (arraySchema != null &&
                 arraySchema.extensions() != null &&
                 arraySchema.extensions().length > 0) {
-            return AnnotationsUtils.getExtensions(openapi31, false, arraySchema.extensions());
+            boolean usePrefix = !openapi31;
+            return AnnotationsUtils.getExtensions(openapi31, usePrefix, arraySchema.extensions());
         }
         return null;
     }

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

@@ -539,7 +539,8 @@ public static Optional<Schema> getArraySchema(io.swagger.v3.oas.annotations.medi
         }
 
         if (arraySchema.extensions().length > 0) {
-            Map<String, Object> extensions = AnnotationsUtils.getExtensions(openapi31, false, arraySchema.extensions());
+            boolean usePrefix = !openapi31;
+            Map<String, Object> extensions = AnnotationsUtils.getExtensions(openapi31, usePrefix, arraySchema.extensions());
             if (extensions != null) {
                 extensions.forEach(arraySchemaObject::addExtension);
             }

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

@@ -150,15 +150,13 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import static io.swagger.v3.oas.models.SpecVersion.V31;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotEquals;
@@ -5348,9 +5346,8 @@ public void testTicket4065() {
 
     @Test(description = "Extensions Tests OAS 3.1")
     public void testExtensionsOAS31() {
-        OpenAPI o = new OpenAPI(V31);
-        SwaggerConfiguration config = new SwaggerConfiguration().openAPI(o).openAPI31(true);
-        Reader reader = new Reader(o, new Paths(), new LinkedHashSet<>(), new Components(), config);
+        SwaggerConfiguration config = new SwaggerConfiguration().openAPI31(true);
+        Reader reader = new Reader(config);
 
         OpenAPI openAPI = reader.read(Ticket4850Resource.class);
         assertNotNull(openAPI);

modules/swagger-jaxrs2/src/test/java/io/swagger/v3/jaxrs2/resources/Ticket4850Resource.java

@@ -6,7 +6,6 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
 
 @Path("/bar")
 public class Ticket4850Resource {