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 2021/01/15 21:49:00 UTC
[sling-org-apache-sling-app-cms] branch forms-enhancements updated:
Enhancing test coverage
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch forms-enhancements
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/forms-enhancements by this push:
new f6e20b4 Enhancing test coverage
f6e20b4 is described below
commit f6e20b41040bda22e33eb6311b14f1d4623f31f2
Author: Dan Klco <dk...@apache.org>
AuthorDate: Fri Jan 15 16:48:44 2021 -0500
Enhancing test coverage
---
.../cms/reference/forms/impl/actions/CreateUserAction.java | 10 ++++++----
.../cms/reference/forms/impl/actions/ResetPasswordAction.java | 1 -
.../cms/reference/forms/impl/actions/UpdateProfileAction.java | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/CreateUserAction.java b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/CreateUserAction.java
index 83cfc4d..914f7a0 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/CreateUserAction.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/CreateUserAction.java
@@ -64,6 +64,8 @@ public class CreateUserAction implements FormAction {
public static final String DEFAULT_RESOURCE_TYPE = "reference/components/forms/actions/createuser";
public static final String PROFILE_PROPERTIES = "profileProperties";
public static final String GROUPS = "groups";
+ public static final String PN_USERNAME = "username";
+ public static final String PN_INTERMEDIATE_PATH = "intermediatePath";
private final ResourceResolverFactory factory;
private final Config config;
@@ -80,10 +82,10 @@ public class CreateUserAction implements FormAction {
final ValueMap properties = actionResource.getValueMap();
- String username = request.getFormData().get("username", String.class);
+ String username = request.getFormData().get(PN_USERNAME, String.class);
String password = request.getFormData().get(FormConstants.PN_PASSWORD, String.class);
- String intermediatePath = properties.get("intermediatePath", String.class);
+ String intermediatePath = properties.get(PN_INTERMEDIATE_PATH, String.class);
if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
return FormActionResult.failure("Empty username / password");
@@ -95,7 +97,7 @@ public class CreateUserAction implements FormAction {
JackrabbitSession session = (JackrabbitSession) adminResolver.adaptTo(Session.class);
final UserManager userManager = session.getUserManager();
- if (userManager.getAuthorizable(new PrincipalImpl(username)) == null) {
+ if (userManager.getAuthorizable(username) == null) {
log.debug("Creating user {}", username);
User user = userManager.createUser(username, password, new PrincipalImpl(username),
@@ -104,7 +106,7 @@ public class CreateUserAction implements FormAction {
String[] groups = properties.get(GROUPS, new String[0]);
for (String g : groups) {
String groupName = sub.replace(g);
- Authorizable group = userManager.getAuthorizable(new PrincipalImpl(groupName));
+ Authorizable group = userManager.getAuthorizable(groupName);
if (group == null || !group.isGroup()) {
log.error("Could not find group {}", groupName);
return FormActionResult.failure("Could not find group: " + groupName);
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/ResetPasswordAction.java b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/ResetPasswordAction.java
index da70b34..8edbfc8 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/ResetPasswordAction.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/ResetPasswordAction.java
@@ -18,7 +18,6 @@ package org.apache.sling.cms.reference.forms.impl.actions;
import java.util.Calendar;
import java.util.Collections;
-import java.util.stream.Stream;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
diff --git a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/UpdateProfileAction.java b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/UpdateProfileAction.java
index 9374cb8..58ffa08 100644
--- a/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/UpdateProfileAction.java
+++ b/reference/src/main/java/org/apache/sling/cms/reference/forms/impl/actions/UpdateProfileAction.java
@@ -94,7 +94,7 @@ public class UpdateProfileAction implements FormAction {
} else if (e.getValue() instanceof Double) {
value = valueFactory.createValue((Double) e.getValue());
} else if (e.getValue() instanceof Integer) {
- value = valueFactory.createValue((Double) e.getValue());
+ value = valueFactory.createValue((Integer) e.getValue());
} else {
value = valueFactory.createValue((String) e.getValue());
}