Merge pull request #2251 from ralphdoe/bugfix/2061-model-hidden-not-working

2061-Validation-added

Author: fehguy

modules/swagger-core/src/main/java/io/swagger/jackson/SwaggerAnnotationIntrospector.java

@@ -1,5 +1,6 @@
 package io.swagger.jackson;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.AnnotationIntrospector;
 import com.fasterxml.jackson.databind.introspect.Annotated;
@@ -15,78 +16,85 @@
 import java.util.List;
 
 public class SwaggerAnnotationIntrospector extends AnnotationIntrospector {
-    private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 1L;
+	private boolean isThereAHiddenField = false;
 
-    @Override
-    public Version version() {
-        return PackageVersion.VERSION;
-    }
+	@Override
+	public Version version() {
+		return PackageVersion.VERSION;
+	}
 
-    @Override
-    public boolean hasIgnoreMarker(AnnotatedMember m) {
-        ApiModelProperty ann = m.getAnnotation(ApiModelProperty.class);
-        if (ann != null && ann.hidden()) {
-            return true;
-        }
-        return false;
-    }
+	@Override
+	public boolean hasIgnoreMarker(AnnotatedMember m) {
+		ApiModelProperty ann = m.getAnnotation(ApiModelProperty.class);
+		if (ann != null && ann.hidden()) {
+			isThereAHiddenField = true;
+			return true;
+		}
+		// Add a Ignore Marker when there's a Constructor with JsonCreator and also if there's any Hidden Field
+		JsonCreator constructor = m.getAnnotation(JsonCreator.class);
+		if (constructor != null && isThereAHiddenField) {
+			return true;
+		}
+		return false;
+	}
 
-    @Override
-    public Boolean hasRequiredMarker(AnnotatedMember m) {
-        ApiModelProperty ann = m.getAnnotation(ApiModelProperty.class);
-        if (ann != null) {
-            return ann.required();
-        }
-        XmlElement elem = m.getAnnotation(XmlElement.class);
-        if (elem != null) {
-            if (elem.required()) {
-                return true;
-            }
-        }
-        return null;
-    }
+	@Override
+	public Boolean hasRequiredMarker(AnnotatedMember m) {
+		ApiModelProperty ann = m.getAnnotation(ApiModelProperty.class);
+		if (ann != null) {
+			return ann.required();
+		}
+		XmlElement elem = m.getAnnotation(XmlElement.class);
+		if (elem != null) {
+			if (elem.required()) {
+				return true;
+			}
+		}
+		return null;
+	}
 
-    @Override
-    public String findPropertyDescription(Annotated a) {
-        ApiModel model = a.getAnnotation(ApiModel.class);
-        if (model != null && !"".equals(model.description())) {
-            return model.description();
-        }
-        ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class);
-        if (prop != null) {
-            return prop.value();
-        }
-        return null;
-    }
+	@Override
+	public String findPropertyDescription(Annotated a) {
+		ApiModel model = a.getAnnotation(ApiModel.class);
+		if (model != null && !"".equals(model.description())) {
+			return model.description();
+		}
+		ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class);
+		if (prop != null) {
+			return prop.value();
+		}
+		return null;
+	}
 
-    @Override
-    public Integer findPropertyIndex(Annotated a) {
-        ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class);
-        if (prop != null && prop.position() != 0) {
-            return prop.position();
-        }
-        return null;
-    }
+	@Override
+	public Integer findPropertyIndex(Annotated a) {
+		ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class);
+		if (prop != null && prop.position() != 0) {
+			return prop.position();
+		}
+		return null;
+	}
 
-    @Override
-    public List<NamedType> findSubtypes(Annotated a) {
-        final ApiModel api = a.getAnnotation(ApiModel.class);
-        if (api != null) {
-            final Class<?>[] classes = api.subTypes();
-            final List<NamedType> names = new ArrayList<NamedType>(classes.length);
-            for (Class<?> subType : classes) {
-                names.add(new NamedType(subType));
-            }
-            if (!names.isEmpty()) {
-                return names;
-            }
-        }
+	@Override
+	public List<NamedType> findSubtypes(Annotated a) {
+		final ApiModel api = a.getAnnotation(ApiModel.class);
+		if (api != null) {
+			final Class<?>[] classes = api.subTypes();
+			final List<NamedType> names = new ArrayList<NamedType>(classes.length);
+			for (Class<?> subType : classes) {
+				names.add(new NamedType(subType));
+			}
+			if (!names.isEmpty()) {
+				return names;
+			}
+		}
 
-        return Collections.emptyList();
-    }
+		return Collections.emptyList();
+	}
 
-    @Override
-    public String findTypeName(AnnotatedClass ac) {
-        return null;
-    }
+	@Override
+	public String findTypeName(AnnotatedClass ac) {
+		return null;
+	}
 }