This is an automated email from the ASF dual-hosted git repository. ddekany pushed a commit to branch 2.3 in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 23760a40e0096cfaddca0d5a634cd03286c3b1a0 Merge: aee8eb4 889d411 Author: ddekany <[email protected]> AuthorDate: Wed Jan 1 20:18:32 2020 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 src/main/java/freemarker/core/BuiltIn.java | 9 +- .../java/freemarker/core/BuiltInsForCallables.java | 81 ++- src/main/java/freemarker/core/Environment.java | 165 ++++-- src/main/java/freemarker/core/Macro.java | 25 +- src/main/java/freemarker/ext/beans/BeanModel.java | 2 +- .../java/freemarker/ext/beans/BeansModelCache.java | 6 +- .../java/freemarker/ext/beans/BeansWrapper.java | 37 +- .../ext/beans/BeansWrapperConfiguration.java | 10 +- .../freemarker/ext/beans/ClassIntrospector.java | 217 ++++---- .../ext/beans/ClassIntrospectorBuilder.java | 80 ++- .../ext/beans/ClassMemberAccessPolicy.java | 38 ++ .../freemarker/ext/beans/ConstructorMatcher.java | 34 ++ ...Methods.java => DefaultMemberAccessPolicy.java} | 75 ++- .../ext/beans/ExecutableMemberSignature.java | 69 +++ .../java/freemarker/ext/beans/FieldMatcher.java | 34 ++ .../freemarker/ext/beans/MemberAccessPolicy.java | 63 +++ .../java/freemarker/ext/beans/MemberMatcher.java | 111 ++++ .../java/freemarker/ext/beans/MethodMatcher.java | 38 ++ .../java/freemarker/ext/beans/StaticModel.java | 4 +- .../freemarker/ext/beans/TemplateAccessible.java | 45 ++ .../ext/beans/WhitelistMemberAccessPolicy.java | 411 +++++++++++++++ .../java/freemarker/ext/beans/_MethodUtil.java | 141 ++++++ .../java/freemarker/ext/jsp/FreemarkerTag.java | 4 + .../java/freemarker/ext/jsp/JspContextModel.java | 4 + .../java/freemarker/template/Configuration.java | 5 +- .../freemarker/template/DefaultObjectWrapper.java | 10 +- .../java/freemarker/template/_TemplateAPI.java | 1 + .../freemarker/template/utility/ClassUtil.java | 37 +- src/manual/en_US/book.xml | 245 ++++++++- .../java/freemarker/core/WithArgsBuiltInTest.java | 147 +++++- ...DefaultObjectWrapperMemberAccessPolicyTest.java | 516 +++++++++++++++++++ .../freemarker/ext/beans/MethodMatcherTest.java | 179 +++++++ .../java/freemarker/ext/beans/MethodUtilTest.java | 156 ++++++ .../ext/beans/WhitelistMemberAccessPolicyTest.java | 558 +++++++++++++++++++++ .../freemarker/manual/WithArgsLastExamples.java | 35 ++ .../template/DefaultObjectWrapperTest.java | 35 ++ ...thArgsExamples-usingWithArgsSpecialVariable.ftl | 18 + ...gsExamples-usingWithArgsSpecialVariable.ftl.out | 18 + .../freemarker/manual/WithArgsLastExamples.ftl | 43 ++ .../freemarker/manual/WithArgsLastExamples.ftl.out | 49 ++ 40 files changed, 3491 insertions(+), 264 deletions(-)
