freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [5/5] incubator-freemarker git commit: FREEMARKER-55: Merged: Stringifying string/boolean/date model in url function otherwise throw exception. Some code cleanup.
Date Tue, 19 Sep 2017 06:03:58 GMT
FREEMARKER-55: Merged: Stringifying string/boolean/date model in url function otherwise throw
exception. Some code cleanup.

Merge commit 'refs/pull/36/head' of https://github.com/apache/incubator-freemarker into 3


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/f5a44238
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f5a44238
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f5a44238

Branch: refs/heads/3
Commit: f5a44238e002be0be5b9e86b3f7c27214f657a01
Parents: 12a2d49 b0f27aa
Author: ddekany <ddekany@apache.org>
Authored: Tue Sep 19 08:01:12 2017 +0200
Committer: ddekany <ddekany@apache.org>
Committed: Tue Sep 19 08:03:36 2017 +0200

----------------------------------------------------------------------
 .../AbstractSpringTemplateCallableModel.java    |  6 +-
 .../freemarker/spring/model/EvalFunction.java   |  2 -
 .../spring/model/MessageFunction.java           |  8 +--
 .../freemarker/spring/model/UrlFunction.java    | 64 +++++++++++---------
 .../spring/example/mvc/users/User.java          |  6 +-
 .../example/mvc/users/UserController.java       |  4 +-
 .../example/mvc/users/UserRepository.java       | 16 ++---
 .../spring/model/BindDirectiveTest.java         |  2 +-
 .../spring/model/EvalFunctionTest.java          |  2 +-
 .../spring/model/MessageFunctionTest.java       |  4 +-
 .../spring/model/NestedPathDirectiveTest.java   |  2 +-
 .../spring/model/ThemeFunctionTest.java         |  2 +-
 .../spring/model/UrlFunctionTest.java           | 49 +++++++++++----
 .../test/model/url-function-basic-usages.ftl    | 29 +++++++++
 14 files changed, 127 insertions(+), 69 deletions(-)
----------------------------------------------------------------------



Mime
View raw message