You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2019/04/12 07:09:33 UTC
[wicket] branch master updated: WICKET-6653 Upgrade Velocity to 2.x
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new d6a0103 WICKET-6653 Upgrade Velocity to 2.x
d6a0103 is described below
commit d6a010346d0a121d82ff85b009eb0377dcc16fd8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Fri Apr 12 10:09:07 2019 +0300
WICKET-6653 Upgrade Velocity to 2.x
---
pom.xml | 10 ++--------
.../java/org/apache/wicket/examples/guestbook/GuestBook.java | 6 +++---
wicket-velocity/pom.xml | 6 +-----
.../java/org/apache/wicket/velocity/VelocityContributor.java | 4 ++--
.../apache/wicket/velocity/VelocityJavaScriptContributor.java | 4 ++--
.../apache/wicket/contrib/velocity/VelocityJavaScriptPage.java | 7 +++----
6 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/pom.xml b/pom.xml
index edacd27..0b02854 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,7 +155,7 @@
<metrics.version>4.0.5</metrics.version>
<weld.version>3.1.0.Final</weld.version>
<forbiddenapis.version>2.6</forbiddenapis.version>
- <velocity.version>1.7</velocity.version>
+ <velocity.version>2.1</velocity.version>
<automatic-module-name>MUST-BE-OVERRIDDEN-BY-MODULES</automatic-module-name>
</properties>
@@ -279,14 +279,8 @@
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
index a83342b..f78aa91 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/guestbook/GuestBook.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
import org.apache.wicket.examples.WicketExamplePage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.basic.MultiLineLabel;
@@ -56,7 +55,7 @@ public final class GuestBook extends WicketExamplePage
add(new CommentForm("commentForm"));
// Add commentListView of existing comments
- add(new PropertyListView<Comment>("comments", commentList)
+ add(new PropertyListView<>("comments", commentList)
{
@Override
public void populateItem(final ListItem<Comment> listItem)
@@ -104,7 +103,8 @@ public final class GuestBook extends WicketExamplePage
ValueMap values = getModelObject();
// check if the honey pot is filled
- if (StringUtils.isNotBlank((String)values.get("comment")))
+ final String _comment = (String) values.get("comment");
+ if (_comment != null && !_comment.isBlank())
{
error("Caught a spammer!!!");
return;
diff --git a/wicket-velocity/pom.xml b/wicket-velocity/pom.xml
index 7224c72..bfe1949 100644
--- a/wicket-velocity/pom.xml
+++ b/wicket-velocity/pom.xml
@@ -38,12 +38,8 @@
<dependencies>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
+ <artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
index c78aa34..64bf10c 100644
--- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
+++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
@@ -42,7 +42,7 @@ public class VelocityContributor extends Behavior
private String encoding = "ISO-8859-1";
- private final IModel<? extends Map<?, ?>> model;
+ private final IModel<? extends Map<String, Object>> model;
private final String templateName;
@@ -56,7 +56,7 @@ public class VelocityContributor extends Behavior
* @param templateName
* @param model
*/
- public VelocityContributor(final String templateName, final IModel<? extends Map<?, ?>> model)
+ public VelocityContributor(final String templateName, final IModel<? extends Map<String, Object>> model)
{
Args.notNull(model, "model");
diff --git a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
index 62687ed..86d3b6d 100644
--- a/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
+++ b/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavaScriptContributor.java
@@ -45,7 +45,7 @@ public class VelocityJavaScriptContributor extends VelocityContributor
* @param id
*/
public VelocityJavaScriptContributor(final Class<?> clazz, final String templatePath,
- final IModel<? extends Map<?, ?>> model, final String id)
+ final IModel<? extends Map<String, Object>> model, final String id)
{
super(Packages.absolutePath(clazz, templatePath), model);
this.id = id;
@@ -60,7 +60,7 @@ public class VelocityJavaScriptContributor extends VelocityContributor
* @param id
*/
public VelocityJavaScriptContributor(final String templatePath,
- final IModel<? extends Map<?, ?>> model, final String id)
+ final IModel<? extends Map<String, Object>> model, final String id)
{
super(templatePath, model);
this.id = id;
diff --git a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
index 7c4fc57..0b7dbd6 100644
--- a/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
+++ b/wicket-velocity/src/test/java/org/apache/wicket/contrib/velocity/VelocityJavaScriptPage.java
@@ -18,7 +18,6 @@ package org.apache.wicket.contrib.velocity;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
import org.apache.wicket.util.collections.MiniMap;
import org.apache.wicket.util.lang.Packages;
import org.apache.wicket.core.util.string.JavaScriptUtils;
@@ -43,14 +42,14 @@ public class VelocityJavaScriptPage extends WebPage
String javascript = "msg1: Stoopid test 1\nmsg2: Stooopid test 2";
JavaScriptUtils.writeJavaScript(getResponse(), javascript, id);
- IModel<MiniMap<String, String>> model = new Model<MiniMap<String, String>>()
+ IModel<MiniMap<String, Object>> model = new IModel<>()
{
private static final long serialVersionUID = 1L;
@Override
- public MiniMap<String, String> getObject()
+ public MiniMap<String, Object> getObject()
{
- MiniMap<String, String> map = new MiniMap<>(2);
+ MiniMap<String, Object> map = new MiniMap<>(2);
map.put("msg1", MSG1);
map.put("msg2", "Stooopid test 2");
return map;