This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3-gae in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 3f7f2d91d571f42b9a0571ccb0e38f9689ba8195 Author: ddekany <[email protected]> AuthorDate: Sun Jan 12 10:31:39 2020 +0100 (Minor API cleanup) --- src/main/java/freemarker/ext/beans/BlacklistMemberAccessPolicy.java | 2 +- .../java/freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.java | 2 +- src/main/java/freemarker/ext/beans/WhitelistMemberAccessPolicy.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/freemarker/ext/beans/BlacklistMemberAccessPolicy.java b/src/main/java/freemarker/ext/beans/BlacklistMemberAccessPolicy.java index f81890c..69d0410 100644 --- a/src/main/java/freemarker/ext/beans/BlacklistMemberAccessPolicy.java +++ b/src/main/java/freemarker/ext/beans/BlacklistMemberAccessPolicy.java @@ -43,7 +43,7 @@ public class BlacklistMemberAccessPolicy extends MemberSelectorListMemberAccessP * List of member selectors; see {@link MemberSelectorListMemberAccessPolicy} class-level documentation for * more. */ - public BlacklistMemberAccessPolicy(Collection<MemberSelector> memberSelectors) { + public BlacklistMemberAccessPolicy(Collection<? extends MemberSelector> memberSelectors) { super(memberSelectors, ListType.BLACKLIST, null); } diff --git a/src/main/java/freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.java b/src/main/java/freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.java index 93c2788..e0af091 100644 --- a/src/main/java/freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.java +++ b/src/main/java/freemarker/ext/beans/MemberSelectorListMemberAccessPolicy.java @@ -359,7 +359,7 @@ public abstract class MemberSelectorListMemberAccessPolicy implements MemberAcce * @param matchAnnotation */ MemberSelectorListMemberAccessPolicy( - Collection<MemberSelector> memberSelectors, ListType listType, + Collection<? extends MemberSelector> memberSelectors, ListType listType, Class<? extends Annotation> matchAnnotation) { this.listType = listType; this.matchAnnotation = matchAnnotation; diff --git a/src/main/java/freemarker/ext/beans/WhitelistMemberAccessPolicy.java b/src/main/java/freemarker/ext/beans/WhitelistMemberAccessPolicy.java index 9c33884..f024d37 100644 --- a/src/main/java/freemarker/ext/beans/WhitelistMemberAccessPolicy.java +++ b/src/main/java/freemarker/ext/beans/WhitelistMemberAccessPolicy.java @@ -47,7 +47,7 @@ public class WhitelistMemberAccessPolicy extends MemberSelectorListMemberAccessP * List of member selectors; see {@link MemberSelectorListMemberAccessPolicy} class-level documentation for * more. */ - public WhitelistMemberAccessPolicy(Collection<MemberSelector> memberSelectors) { + public WhitelistMemberAccessPolicy(Collection<? extends MemberSelector> memberSelectors) { super(memberSelectors, ListType.WHITELIST, TemplateAccessible.class); }
