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 bb4e76cef7e31f80baf542b30619b1e1633dbacb Merge: e664754 32afaf1 Author: ddekany <[email protected]> AuthorDate: Thu Aug 1 23:02:13 2019 +0200 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 .../IntelliJ-IDEA/Java-code-style-FreeMarker.xml | 3 + src/main/java/freemarker/core/BuiltIn.java | 6 +- .../java/freemarker/core/BuiltInsForSequences.java | 400 ++++++++++----------- src/main/java/freemarker/core/Environment.java | 1 - .../IntermediateStreamOperationLikeBuiltIn.java | 221 ++++++++++++ src/main/java/freemarker/core/LocalContext.java | 27 +- src/main/java/freemarker/core/Macro.java | 4 - src/main/java/freemarker/core/_MessageUtil.java | 6 + .../ext/jsp/_FreeMarkerPageContext2.java | 15 +- .../java/freemarker/template/Configuration.java | 12 +- .../template/TemplateExceptionHandler.java | 14 +- src/manual/en_US/book.xml | 36 +- src/test/java/freemarker/core/FilterBiTest.java | 31 ++ src/test/java/freemarker/core/MinMaxBITest.java | 10 + .../java/freemarker/core/NullTransparencyTest.java | 11 +- .../java/freemarker/core/SequenceBuiltInTest.java | 3 +- .../core/TakeWhileAndDropWhileBiTest.java | 148 ++++++++ .../freemarker/template/ConfigurationTest.java | 15 + .../template/SimpleObjectWrapperTest.java | 4 +- 19 files changed, 710 insertions(+), 257 deletions(-)
