Skip to content

Update to Velocity Engine 2.3 #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BlairStewart wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to Velocity Engine 2.3 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6db72ab
Update to Velocity 2.0, where context keys are always String.
BlairStewart Mar 23, 2023
44af021
Update to Velocity 2.3
BlairStewart Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions spark-template-velocity/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spark.version>2.5.5</spark.version>
<junit.version>4.12</junit.version>
<spark.version>2.9.4</spark.version>
<junit.version>4.13.2</junit.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.7</version>
<artifactId>velocity-engine-core</artifactId>
<version>2.3</version>
</dependency>
<dependency>
<groupId>com.sparkjava</groupId>
Expand Down
3 changes: 2 additions & 1 deletion spark-template-velocity/src/main/java/spark/template/velocity/VelocityTemplateEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,14 @@ public VelocityTemplateEngine(VelocityEngine velocityEngine) {
/**
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
@Override
public String render(ModelAndView modelAndView) {
String templateEncoding = Optional.ofNullable(this.encoding).orElse(StandardCharsets.UTF_8.name());
Template template = velocityEngine.getTemplate(modelAndView.getViewName(), templateEncoding);
Object model = modelAndView.getModel();
if (model instanceof Map) {
Map<?, ?> modelMap = (Map<?, ?>) model;
Map<String, Object> modelMap = (Map<String, Object>) model;
VelocityContext context = new VelocityContext(modelMap);
StringWriter writer = new StringWriter();
template.merge(context, writer);
Expand Down