Merge pull request #2357 from swagger-api/2.0

swagger integration and #2312 improvements and fixes

Author: frantuma

modules/swagger-core/src/main/java/io/swagger/config/ConfigFactory.java

@@ -286,7 +286,6 @@ else if(PrimitiveType.fromType(type) != null) {
         if (resolvedModel != null) {
             return resolvedModel;
         }
-        // TODO #2312 - needs clone implemented in #2227
         // uses raw class, as it does not consider super class while handling schema annotation for composed model props
         List<Class<?>> composedSchemaReferencedClasses = getComposedSchemaReferencedClasses(type.getRawClass());
         boolean isComposedSchema = composedSchemaReferencedClasses != null;
@@ -471,44 +470,20 @@ else if(PrimitiveType.fromType(type) != null) {
                     else {
                         property = context.resolve(cls, annotations);
                     }
-                    /*else if (or.toLowerCase().startsWith("map[")) {
-                        // TODO #2312
-//                        int pos = or.indexOf(",");
-//                        if (pos > 0) {
-//                            String innerType = or.substring(pos + 1, or.length() - 1);
-//                            MapProperty p = new MapProperty();
-//                            Property primitiveProperty = PrimitiveType.createProperty(innerType);
-//                            if (primitiveProperty != null) {
-//                                p.setAdditionalProperties(primitiveProperty);
-//                            } else {
-//                                innerJavaType = getInnerType(innerType);
-//                                p.setAdditionalProperties(context.resolveProperty(innerJavaType, annotations));
-//                            }
-//                            property = p;
-//                        }
-                    } else {
-                        Schema primitiveProperty = PrimitiveType.createProperty(or);
-                        if (primitiveProperty != null) {
-                            property = primitiveProperty;
-                        } else {
-                            innerJavaType = getInnerType(or);
-                            property = context.resolve(innerJavaType, annotations);
-                        }
-                    }
-                    if (innerJavaType != null) {
-                        context.resolve(innerJavaType);
-                    }*/
+                    // TODO #2312 possibly consider also type or remove from annotation and use only "implementation"
                 }
 
                 // no property from override, construct from propType
                 if (property == null) {
                     if (mp != null && StringUtils.isNotEmpty(mp.ref())) {
                         property = new Schema().$ref(mp.ref());
+/*
                     } else if (member.getAnnotation(JsonIdentityInfo.class) != null) {
                         // TODO #2312
-//                        property = GeneratorWrapper.processJsonIdentity(propType, context, _mapper,
-//                                member.getAnnotation(JsonIdentityInfo.class),
-//                                member.getAnnotation(JsonIdentityReference.class));
+                        property = GeneratorWrapper.processJsonIdentity(propType, context, _mapper,
+                                member.getAnnotation(JsonIdentityInfo.class),
+                                member.getAnnotation(JsonIdentityReference.class));
+*/
                     }
                     if (property == null) {
                         JsonUnwrapped uw = member.getAnnotation(JsonUnwrapped.class);
@@ -574,7 +549,7 @@ else if(PrimitiveType.fromType(type) != null) {
                             }
                         }
                         JAXBAnnotationsHelper.apply(member, property);
-                        applyBeanValidatorAnnotations(property, annotations);
+                        applyBeanValidatorAnnotations(property, annotations, model);
                     }
                 }
 
@@ -862,30 +837,27 @@ private static GeneratorWrapper getWrapper(Class<?> generator) {
 
         private static Schema process(Schema id, String propertyName, JavaType type,
                 ModelConverterContext context) {
-//            id.setTitle(propertyName);
             Schema model = context.resolve(type);
-                Schema mi = (Schema) model;
+                Schema mi = model;
                 mi.getProperties().put(propertyName, id);
                 return new Schema().$ref(StringUtils.isNotEmpty(mi.get$ref())
-                        ? mi.get$ref() : mi.getTitle());
+                        ? mi.get$ref() : mi.getName());
         }
     }
 
