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 d1aee1e5b19b03f652a99210f33ffccff7d86ce8 Merge: f3629d9 b991ed8 Author: ddekany <[email protected]> AuthorDate: Tue Jan 21 15:19:00 2020 +0100 Merge remote-tracking branch 'origin/2.3-gae' into 2.3 # Conflicts: # src/main/java/freemarker/core/FreeMarkerTree.java .../freemarker/cache/ByteArrayTemplateLoader.java | 6 +- .../java/freemarker/cache/FileTemplateLoader.java | 10 +++- .../java/freemarker/cache/MruCacheStorage.java | 5 ++ .../java/freemarker/cache/MultiTemplateLoader.java | 7 ++- .../java/freemarker/cache/NullCacheStorage.java | 6 ++ .../java/freemarker/cache/SoftCacheStorage.java | 10 +++- .../freemarker/cache/StringTemplateLoader.java | 6 +- .../java/freemarker/cache/StrongCacheStorage.java | 6 ++ src/main/java/freemarker/cache/TemplateCache.java | 20 ++----- .../java/freemarker/cache/URLTemplateLoader.java | 4 ++ .../freemarker/cache/WebappTemplateLoader.java | 4 ++ .../java/freemarker/core/AddConcatExpression.java | 11 +++- .../java/freemarker/core/ArithmeticEngine.java | 16 +++--- src/main/java/freemarker/core/BodyInstruction.java | 2 + .../java/freemarker/core/BoundedRangeModel.java | 1 + src/main/java/freemarker/core/BuiltIn.java | 4 +- .../java/freemarker/core/BuiltInsForCallables.java | 13 ++++- .../java/freemarker/core/BuiltInsForDates.java | 1 + .../core/BuiltInsForExistenceHandling.java | 2 + .../freemarker/core/BuiltInsForLoopVariables.java | 1 + .../freemarker/core/BuiltInsForMultipleTypes.java | 17 ++++++ .../java/freemarker/core/BuiltInsForNodes.java | 1 + .../java/freemarker/core/BuiltInsForNumbers.java | 16 +++--- .../java/freemarker/core/BuiltInsForSequences.java | 36 ++++++++++-- .../freemarker/core/BuiltInsForStringsBasic.java | 28 ++++++++++ .../core/BuiltInsForStringsEncoding.java | 4 ++ .../freemarker/core/BuiltInsForStringsMisc.java | 2 + .../freemarker/core/BuiltInsForStringsRegexp.java | 13 +++++ .../core/BuiltInsWithLazyConditionals.java | 6 +- src/main/java/freemarker/core/BuiltinVariable.java | 2 + .../freemarker/core/CollectionAndSequence.java | 5 +- .../core/CommonTemplateMarkupOutputModel.java | 1 + src/main/java/freemarker/core/Configurable.java | 10 ++-- .../java/freemarker/core/DefaultToExpression.java | 22 +++++--- src/main/java/freemarker/core/Dot.java | 2 +- src/main/java/freemarker/core/DynamicKeyName.java | 4 +- src/main/java/freemarker/core/Environment.java | 30 ++++++---- src/main/java/freemarker/core/EvalUtil.java | 4 +- src/main/java/freemarker/core/Expression.java | 4 +- .../freemarker/core/ExpressionWithFixedResult.java | 8 +++ .../core/ExtendedDecimalFormatParser.java | 15 ++++- .../freemarker/core/GetOptionalTemplateMethod.java | 7 ++- src/main/java/freemarker/core/HashLiteral.java | 18 ++++-- .../IntermediateStreamOperationLikeBuiltIn.java | 8 +++ src/main/java/freemarker/core/Interpret.java | 1 + src/main/java/freemarker/core/IteratorBlock.java | 2 + .../core/JavaTemplateDateFormatFactory.java | 2 +- .../core/JavaTemplateNumberFormatFactory.java | 2 +- ...neratedCollectionModelWithAlreadyKnownSize.java | 2 + ...GeneratedCollectionModelWithSameSizeCollEx.java | 2 + ...ilyGeneratedCollectionModelWithSameSizeSeq.java | 2 + .../core/LazyCollectionTemplateModelIterator.java | 2 + .../java/freemarker/core/LazySequenceIterator.java | 2 + .../core/LegacyConstructorParserConfiguration.java | 11 ++++ src/main/java/freemarker/core/ListLiteral.java | 8 +-- .../core/ListableRightUnboundedRangeModel.java | 4 ++ .../freemarker/core/LocalLambdaExpression.java | 1 + src/main/java/freemarker/core/Macro.java | 4 +- src/main/java/freemarker/core/MiscUtil.java | 1 + src/main/java/freemarker/core/NewBI.java | 1 + .../core/NonListableRightUnboundedRangeModel.java | 1 + src/main/java/freemarker/core/NumberLiteral.java | 1 + .../core/OptInTemplateClassResolver.java | 1 + src/main/java/freemarker/core/ParseException.java | 2 +- src/main/java/freemarker/core/Range.java | 4 +- src/main/java/freemarker/core/RangeModel.java | 1 + .../java/freemarker/core/SequenceIterator.java | 2 + .../core/SingleIterationCollectionModel.java | 1 + .../java/freemarker/core/StringArraySequence.java | 2 + src/main/java/freemarker/core/StringLiteral.java | 1 + .../freemarker/core/TemplateClassResolver.java | 3 + .../freemarker/core/TemplateConfiguration.java | 12 +++- .../freemarker/core/UnexpectedTypeException.java | 2 +- src/main/java/freemarker/core/UnifiedCall.java | 6 +- .../java/freemarker/core/_ArrayEnumeration.java | 2 + src/main/java/freemarker/core/_ArrayIterator.java | 3 + src/main/java/freemarker/core/_Java8Impl.java | 1 + src/main/java/freemarker/core/_MessageUtil.java | 8 +-- .../_ParserConfigurationWithInheritedFormat.java | 11 ++++ .../freemarker/core/_UnmodifiableCompositeSet.java | 3 + src/main/java/freemarker/debug/Breakpoint.java | 1 + src/main/java/freemarker/debug/DebuggerClient.java | 20 ++++--- .../java/freemarker/debug/impl/DebuggerServer.java | 2 + .../freemarker/debug/impl/DebuggerService.java | 4 +- .../freemarker/debug/impl/RmiDebugModelImpl.java | 13 +++++ .../debug/impl/RmiDebuggedEnvironmentImpl.java | 10 ++++ .../freemarker/debug/impl/RmiDebuggerImpl.java | 9 +++ .../debug/impl/RmiDebuggerListenerImpl.java | 4 +- .../java/freemarker/ext/ant/FreemarkerXmlTask.java | 6 +- .../ext/ant/UnlinkedJythonOperationsImpl.java | 2 + .../java/freemarker/ext/beans/ArgumentTypes.java | 4 +- src/main/java/freemarker/ext/beans/ArrayModel.java | 7 +++ src/main/java/freemarker/ext/beans/BeanModel.java | 13 ++++- .../java/freemarker/ext/beans/BeansModelCache.java | 6 +- .../java/freemarker/ext/beans/BeansWrapper.java | 14 ++++- .../freemarker/ext/beans/BeansWrapperBuilder.java | 6 +- .../java/freemarker/ext/beans/BooleanModel.java | 1 + .../ext/beans/ClassBasedModelFactory.java | 6 +- .../freemarker/ext/beans/ClassIntrospector.java | 36 ++++++------ .../ext/beans/ClassIntrospectorBuilder.java | 6 +- .../freemarker/ext/beans/CollectionAdapter.java | 4 ++ .../java/freemarker/ext/beans/CollectionModel.java | 3 + src/main/java/freemarker/ext/beans/DateModel.java | 3 + .../ext/beans/DefaultMemberAccessPolicy.java | 27 ++++----- .../freemarker/ext/beans/EnumerationModel.java | 3 + .../java/freemarker/ext/beans/HashAdapter.java | 7 +++ .../java/freemarker/ext/beans/IteratorModel.java | 3 + .../ext/beans/JRebelClassChangeNotifier.java | 2 + .../ext/beans/LegacyDefaultMemberAccessPolicy.java | 12 ++-- src/main/java/freemarker/ext/beans/MapModel.java | 2 + .../java/freemarker/ext/beans/MemberMatcher.java | 4 +- .../MemberSelectorListMemberAccessPolicy.java | 6 +- .../java/freemarker/ext/beans/NumberModel.java | 2 + .../freemarker/ext/beans/OverloadedMethods.java | 4 +- .../ext/beans/OverloadedMethodsModel.java | 3 + .../freemarker/ext/beans/OverloadedNumberUtil.java | 1 + .../freemarker/ext/beans/ResourceBundleModel.java | 2 + .../java/freemarker/ext/beans/SequenceAdapter.java | 1 + .../java/freemarker/ext/beans/SimpleMapModel.java | 11 ++++ .../freemarker/ext/beans/SimpleMethodModel.java | 4 ++ .../java/freemarker/ext/beans/StaticModel.java | 7 ++- .../java/freemarker/ext/beans/StringModel.java | 1 + src/main/java/freemarker/ext/beans/_BeansAPI.java | 8 +-- .../java/freemarker/ext/beans/_MethodUtil.java | 2 +- .../freemarker/ext/dom/AttributeNodeModel.java | 3 + .../freemarker/ext/dom/CharacterDataNodeModel.java | 3 + .../java/freemarker/ext/dom/DocumentModel.java | 2 + .../java/freemarker/ext/dom/DocumentTypeModel.java | 4 +- src/main/java/freemarker/ext/dom/ElementModel.java | 3 + .../java/freemarker/ext/dom/JaxenXPathSupport.java | 4 ++ .../java/freemarker/ext/dom/NodeListModel.java | 6 +- src/main/java/freemarker/ext/dom/NodeModel.java | 16 +++++- .../java/freemarker/ext/dom/NodeOutputter.java | 2 +- src/main/java/freemarker/ext/dom/PINodeModel.java | 3 + .../ext/dom/SunInternalXalanXPathSupport.java | 5 ++ .../java/freemarker/ext/dom/XalanXPathSupport.java | 5 ++ .../java/freemarker/ext/jdom/NodeListModel.java | 30 ++++++++++ .../ext/jsp/CustomTagAndELFunctionCombiner.java | 14 +++++ .../java/freemarker/ext/jsp/EventForwarding.java | 10 ++++ .../ext/jsp/FreeMarkerJspApplicationContext.java | 3 + .../freemarker/ext/jsp/FreeMarkerJspFactory2.java | 1 + .../freemarker/ext/jsp/FreeMarkerPageContext.java | 2 + .../java/freemarker/ext/jsp/FreemarkerTag.java | 13 ++++- .../java/freemarker/ext/jsp/JspContextModel.java | 2 + .../java/freemarker/ext/jsp/JspTagModelBase.java | 2 +- .../ext/jsp/SimpleTagDirectiveModel.java | 4 +- .../java/freemarker/ext/jsp/TagTransformModel.java | 4 ++ .../java/freemarker/ext/jsp/TaglibFactory.java | 64 +++++++++++----------- .../ext/jsp/_FreeMarkerPageContext2.java | 4 ++ .../ext/jsp/_FreeMarkerPageContext21.java | 2 + .../freemarker/ext/jython/JythonHashModel.java | 4 ++ .../java/freemarker/ext/jython/JythonModel.java | 8 +++ .../freemarker/ext/jython/JythonNumberModel.java | 2 + .../freemarker/ext/jython/JythonSequenceModel.java | 6 ++ .../ext/jython/JythonVersionAdapterHolder.java | 6 +- .../java/freemarker/ext/jython/JythonWrapper.java | 11 ++-- .../ext/jython/_Jython20And21VersionAdapter.java | 3 + .../ext/jython/_Jython22VersionAdapter.java | 3 + .../freemarker/ext/rhino/RhinoFunctionModel.java | 1 + .../freemarker/ext/rhino/RhinoScriptableModel.java | 11 ++++ .../java/freemarker/ext/rhino/RhinoWrapper.java | 1 + .../freemarker/ext/servlet/FreemarkerServlet.java | 7 ++- .../ext/servlet/HttpRequestHashModel.java | 5 ++ .../servlet/HttpRequestParametersHashModel.java | 8 +++ .../ext/servlet/HttpSessionHashModel.java | 2 + .../java/freemarker/ext/servlet/IncludePage.java | 5 +- .../ext/servlet/ServletContextHashModel.java | 2 + .../java/freemarker/ext/util/IdentityHashMap.java | 9 +++ src/main/java/freemarker/ext/util/ModelCache.java | 6 +- src/main/java/freemarker/ext/xml/Namespaces.java | 1 + src/main/java/freemarker/ext/xml/Navigator.java | 16 ++++++ .../java/freemarker/ext/xml/NodeListModel.java | 12 ++++ .../java/freemarker/ext/xml/_Dom4jNavigator.java | 1 + .../java/freemarker/ext/xml/_DomNavigator.java | 1 + .../java/freemarker/ext/xml/_JdomNavigator.java | 1 + .../log/CommonsLoggingLoggerFactory.java | 1 + src/main/java/freemarker/log/Logger.java | 1 + .../java/freemarker/log/SLF4JLoggerFactory.java | 1 + .../java/freemarker/log/_AvalonLoggerFactory.java | 1 + .../java/freemarker/log/_JULLoggerFactory.java | 1 + .../java/freemarker/log/_Log4jLoggerFactory.java | 1 + .../java/freemarker/log/_NullLoggerFactory.java | 1 + .../java/freemarker/template/Configuration.java | 20 +++++-- .../freemarker/template/DefaultArrayAdapter.java | 31 +++++++++++ .../template/DefaultEnumerationAdapter.java | 6 ++ .../template/DefaultIterableAdapter.java | 4 ++ .../template/DefaultIteratorAdapter.java | 6 ++ .../freemarker/template/DefaultListAdapter.java | 6 ++ .../freemarker/template/DefaultMapAdapter.java | 9 +++ .../template/DefaultNonListCollectionAdapter.java | 8 ++- .../freemarker/template/DefaultObjectWrapper.java | 12 ++-- .../template/DefaultObjectWrapperBuilder.java | 6 +- src/main/java/freemarker/template/EmptyMap.java | 12 ++++ .../template/FalseTemplateBooleanModel.java | 1 + .../freemarker/template/GeneralPurposeNothing.java | 10 ++++ .../IteratorToTemplateModelIteratorAdapter.java | 2 + .../java/freemarker/template/LocalizedString.java | 3 +- .../template/LoggingAttemptExceptionReporter.java | 1 + .../template/MapKeyValuePairIterator.java | 4 ++ .../java/freemarker/template/SimpleCollection.java | 3 + src/main/java/freemarker/template/SimpleDate.java | 2 + src/main/java/freemarker/template/SimpleHash.java | 6 ++ .../java/freemarker/template/SimpleNumber.java | 1 + .../java/freemarker/template/SimpleScalar.java | 1 + .../java/freemarker/template/SimpleSequence.java | 2 + src/main/java/freemarker/template/Template.java | 2 +- .../freemarker/template/TemplateException.java | 16 ++++-- .../template/TemplateExceptionHandler.java | 4 ++ .../freemarker/template/TemplateMethodModelEx.java | 1 + .../template/TemplateModelException.java | 6 +- .../template/TemplateModelListSequence.java | 2 + .../template/TrueTemplateBooleanModel.java | 1 + .../freemarker/template/utility/CaptureOutput.java | 1 + .../freemarker/template/utility/ClassUtil.java | 2 +- .../freemarker/template/utility/Constants.java | 13 +++++ .../freemarker/template/utility/DOMNodeModel.java | 6 ++ .../java/freemarker/template/utility/DateUtil.java | 2 + .../freemarker/template/utility/DeepUnwrap.java | 2 +- .../java/freemarker/template/utility/Execute.java | 20 +++---- .../freemarker/template/utility/HtmlEscape.java | 1 + .../freemarker/template/utility/JythonRuntime.java | 1 + .../template/utility/NormalizeNewlines.java | 1 + .../freemarker/template/utility/NumberUtil.java | 12 ++-- .../template/utility/ObjectConstructor.java | 1 + .../template/utility/SecurityUtilities.java | 3 + .../template/utility/StandardCompress.java | 1 + .../template/utility/TemplateModelUtils.java | 13 ++++- .../freemarker/template/utility/ToCanonical.java | 5 +- .../freemarker/template/utility/XmlEscape.java | 1 + src/test/java/freemarker/core/ASTPrinter.java | 12 +--- .../java/freemarker/core/AttemptLoggingTest.java | 4 +- src/test/java/freemarker/core/CamelCaseTest.java | 6 +- .../java/freemarker/core/ConfigurableTest.java | 8 +-- .../freemarker/core/DirectiveCallPlaceTest.java | 2 +- .../core/LazilyGeneratedCollectionTest.java | 2 +- .../java/freemarker/core/NullTransparencyTest.java | 6 +- .../core/PrintfGTemplateNumberFormatFactory.java | 2 +- .../freemarker/core/TemplateConfigurationTest.java | 22 +++----- .../java/freemarker/core/WithArgsBuiltInTest.java | 12 ++-- .../ext/beans/BeansWrapperSingletonsTest.java | 6 +- ...DefaultObjectWrapperMemberAccessPolicyTest.java | 2 +- .../ext/beans/Java7MembersOnlyBeansWrapper.java | 2 +- .../ext/jsp/RealServletContainertTest.java | 2 +- .../ext/jsp/taglibmembers/TestFunctions.java | 2 +- .../freemarker/manual/CustomFormatsExample.java | 8 +-- src/test/java/freemarker/manual/ExamplesTest.java | 5 +- .../freemarker/template/ConfigurationTest.java | 16 +++--- .../freemarker/template/CustomAttributeTest.java | 2 +- .../template/DefaultObjectWrapperTest.java | 16 +++--- .../template/utility/DeepUnwrapTest.java | 2 +- .../template/utility/TemplateModelUtilTest.java | 12 ++-- .../CopyrightCommentRemoverTemplateLoader.java | 5 +- .../freemarker/test/MonitoredTemplateLoader.java | 2 +- .../java/freemarker/test/ResourcesExtractor.java | 15 +---- src/test/java/freemarker/test/TemplateTest.java | 2 +- .../freemarker/test/servlet/WebAppTestCase.java | 14 ++--- .../test/templatesuite/TemplateTestCase.java | 26 ++++----- .../test/templatesuite/TemplateTestSuite.java | 10 ++-- .../test/templatesuite/models/Listables.java | 14 ++--- .../templatesuite/models/OverloadedMethods2.java | 6 +- .../java/freemarker/test/utility/FileTestCase.java | 5 +- 261 files changed, 1238 insertions(+), 439 deletions(-)
