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 05ebf5d0185d0e92ef94bffae6cfe420747c675b Merge: 70a7361d cd58cbef Author: ddekany <[email protected]> AuthorDate: Sat Feb 24 05:52:11 2024 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 build.gradle.kts | 2 +- .../main/java/freemarker/core/Configurable.java | 2 +- .../src/main/java/freemarker/core/Dot.java | 19 +- .../java/freemarker/core/DotBeforeMethodCall.java | 59 ++++ .../main/java/freemarker/core/DynamicKeyName.java | 16 +- .../core/DynamicKeyNameBeforeMethodCall.java | 50 +++ .../src/main/java/freemarker/core/MethodCall.java | 3 + .../main/java/freemarker/ext/beans/APIModel.java | 13 +- .../main/java/freemarker/ext/beans/BeanModel.java | 104 +++++- .../java/freemarker/ext/beans/BeansWrapper.java | 140 +++++++- .../ext/beans/BeansWrapperConfiguration.java | 36 ++ .../freemarker/ext/beans/ClassIntrospector.java | 86 ++++- .../ext/beans/ClassIntrospectorBuilder.java | 48 ++- .../ext/beans/FastPropertyDescriptor.java | 19 +- .../freemarker/ext/beans/GenericObjectModel.java | 72 ++++ .../ext/beans/MethodAppearanceFineTuner.java | 20 +- .../java/freemarker/ext/beans/StringModel.java | 15 +- .../ext/beans/ZeroArgumentNonVoidMethodPolicy.java | 65 ++++ .../main/java/freemarker/ext/beans/_BeansAPI.java | 4 +- .../template/MethodCallAwareTemplateHashModel.java | 125 +++++++ .../src/main/javacc/freemarker/core/FTL.jj | 7 + .../freemarker/template/ConfigurationTest.java | 4 +- .../beans/TestZeroArgumentNonVoidMethodPolicy.java | 370 +++++++++++++++++++++ .../template/DefaultObjectWrapperTest.java | 4 +- freemarker-manual/src/main/docgen/en_US/book.xml | 130 +++++++- .../src/main/docgen/en_US/docgen.cjson | 5 +- .../main/java/freemarker/test/TemplateTest.java | 15 +- 27 files changed, 1354 insertions(+), 79 deletions(-)
