You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2021/05/28 16:35:14 UTC
[sling-org-apache-sling-jcr-jackrabbit-usermanager] branch master
updated: SLING-10040 resolve code quality warnings and issues reported by
sonar
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 a91073b SLING-10040 resolve code quality warnings and issues reported by sonar
a91073b is described below
commit a91073b8f36cbc5bcf3bf4d6d1be822229f166a0
Author: Eric Norman <en...@apache.org>
AuthorDate: Fri May 28 09:35:04 2021 -0700
SLING-10040 resolve code quality warnings and issues reported by sonar
---
.../impl/post/AbstractAuthorizablePostServlet.java | 4 ++--
.../usermanager/impl/post/AbstractPostServlet.java | 2 +-
.../usermanager/impl/post/ChangeUserPasswordServlet.java | 4 ++--
.../usermanager/impl/post/CreateGroupServlet.java | 2 +-
.../jackrabbit/usermanager/impl/post/CreateUserServlet.java | 4 ++--
.../usermanager/impl/post/DeleteAuthorizableServlet.java | 2 +-
.../usermanager/impl/post/UpdateGroupServlet.java | 2 +-
.../usermanager/impl/resource/AuthorizableValueMap.java | 2 ++
.../apache/sling/jcr/jackrabbit/usermanager/it/Retry.java | 4 ++--
.../jackrabbit/usermanager/it/UserManagerTestSupport.java | 2 +-
.../usermanager/it/post/ChangeUserPasswordIT.java | 6 +++---
.../it/resource/AuthorizableResourceProviderIT.java | 13 +++++++------
12 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
index cd0f428..9d1b7c9 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractAuthorizablePostServlet.java
@@ -56,9 +56,9 @@ public abstract class AbstractAuthorizablePostServlet extends
private static final Logger LOG = LoggerFactory.getLogger(AbstractAuthorizablePostServlet.class);
- private DateParser dateParser;
+ private transient DateParser dateParser;
- protected SystemUserManagerPaths systemUserManagerPaths;
+ protected transient SystemUserManagerPaths systemUserManagerPaths;
protected void bindSystemUserManagerPaths(SystemUserManagerPaths sump) {
this.systemUserManagerPaths = sump;
diff --git a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractPostServlet.java b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractPostServlet.java
index 796f536..33ad48c 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractPostServlet.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/AbstractPostServlet.java
@@ -65,7 +65,7 @@ public abstract class AbstractPostServlet extends
private final List<PostResponseCreatorHolder> postResponseCreators = new ArrayList<>();
/** Cached array of post response creators used during request processing. */
- private PostResponseCreator[] cachedPostResponseCreators = new PostResponseCreator[0];
+ private transient PostResponseCreator[] cachedPostResponseCreators = new PostResponseCreator[0];
/*
* (non-Javadoc)
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 2b48e0d..1eb123e 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
@@ -149,13 +149,13 @@ public class ChangeUserPasswordServlet extends AbstractAuthorizablePostServlet i
* The JCR Repository we access to resolve resources
*/
@Reference
- private SlingRepository repository;
+ private transient SlingRepository repository;
/**
* SLING-10014 - To require a service user before becoming active
*/
@Reference
- private ServiceUserMapped serviceUserMapped;
+ private transient ServiceUserMapped serviceUserMapped;
/**
* Activates this component.
diff --git a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
index 942d82e..71ec9d4 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
@@ -104,7 +104,7 @@ public class CreateGroupServlet extends AbstractGroupPostServlet implements Crea
private static final long serialVersionUID = -1084915263933901466L;
@Reference
- private ResourceResolverFactory resourceResolverFactory;
+ private transient ResourceResolverFactory resourceResolverFactory;
@Override
@Activate
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 e103c8f..89262c9 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
@@ -132,13 +132,13 @@ public class CreateUserServlet extends AbstractAuthorizablePostServlet implement
* The JCR Repository we access to resolve resources
*/
@Reference
- private SlingRepository repository;
+ private transient SlingRepository repository;
/**
* SLING-10014 - To require a service user before becoming active
*/
@Reference
- private ServiceUserMapped serviceUserMapped;
+ private transient ServiceUserMapped serviceUserMapped;
private String usersPath;
diff --git a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
index ee34115..baf390c 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/DeleteAuthorizableServlet.java
@@ -96,7 +96,7 @@ public class DeleteAuthorizableServlet extends AbstractPostServlet
private static final long serialVersionUID = 5874621724096106496L;
@Reference
- private SystemUserManagerPaths systemUserManagerPaths;
+ private transient SystemUserManagerPaths systemUserManagerPaths;
/**
* Overridden since the @Reference annotation is not inherited from the super method
diff --git a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
index 478159b..7a13409 100644
--- a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
+++ b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/UpdateGroupServlet.java
@@ -107,7 +107,7 @@ public class UpdateGroupServlet extends AbstractGroupPostServlet
private static final long serialVersionUID = -8292054361992488797L;
@Reference
- private ResourceResolverFactory resourceResolverFactory;
+ private transient ResourceResolverFactory resourceResolverFactory;
@Override
@Activate
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 4736e4d..541b600 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
@@ -75,6 +75,7 @@ public class AuthorizableValueMap implements ValueMap {
this.systemUserManagerPaths = systemUserManagerPaths;
}
+ @Override
@SuppressWarnings("unchecked")
public <T> T get(String name, Class<T> type) {
if (type == null) {
@@ -84,6 +85,7 @@ public class AuthorizableValueMap implements ValueMap {
return convertToType(name, type);
}
+ @Override
@SuppressWarnings("unchecked")
public <T> T get(String name, T defaultValue) {
if (defaultValue == null) {
diff --git a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/Retry.java b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/Retry.java
index 4c3de9e..54b498a 100644
--- a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/Retry.java
+++ b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/Retry.java
@@ -27,11 +27,11 @@ public abstract class Retry {
private long timeoutMsec;
private long nextIterationDelay;
- public Retry(long timeoutMsec, long nextIterationDelay) {
+ protected Retry(long timeoutMsec, long nextIterationDelay) {
this(timeoutMsec, nextIterationDelay, true);
}
- public Retry(long timeoutMsec, long nextIterationDelay, boolean autorun) {
+ protected Retry(long timeoutMsec, long nextIterationDelay, boolean autorun) {
this.timeoutMsec = timeoutMsec;
this.nextIterationDelay = nextIterationDelay;
if (autorun) {
diff --git a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java
index 93f987b..2740dfa 100644
--- a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java
+++ b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/UserManagerTestSupport.java
@@ -139,7 +139,7 @@ public abstract class UserManagerTestSupport extends TestSupport {
}
protected Dictionary<String, Object> replaceConfigProp(Dictionary<String, Object> originalProps, String newPropKey, Object newPropValue) {
- Hashtable<String, Object> newProps = new Hashtable<>();
+ Hashtable<String, Object> newProps = new Hashtable<>(); // NOSONAR
if (originalProps != null) {
Enumeration<String> keys = originalProps.keys();
while (keys.hasMoreElements()) {
diff --git a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java
index 44efdc2..15ce17c 100644
--- a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java
+++ b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/post/ChangeUserPasswordIT.java
@@ -174,7 +174,7 @@ public class ChangeUserPasswordIT extends UserManagerTestSupport {
* SLING-9808 test changing password when user doesn't have rep:userManagement privilege
*/
@Test
- public void changePasswordAsSelfGranted() throws IOException, InterruptedException, RepositoryException {
+ public void changePasswordAsSelfGranted() throws IOException, RepositoryException {
org.osgi.service.cm.Configuration configuration = configAdmin.getConfiguration("org.apache.sling.jackrabbit.usermanager.impl.post.ChangeUserPasswordServlet", null);
Dictionary<String, Object> originalServiceProps = configuration.getProperties();
ServiceReference<ChangeUserPassword> serviceReference = null;
@@ -223,7 +223,7 @@ public class ChangeUserPasswordIT extends UserManagerTestSupport {
* SLING-9808 test changing password when user doesn't have rep:userManagement privilege
*/
@Test
- public void changePasswordAsSelfDenied() throws IOException, InterruptedException, RepositoryException {
+ public void changePasswordAsSelfDenied() throws IOException, RepositoryException {
org.osgi.service.cm.Configuration configuration = configAdmin.getConfiguration("org.apache.sling.jackrabbit.usermanager.impl.post.ChangeUserPasswordServlet", null);
Dictionary<String, Object> originalServiceProps = configuration.getProperties();
ServiceReference<ChangeUserPassword> serviceReference = null;
@@ -276,7 +276,7 @@ public class ChangeUserPasswordIT extends UserManagerTestSupport {
* test changing your own password without sending the old password is not allowed
*/
@Test
- public void changePasswordAsSelfWithoutOldPasswordFails() throws IOException, InterruptedException, RepositoryException {
+ public void changePasswordAsSelfWithoutOldPasswordFails() throws IOException, RepositoryException {
org.osgi.service.cm.Configuration configuration = configAdmin.getConfiguration("org.apache.sling.jackrabbit.usermanager.impl.post.ChangeUserPasswordServlet", null);
Dictionary<String, Object> originalServiceProps = configuration.getProperties();
ServiceReference<ChangeUserPassword> serviceReference = null;
diff --git a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/resource/AuthorizableResourceProviderIT.java b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/resource/AuthorizableResourceProviderIT.java
index 38e7e17..39c23b9 100644
--- a/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/resource/AuthorizableResourceProviderIT.java
+++ b/src/test/java/org/apache/sling/jcr/jackrabbit/usermanager/it/resource/AuthorizableResourceProviderIT.java
@@ -72,6 +72,7 @@ import org.slf4j.LoggerFactory;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class AuthorizableResourceProviderIT extends UserManagerTestSupport {
+ private static final String PEOPLE_ROOT = "/people";
private static AtomicLong counter = new AtomicLong(0);
private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -169,25 +170,25 @@ public class AuthorizableResourceProviderIT extends UserManagerTestSupport {
* Test changing the usermanager provider.root value
*/
@Test
- public void changeProviderRoot() throws LoginException, RepositoryException, IOException, InterruptedException {
+ public void changeProviderRoot() throws LoginException, RepositoryException, IOException {
// the userManager resource should be mounted under /system/userManager
- checkResourceTypes("/system/userManager", "/people");
+ checkResourceTypes("/system/userManager", PEOPLE_ROOT);
org.osgi.service.cm.Configuration configuration = configAdmin.getConfiguration("org.apache.sling.jackrabbit.usermanager.impl.resource.AuthorizableResourceProvider", null);
Dictionary<String, Object> originalServiceProps = configuration.getProperties();
ServiceReference<SystemUserManagerPaths> serviceReference = null;
try {
// update the service configuration to ensure the option is enabled
- Dictionary<String, Object> newServiceProps = replaceConfigProp(originalServiceProps, "provider.root", "/people");
+ Dictionary<String, Object> newServiceProps = replaceConfigProp(originalServiceProps, "provider.root", PEOPLE_ROOT);
configuration.update(newServiceProps);
new WaitForServiceUpdated(5000, 100, bundleContext, SystemUserManagerPaths.class,
- "provider.root", "/people");
+ "provider.root", PEOPLE_ROOT);
serviceReference = bundleContext.getServiceReference(SystemUserManagerPaths.class);
- assertEquals("/people", serviceReference.getProperty("provider.root"));
+ assertEquals(PEOPLE_ROOT, serviceReference.getProperty("provider.root"));
// now the userManager resource should be mounted under /people
- checkResourceTypes("/people", "/system/userManager");
+ checkResourceTypes(PEOPLE_ROOT, "/system/userManager");
} finally {
if (serviceReference != null) {
// done with this.