You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2020/02/25 04:10:07 UTC
[sling-org-apache-sling-app-cms] 05/05: Fixing deprecated methods
by adding commons text
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit e5838485b5089b5c28c25f85764d2ed2a54baed0
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Feb 24 23:09:49 2020 -0500
Fixing deprecated methods by adding commons text
---
builder/src/main/provisioning/boot.txt | 1 +
pom.xml | 6 ++++++
reference/pom.xml | 4 ++++
.../sling/cms/reference/forms/impl/actions/SendEmailAction.java | 4 ++--
.../sling/cms/reference/forms/impl/fields/TextfieldHandler.java | 2 +-
5 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/builder/src/main/provisioning/boot.txt b/builder/src/main/provisioning/boot.txt
index 4659de7..2ad0e77 100644
--- a/builder/src/main/provisioning/boot.txt
+++ b/builder/src/main/provisioning/boot.txt
@@ -62,4 +62,5 @@
# dependency with javax.inject - required for Sling Models (SLING-4710)
org.apache.geronimo.specs/geronimo-atinject_1.0_spec/1.1
org.apache.commons/commons-lang3/3.9
+ org.apache.commons/commons-text/1.8
diff --git a/pom.xml b/pom.xml
index 5a7d37e..534370b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,6 +214,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ <version>1.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
diff --git a/reference/pom.xml b/reference/pom.xml
index b7fd085..d1bc851 100644
--- a/reference/pom.xml
+++ b/reference/pom.xml
@@ -95,6 +95,10 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-text</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
</dependency>
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/SendEmailAction.java b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/SendEmailAction.java
index 7dc42c2..b0ebb4c 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/SendEmailAction.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/SendEmailAction.java
@@ -19,7 +19,7 @@ package org.apache.sling.cms.reference.forms.impl.actions;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.lang3.text.StrSubstitutor;
+import org.apache.commons.text.StringSubstitutor;
import org.apache.commons.mail.DefaultAuthenticator;
import org.apache.commons.mail.Email;
import org.apache.commons.mail.EmailException;
@@ -66,7 +66,7 @@ public class SendEmailAction implements JobConsumer, FormAction {
@Override
public FormActionResult handleForm(Resource actionResource, FormRequest request) throws FormException {
- StrSubstitutor sub = new StrSubstitutor(request.getFormData());
+ StringSubstitutor sub = new StringSubstitutor(request.getFormData());
ValueMap properties = actionResource.getValueMap();
String to = sub.replace(properties.get(TO, String.class));
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/fields/TextfieldHandler.java b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/fields/TextfieldHandler.java
index 2f58dd8..c80628f 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/fields/TextfieldHandler.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/fields/TextfieldHandler.java
@@ -117,7 +117,7 @@ public class TextfieldHandler implements FieldHandler {
throw new FormException("Field " + FieldHandler.getName(fieldResource) + " is not a valid " + type);
}
- if ("number".equals(type) && !NumberUtils.isNumber(value)) {
+ if ("number".equals(type) && !NumberUtils.isCreatable(value)) {
throw new FormException("Field " + FieldHandler.getName(fieldResource) + " is not a number");
}
}