Upgrade to 3.1.0 for the pilot project

Author: Joze RIHTARSIC

README.md

@@ -1,9 +1,3 @@
-**NOTE:** THIS IS FORK from https://github.com/swagger-api/swagger-core and it intended only for testing and piloting REST related projects
-For production use the original libraries!!!!
-
-
-
-
 # Swagger Core <img src="https://raw.githubusercontent.com/swagger-api/swagger.io/wordpress/images/assets/SW-logo-clr.png" height="50" align="right">
 
 **NOTE:** If you're looking for Swagger Core 1.5.X and OpenAPI 2.0, please refer to [1.5 branch](https://github.com/swagger-api/swagger-core/tree/1.5).
@@ -27,7 +21,8 @@ The OpenAPI Specification has undergone several revisions since initial creation
 
 Swagger core Version      | Release Date | OpenAPI Spec compatibility | Notes | Status
 ------------------------- | ------------ | -------------------------- | ----- | ----
-2.1.9 (**current stable**)| 2021-04-20   | 3.0           | [tag v2.1.9](https://github.com/swagger-api/swagger-core/tree/v2.1.9) | Supported
+2.1.10 (**current stable**)| 2021-06-28   | 3.0           | [tag v2.1.10](https://github.com/swagger-api/swagger-core/tree/v2.1.10) | Supported
+2.1.9                     | 2021-04-20   | 3.0           | [tag v2.1.9](https://github.com/swagger-api/swagger-core/tree/v2.1.9) | Supported
 2.1.8                     | 2021-04-18   | 3.0           | [tag v2.1.8](https://github.com/swagger-api/swagger-core/tree/v2.1.8) | Supported
 2.1.7                     | 2021-02-18   | 3.0           | [tag v2.1.7](https://github.com/swagger-api/swagger-core/tree/v2.1.7) | Supported
 2.1.6                     | 2020-12-04   | 3.0           | [tag v2.1.6](https://github.com/swagger-api/swagger-core/tree/v2.1.6) | Supported
@@ -80,7 +75,7 @@ You need the following installed and available in your $PATH:
 * Jackson 2.4.5 or greater
 
 
-### To build from source (currently 2.1.10-ISA2-SNAPSHOT)
+### To build from source (currently 2.1.11-SNAPSHOT)
 ```
 # first time building locally
 mvn -N

modules/swagger-annotations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.github.jrihtarsic.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.1.10-OA3.1-SNAPSHOT</version>
+        <version>2.1.11-OA3.1-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/PatternProperties.java

@@ -16,8 +16,6 @@
 
 package io.swagger.v3.oas.annotations.media;
 
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

modules/swagger-annotations/src/main/java/io/swagger/v3/oas/annotations/media/PatternProperty.java

@@ -16,7 +16,6 @@
 
 package io.swagger.v3.oas.annotations.media;
 
-import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;

modules/swagger-core/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.github.jrihtarsic.swagger</groupId>
         <artifactId>swagger-project</artifactId>
-        <version>2.1.10-OA3.1-SNAPSHOT</version>
+        <version>2.1.11-OA3.1-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -33,9 +33,7 @@
 import io.swagger.v3.core.util.AnnotationsUtils;
 import io.swagger.v3.core.util.Constants;
 import io.swagger.v3.core.util.Json;
-import io.swagger.v3.core.util.Json31;
 import io.swagger.v3.core.util.ObjectMapperFactory;
-import io.swagger.v3.core.util.OpenAPISchema2JsonSchema;
 import io.swagger.v3.core.util.OptionalUtils;
 import io.swagger.v3.core.util.PrimitiveType;
 import io.swagger.v3.core.util.ReflectionUtils;
@@ -115,11 +113,6 @@ public class ModelResolver extends AbstractModelConverter implements ModelConver
      */
     public static boolean enumsAsRef = System.getProperty(SET_PROPERTY_OF_ENUMS_AS_REF) != null;
 
-    /**
-     * @since 2.1.8
-     */
-    protected OpenAPISchema2JsonSchema jsonSchemaProcessor = new OpenAPISchema2JsonSchema();
-
     public ModelResolver(ObjectMapper mapper) {
         super(mapper);
     }
@@ -204,15 +197,11 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
         if (resolvedSchemaAnnotation != null &&
                 StringUtils.isNotEmpty(resolvedSchemaAnnotation.ref())) {
             if (resolvedArrayAnnotation == null) {
-                Schema result = new Schema().$ref(resolvedSchemaAnnotation.ref()).name(name);
-                jsonSchemaProcessor.process(result);
                 return new Schema().$ref(resolvedSchemaAnnotation.ref()).name(name);
             } else {
                 ArraySchema schema = new ArraySchema();
                 resolveArraySchema(annotatedType, schema, resolvedArrayAnnotation);
-                schema.items(new Schema().$ref(resolvedSchemaAnnotation.ref()).name(name));
-                jsonSchemaProcessor.process(schema);
-                return schema;
+                return schema.items(new Schema().$ref(resolvedSchemaAnnotation.ref()).name(name));
             }
         }
 
@@ -264,7 +253,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                     }
                 }
                 schema.setItems(innerSchema);
-                jsonSchemaProcessor.process(schema);
                 return schema;
             } else {
                 Schema implSchema = context.resolve(aType);
@@ -276,9 +264,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                 } else if (implSchema != null && implSchema.get$ref() != null) {
                     implSchema = new Schema().$ref(StringUtils.isNotEmpty(implSchema.get$ref()) ? implSchema.get$ref() : implSchema.getName());
                 }
-                if (implSchema != null) {
-                    jsonSchemaProcessor.process(implSchema);
-                }
                 return implSchema;
             }
         }
@@ -326,7 +311,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                 }
                 model = new GeneratorWrapper().processJsonIdentity(annotatedType, context, _mapper, jsonIdentityInfo, jsonIdentityReference);
                 if (model != null) {
-                    jsonSchemaProcessor.process(model);
                     return model;
                 }
             }
@@ -357,19 +341,14 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                 ArraySchema schema = new ArraySchema();
                 resolveArraySchema(annotatedType, schema, resolvedArrayAnnotation);
                 schema.setItems(model);
-                jsonSchemaProcessor.process(schema);
                 return schema;
             }
             if (type.isEnumType() && shouldResolveEnumAsRef(resolvedSchemaAnnotation)) {
                 // Store off the ref and add the enum as a top-level model
-                jsonSchemaProcessor.process(model);
                 context.defineModel(name, model, annotatedType, null);
                 // Return the model as a ref only property
                 model = new Schema().$ref(Components.COMPONENTS_SCHEMAS_REF + name);
             }
-            if (model != null) {
-                jsonSchemaProcessor.process(model);
-            }
             return model;
         }
 
@@ -388,7 +367,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
         Schema resolvedModel = context.resolve(annotatedType);
         if (resolvedModel != null) {
             if (name != null && name.equals(resolvedModel.getName())) {
-                jsonSchemaProcessor.process(resolvedModel);
                 return resolvedModel;
             }
         }
@@ -406,11 +384,7 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                     .propertyName(annotatedType.getPropertyName())
                     .ctxAnnotations(annotatedType.getCtxAnnotations())
                     .skipOverride(true);
-            Schema result = context.resolve(aType);
-            if (result != null) {
-                jsonSchemaProcessor.process(result);
-            }
-            return result;
+            return context.resolve(aType);
         }
 
         List<Class<?>> composedSchemaReferencedClasses = getComposedSchemaReferencedClasses(type.getRawClass(), annotatedType.getCtxAnnotations(), resolvedSchemaAnnotation);
@@ -526,9 +500,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
             AnnotatedType aType = OptionalUtils.unwrapOptional(annotatedType);
             if (aType != null) {
                 model = context.resolve(aType);
-                if (model != null) {
-                    jsonSchemaProcessor.process(model);
-                }
                 return model;
             } else {
                 model = new Schema()
@@ -539,7 +510,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
 
         if (!type.isContainerType() && StringUtils.isNotBlank(name)) {
             // define the model here to support self/cyclic referencing of models
-            jsonSchemaProcessor.process(model);
             context.defineModel(name, model, annotatedType, null);
         }
 
@@ -766,7 +736,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
          * available for modification by resolveSubtypes, when their parents are created.
          */
         if (!type.isContainerType() && StringUtils.isNotBlank(name)) {
-            jsonSchemaProcessor.process(model);
             context.defineModel(name, model, annotatedType, null);
         }
 
@@ -897,7 +866,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
 
         if (!type.isContainerType() && StringUtils.isNotBlank(name)) {
             // define the model here to support self/cyclic referencing of models
-            jsonSchemaProcessor.process(model);
             context.defineModel(name, model, annotatedType, null);
         }
 
@@ -917,7 +885,6 @@ public Schema resolve(AnnotatedType annotatedType, ModelConverterContext context
                 ArraySchema schema = new ArraySchema();
                 schema.setItems(model);
                 resolveArraySchema(annotatedType, schema, resolvedArrayAnnotation);
-                jsonSchemaProcessor.process(schema);
                 return schema;
             } else {
                 if (model instanceof ArraySchema) {
@@ -1421,8 +1388,6 @@ private boolean resolveSubtypes(Schema model, BeanDescription bean, ModelConvert
                 composedSchema = (ComposedSchema) new ComposedSchema()
                         .title(subtypeModel.getTitle())
                         .name(subtypeModel.getName())
-                        .id(subtypeModel.get$id())
-                        .schema(subtypeModel.get$schema())
                         .deprecated(subtypeModel.getDeprecated())
                         .additionalProperties(subtypeModel.getAdditionalProperties())
                         .description(subtypeModel.getDescription())
@@ -1478,7 +1443,6 @@ private boolean resolveSubtypes(Schema model, BeanDescription bean, ModelConvert
             // replace previous schema..
             Class<?> currentType = subtype.getType();
             if (StringUtils.isNotBlank(composedSchema.getName())) {
-                jsonSchemaProcessor.process(composedSchema);
                 context.defineModel(composedSchema.getName(), composedSchema, new AnnotatedType().type(currentType), null);
             }
 
@@ -1576,19 +1540,6 @@ protected String resolveFormat(Annotated a, Annotation[] annotations, io.swagger
         return null;
     }
 
-    protected String resolveId(Annotated a, Annotation[] annotations, io.swagger.v3.oas.annotations.media.Schema schema) {
-        if (schema != null && StringUtils.isNotBlank(schema.id())) {
-            return schema.id();
-        }
-        return null;
-    }
-    protected String resolveSchema(Annotated a, Annotation[] annotations, io.swagger.v3.oas.annotations.media.Schema schema) {
-        if (schema != null && StringUtils.isNotBlank(schema.schema())) {
-            return schema.schema();
-        }
-        return null;
-    }
-
     protected Map<String, Schema> resolvePatternProperties(JavaType a, Annotation[] annotations, ModelConverterContext context) {
 
         final Map<String, PatternProperty> propList = new LinkedHashMap<>();
@@ -2168,14 +2119,6 @@ protected void resolveSchemaMembers(Schema schema, Annotated a, Annotation[] ann
         if (StringUtils.isNotBlank(title)) {
             schema.title(title);
         }
-        String id = resolveId(a, annotations, schemaAnnotation);
-        if (StringUtils.isNotBlank(id)) {
-            schema.id(id);
-        }
-        String schemaUrl = resolveSchema(a, annotations, schemaAnnotation);
-        if (StringUtils.isNotBlank(schemaUrl)) {
-            schema.schema(schemaUrl);
-        }
         String format = resolveFormat(a, annotations, schemaAnnotation);
         if (StringUtils.isNotBlank(format) && StringUtils.isBlank(schema.getFormat())) {
             schema.format(format);

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

@@ -6,7 +6,6 @@
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ResolvableSerializer;
 import io.swagger.v3.oas.models.media.Schema;
-import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 
@@ -30,9 +29,13 @@ public void serialize(
             Schema value, JsonGenerator jgen, SerializerProvider provider)
             throws IOException {
 
+        defaultSerializer.serialize(value, jgen, provider);
+
+/*
         // handle ref schema serialization skipping all other props
         if (value.getJsonSchema() != null) {
             jgen.writeObject(value.getJsonSchema());
         }
+*/
     }
 }

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

@@ -1,9 +1,18 @@
 package io.swagger.v3.core.jackson.mixin;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.Map;
 
 public abstract class DateSchemaMixin {
 
     @JsonFormat (shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     public abstract Object getExample();
+
+    @JsonIgnore
+    public abstract Object getJsonSchemaImpl();
+
+    @JsonIgnore
+    public abstract Map<String, Object> getJsonSchema();
 }

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

@@ -0,0 +1,23 @@
+package io.swagger.v3.core.jackson.mixin;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.Map;
+
+public abstract class ExampleMixin {
+
+    @JsonAnyGetter
+    public abstract Map<String, Object> getExtensions();
+
+    @JsonAnySetter
+    public abstract void addExtension(String name, Object value);
+
+    @JsonInclude(JsonInclude.Include.CUSTOM)
+    public abstract Object getValue();
+
+    @JsonIgnore
+    public abstract boolean getValueSetFlag();
+}

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

@@ -0,0 +1,23 @@
+package io.swagger.v3.core.jackson.mixin;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import java.util.Map;
+
+public abstract class MediaTypeMixin {
+
+    @JsonAnyGetter
+    public abstract Map<String, Object> getExtensions();
+
+    @JsonAnySetter
+    public abstract void addExtension(String name, Object value);
+
+    @JsonIgnore
+    public abstract boolean getExampleSetFlag();
+
+    @JsonInclude(JsonInclude.Include.CUSTOM)
+    public abstract Object getExample();
+}