-    protected void applyBeanValidatorAnnotations(Schema property, Annotation[] annotations) {
+    protected void applyBeanValidatorAnnotations(Schema property, Annotation[] annotations, Schema parent) {
         Map<String, Annotation> annos = new HashMap<String, Annotation>();
         if (annotations != null) {
             for (Annotation anno : annotations) {
                 annos.put(anno.annotationType().getName(), anno);
             }
         }
-        // TODO #2312
         if (annos.containsKey("javax.validation.constraints.NotNull")) {
-//            property.setRequired(true);
+            parent.addRequiredItem(property.getName());
         }
         if (annos.containsKey("javax.validation.constraints.Min")) {
             if ("integer".equals(property.getType()) || "number". equals(property.getType())) {
                 Min min = (Min) annos.get("javax.validation.constraints.Min");
-//                AbstractNumericProperty ap = (AbstractNumericProperty) property;
                 property.setMinimum(new BigDecimal(min.value()));
             }
         }

modules/swagger-core/src/main/java/io/swagger/config/FilterFactory.java

@@ -5,7 +5,7 @@
 import io.swagger.oas.models.media.Schema;
 import io.swagger.oas.models.parameters.Parameter;
 import io.swagger.oas.models.responses.ApiResponse;
-
+import io.swagger.oas.models.security.SecurityScheme;
 
 public class DeserializationModule extends SimpleModule {
 
@@ -23,8 +23,7 @@ public DeserializationModule(boolean includePathDeserializer,
         this.addDeserializer(Parameter.class, new ParameterDeserializer());
 //        this.addDeserializer(RequestBody.class, new RequestBodyDeserializer());
 
-        // TODO #2312
-//        this.addDeserializer(SecurityDefinition.class, new SecurityDefinitionDeserializer());
+        this.addDeserializer(SecurityScheme.class, new SecuritySchemeDeserializer());
     }
 
     public DeserializationModule() {

modules/swagger-core/src/main/java/io/swagger/config/Scanner.java

@@ -0,0 +1,70 @@
+package io.swagger.util;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import io.swagger.oas.models.security.OAuthFlows;
+import io.swagger.oas.models.security.SecurityScheme;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+public class SecuritySchemeDeserializer extends JsonDeserializer<SecurityScheme> {
+    @Override
+    public SecurityScheme deserialize(JsonParser jp, DeserializationContext ctxt)
+            throws IOException, JsonProcessingException {
+        SecurityScheme result = null;
+
+
+        JsonNode node = jp.getCodec().readTree(jp);
+
+        JsonNode inNode = node.get("type");
+
+        if (inNode != null) {
+            String type = inNode.asText();
+            if (Arrays.stream(SecurityScheme.Type.values()).noneMatch(t -> t.toString().equals(type))){
+                // wrong type, throw exception
+                throw new JsonParseException(jp, String.format("SecurityScheme type %s not allowed", type));
+            }
+            result = new SecurityScheme()
+                    .description(getFieldText("description", node));
+
+            if ("http".equals(type)) {
+                result
+                    .type(SecurityScheme.Type.HTTP)
+                    .scheme(getFieldText("scheme", node))
+                    .bearerFormat(getFieldText("bearerFormat", node));
+            } else if ("apiKey".equals(type)) {
+                result
+                    .type(SecurityScheme.Type.APIKEY)
+                    .name(getFieldText("name", node))
+                    .in(getIn(getFieldText("in", node)));
+            } else if ("openIdConnect".equals(type)) {
+                result
+                    .type(SecurityScheme.Type.OPENIDCONNECT)
+                    .openIdConnectUrl(getFieldText("openIdConnectUrl", node));
+            } else if ("oauth2".equals(type)) {
+                result
+                    .type(SecurityScheme.Type.OAUTH2)
+                    .flows(Json.mapper().convertValue(node.get("flows"), OAuthFlows.class));
+            }
+        }
+
+        return result;
+    }
+
+    private SecurityScheme.In getIn(String value) {
+        return Arrays.stream(SecurityScheme.In.values()).filter(i -> i.toString().equals(value)).findFirst().orElse(null);
+    }
+
+    private String getFieldText(String fieldName, JsonNode node) {
+        JsonNode inNode = node.get(fieldName);
+        if (inNode != null) {
+            return inNode.asText();
+        }
+        return null;
+    }
+}