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:46:14 UTC
[sling-org-apache-sling-jcr-jackrabbit-accessmanager] branch master
updated: SLING-10038 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-accessmanager.git
The following commit(s) were added to refs/heads/master by this push:
new 6c53b7d SLING-10038 resolve code quality warnings and issues reported by sonar
6c53b7d is described below
commit 6c53b7d9530ceaf1b0a2f3f9a8bf35811bbbfa51
Author: Eric Norman <en...@apache.org>
AuthorDate: Fri May 28 09:46:06 2021 -0700
SLING-10038 resolve code quality warnings and issues reported by sonar
---
.../accessmanager/post/AbstractAccessPostServlet.java | 2 +-
.../accessmanager/post/AbstractGetAclServlet.java | 15 ++++-----------
.../jackrabbit/accessmanager/post/ModifyAceServlet.java | 2 +-
.../accessmanager/impl/PrivilegesHelperTest.java | 2 +-
4 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractAccessPostServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractAccessPostServlet.java
index 1cb0120..1c67077 100644
--- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractAccessPostServlet.java
+++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractAccessPostServlet.java
@@ -67,7 +67,7 @@ public abstract class AbstractAccessPostServlet extends SlingAllMethodsServlet {
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/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java
index 3959885..70aa524 100644
--- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java
+++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/AbstractGetAclServlet.java
@@ -51,8 +51,6 @@ import org.apache.sling.api.resource.ResourceNotFoundException;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
import org.apache.sling.jcr.base.util.AccessControlUtil;
import org.apache.sling.jcr.jackrabbit.accessmanager.impl.PrivilegesHelper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
@SuppressWarnings("serial")
public abstract class AbstractGetAclServlet extends SlingAllMethodsServlet {
@@ -61,11 +59,6 @@ public abstract class AbstractGetAclServlet extends SlingAllMethodsServlet {
protected static final String KEY_DENIED = "denied";
protected static final String KEY_GRANTED = "granted";
- /**
- * default log
- */
- private final transient Logger log = LoggerFactory.getLogger(getClass());
-
/* (non-Javadoc)
* @see org.apache.sling.api.servlets.SlingSafeMethodsServlet#doGet(org.apache.sling.api.SlingHttpServletRequest, org.apache.sling.api.SlingHttpServletResponse)
*/
@@ -102,10 +95,10 @@ public abstract class AbstractGetAclServlet extends SlingAllMethodsServlet {
response.sendError(HttpServletResponse.SC_NOT_FOUND);
} catch (ResourceNotFoundException rnfe) {
response.sendError(HttpServletResponse.SC_NOT_FOUND, rnfe.getMessage());
- } catch (Throwable throwable) {
- log.debug(String.format("Exception while handling GET %s with %s",
- request.getResource().getPath(), getClass().getName()), throwable);
- throw new ServletException(throwable);
+ } catch (Exception throwable) {
+ throw new ServletException(String.format("Exception while handling GET %s with %s",
+ request.getResource().getPath(), getClass().getName()),
+ throwable);
}
}
diff --git a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
index 93d995e..56d32c9 100644
--- a/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
+++ b/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
@@ -105,7 +105,7 @@ property= {
public class ModifyAceServlet extends AbstractAccessPostServlet implements ModifyAce {
private static final long serialVersionUID = -9182485466670280437L;
- private RestrictionProvider restrictionProvider = null;
+ private transient RestrictionProvider restrictionProvider = null;
// NOTE: the @Reference annotation is not inherited, so subclasses will need to override the #bindRestrictionProvider
// and #unbindRestrictionProvider methods to provide the @Reference annotation.
diff --git a/src/test/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelperTest.java b/src/test/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelperTest.java
index 46dee20..4c91ff9 100644
--- a/src/test/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelperTest.java
+++ b/src/test/java/org/apache/sling/jcr/jackrabbit/accessmanager/impl/PrivilegesHelperTest.java
@@ -20,7 +20,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.hasItems;
import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.HashSet;