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 0170b80e3eb5fb75ae7c13da1927aa816b5e0e9c
Merge: 31544b0 e05bd9a
Author: ddekany <dd...@apache.org>
AuthorDate: Mon Jun 24 01:32:16 2019 +0200
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
.../java/freemarker/core/BoundedRangeModel.java | 2 +-
src/main/java/freemarker/core/BuiltIn.java | 17 +-
.../freemarker/core/BuiltInsForMultipleTypes.java | 57 +++-
.../java/freemarker/core/BuiltInsForSequences.java | 213 ++++++++-----
.../java/freemarker/core/ComparisonExpression.java | 16 +
src/main/java/freemarker/core/DynamicKeyName.java | 249 +++++++++++++--
src/main/java/freemarker/core/Environment.java | 2 -
src/main/java/freemarker/core/EvalUtil.java | 12 +
src/main/java/freemarker/core/Expression.java | 18 ++
src/main/java/freemarker/core/IteratorBlock.java | 10 +-
.../core/LazilyGeneratedCollectionModel.java | 80 +++++
....java => LazilyGeneratedCollectionModelEx.java} | 33 +-
...eratedCollectionModelWithAlreadyKnownSize.java} | 33 +-
...GeneratedCollectionModelWithSameSizeCollEx.java | 53 ++++
...lyGeneratedCollectionModelWithSameSizeSeq.java} | 40 +--
...lyGeneratedCollectionModelWithUnknownSize.java} | 27 +-
...va => LazyCollectionTemplateModelIterator.java} | 33 +-
...lectionModel.java => LazySequenceIterator.java} | 36 ++-
src/main/java/freemarker/core/MiscUtil.java | 7 +
.../freemarker/core/ParentheticalExpression.java | 7 +-
src/main/java/freemarker/core/RangeModel.java | 2 +-
.../freemarker/core/RightUnboundedRangeModel.java | 2 +-
.../core/SingleIterationCollectionModel.java | 6 +-
src/main/java/freemarker/core/_CoreAPI.java | 6 +-
src/main/java/freemarker/core/_MessageUtil.java | 22 +-
.../java/freemarker/ext/beans/BeansWrapper.java | 23 +-
.../freemarker/ext/beans/ClassIntrospector.java | 2 +-
.../java/freemarker/template/Configuration.java | 2 +-
.../freemarker/template/utility/ClassUtil.java | 4 +
src/main/resources/freemarker/included.html | 9 +
src/manual/en_US/book.xml | 68 ++++-
src/test/java/freemarker/core/FilterBiTest.java | 25 ++
.../core/LazilyGeneratedCollectionTest.java | 338 +++++++++++++++++++++
.../core/ListWithStreamLikeBuiltinsTest.java | 2 +-
src/test/java/freemarker/core/MapBiTest.java | 19 ++
.../beans/AbstractParallelIntrospectionTest.java | 2 +-
.../java/freemarker/ext/beans/EnumModelsTest.java | 2 +-
.../java/freemarker/ext/beans/ModelCacheTest.java | 2 +-
.../freemarker/ext/beans/StaticModelsTest.java | 2 +-
.../test/templatesuite/templates/range-lazy.ftl | 58 ++++
.../freemarker/test/templatesuite/testcases.xml | 5 +-
41 files changed, 1279 insertions(+), 267 deletions(-)