This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager.git
The following commit(s) were added to refs/heads/master by this push:
new d3fb002 SLING-10014 Use ServiceUserMapped to ensure presence of
service user mapping
d3fb002 is described below
commit d3fb002ff40092940dfde21e0745fd9c15f65564
Author: Eric Norman <[email protected]>
AuthorDate: Sat Dec 19 12:45:44 2020 -0800
SLING-10014 Use ServiceUserMapped to ensure presence of service user
mapping
---
pom.xml | 6 ++++++
.../usermanager/impl/post/ChangeUserPasswordServlet.java | 7 +++++++
.../jackrabbit/usermanager/impl/post/CreateUserServlet.java | 7 +++++++
.../usermanager/impl/resource/AuthorizableValueMap.java | 12 ++++++------
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4ba3bdc..d59f1a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.serviceusermapper</artifactId>
+ <version>1.3.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jackrabbit-api</artifactId>
<version>1.18.0</version>
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
index f723a66..88d6508 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/ChangeUserPasswordServlet.java
@@ -38,6 +38,7 @@ import
org.apache.sling.jackrabbit.usermanager.ChangeUserPassword;
import org.apache.sling.jackrabbit.usermanager.resource.SystemUserManagerPaths;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.base.util.AccessControlUtil;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
import org.apache.sling.servlets.post.Modification;
import org.apache.sling.servlets.post.PostResponse;
import org.apache.sling.servlets.post.PostResponseCreator;
@@ -150,6 +151,12 @@ public class ChangeUserPasswordServlet extends
AbstractAuthorizablePostServlet i
private SlingRepository repository;
/**
+ * SLING-10014 - To require a service user before becoming active
+ */
+ @Reference
+ private ServiceUserMapped serviceUserMapped;
+
+ /**
* Activates this component.
*
* @param props The component properties
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
index 63b316d..b8636af 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
@@ -38,6 +38,7 @@ import org.apache.sling.jackrabbit.usermanager.CreateUser;
import org.apache.sling.jackrabbit.usermanager.resource.SystemUserManagerPaths;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.base.util.AccessControlUtil;
+import org.apache.sling.serviceusermapping.ServiceUserMapped;
import org.apache.sling.servlets.post.Modification;
import org.apache.sling.servlets.post.ModificationType;
import org.apache.sling.servlets.post.PostResponse;
@@ -136,6 +137,12 @@ public class CreateUserServlet extends
AbstractAuthorizablePostServlet implement
@Reference
private SlingRepository repository;
+ /**
+ * SLING-10014 - To require a service user before becoming active
+ */
+ @Reference
+ private ServiceUserMapped serviceUserMapped;
+
private String usersPath;
@Reference(cardinality=ReferenceCardinality.OPTIONAL, policy =
ReferencePolicy.DYNAMIC)
diff --git
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.java
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.java
index 5eef744..9cbf5f6 100644
---
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.java
+++
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableValueMap.java
@@ -355,17 +355,17 @@ public class AuthorizableValueMap implements ValueMap {
if (String.class == type) {
return (T) jcrValue.getString();
} else if (Byte.class == type) {
- return (T) new Byte((byte) jcrValue.getLong());
+ return (T) Byte.valueOf((byte) jcrValue.getLong());
} else if (Short.class == type) {
- return (T) new Short((short) jcrValue.getLong());
+ return (T) Short.valueOf((short) jcrValue.getLong());
} else if (Integer.class == type) {
- return (T) new Integer((int) jcrValue.getLong());
+ return (T) Integer.valueOf((int) jcrValue.getLong());
} else if (Long.class == type) {
- return (T) new Long(jcrValue.getLong());
+ return (T) Long.valueOf(jcrValue.getLong());
} else if (Float.class == type) {
- return (T) new Float(jcrValue.getDouble());
+ return (T) Float.valueOf((float)jcrValue.getDouble());
} else if (Double.class == type) {
- return (T) new Double(jcrValue.getDouble());
+ return (T) Double.valueOf(jcrValue.getDouble());
} else if (Boolean.class == type) {
return (T) Boolean.valueOf(jcrValue.getBoolean());
} else if (Date.class == type) {
