SLING-10270 - fix incorrect 'disable reason' value
diff --git a/pom.xml b/pom.xml
index f871746..e2645ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -219,7 +219,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.repoinit.parser</artifactId>
- <version>1.6.6</version>
+ <version>1.6.7-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java b/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java
index 01ac01f..c11f1d2 100644
--- a/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java
+++ b/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java
@@ -152,8 +152,8 @@
@Override
public void visitDisableServiceUser(DisableServiceUser dsu) {
final String username = dsu.getUsername();
- final String reason = dsu.getParametersDescription();
- log.info("Disabling service user {} reason {}", new String[] { username, reason });
+ final String reason = dsu.getReason();
+ log.info("Disabling service user {} reason {}", username, reason );
try {
if (!UserUtil.disableUser(session, username, reason)) {
log.debug("Service user {} doesn't exist - assuming disable to be a noop.", username);
diff --git a/src/test/java/org/apache/sling/jcr/repoinit/CreateServiceUsersTest.java b/src/test/java/org/apache/sling/jcr/repoinit/CreateServiceUsersTest.java
index c02b458..6b32f4c 100644
--- a/src/test/java/org/apache/sling/jcr/repoinit/CreateServiceUsersTest.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/CreateServiceUsersTest.java
@@ -43,6 +43,7 @@
public final SlingContext context = new SlingContext(ResourceResolverType.JCR_OAK);
private static final Random random = new Random(42);
+
private String namePrefix;
private String userId;
private TestUtil U;
@@ -77,9 +78,11 @@
U.parseAndExecute("create service user " + userId);
U.assertServiceUser("after creating user", userId, true);
U.assertEnabledUser("after creating user", userId);
- U.parseAndExecute("disable service user " + userId + " : \"Test\"");
+
+ final String disabledReason = "disabled-" + random.nextInt();
+ U.parseAndExecute("disable service user " + userId + " : \"" + disabledReason + "\"");
U.assertServiceUser("after disable user", userId, true);
- U.assertDisabledUser("after disable user", userId);
+ U.assertDisabledUser("after disable user", userId, disabledReason);
}
@Test
diff --git a/src/test/java/org/apache/sling/jcr/repoinit/impl/TestUtil.java b/src/test/java/org/apache/sling/jcr/repoinit/impl/TestUtil.java
index 306c877..25b7ed8 100644
--- a/src/test/java/org/apache/sling/jcr/repoinit/impl/TestUtil.java
+++ b/src/test/java/org/apache/sling/jcr/repoinit/impl/TestUtil.java
@@ -141,9 +141,11 @@
assertFalse(info + ", expecting Principal to not be disabled: " + id, ((User) a).isDisabled());
}
- public void assertDisabledUser(String info, String id) throws RepositoryException {
+ public void assertDisabledUser(String info, String id, String disabledReason) throws RepositoryException {
final Authorizable a = UserUtil.getUserManager(adminSession).getAuthorizable(id);
- assertTrue(info + ", expecting Principal to be disabled: " + id, ((User) a).isDisabled());
+ final User user = (User)a;
+ assertTrue(info + ", expecting Principal to be disabled: " + id, user.isDisabled());
+ assertEquals("Expecting disabledReason==" + disabledReason, disabledReason, user.getDisabledReason());
}
public void assertNodeExists(String path) throws RepositoryException {
