Merge branch '2.1.x'

Closes gh-18093
This commit is contained in:
Andy Wilkinson
2019-09-02 14:42:21 +01:00
3 changed files with 51 additions and 1 deletions

View File

@@ -101,7 +101,7 @@ abstract class PropertyDescriptor<S extends Element> {
protected ItemDeprecation resolveItemDeprecation(MetadataGenerationEnvironment environment) {
boolean deprecated = environment.isDeprecated(getGetter()) || environment.isDeprecated(getSetter())
|| environment.isDeprecated(getFactoryMethod());
|| environment.isDeprecated(getField()) || environment.isDeprecated(getFactoryMethod());
return deprecated ? environment.resolveItemDeprecation(getGetter()) : null;
}