This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.xss-2.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-xss.git
commit 50c61c3f1a7b970fe40b866d0fb5d21791fe20a9 Author: Carsten Ziegeler <[email protected]> AuthorDate: Wed Apr 26 07:57:30 2017 +0000 Cosmetics: remove unnecessary null assignment, make map final, remove unnecessary static from fields git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss@1792707 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/sling/xss/impl/HtmlToHtmlContentContext.java | 5 ++++- src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java | 3 ++- src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/apache/sling/xss/impl/HtmlToHtmlContentContext.java b/src/main/java/org/apache/sling/xss/impl/HtmlToHtmlContentContext.java index a4ae93c..be8be74 100644 --- a/src/main/java/org/apache/sling/xss/impl/HtmlToHtmlContentContext.java +++ b/src/main/java/org/apache/sling/xss/impl/HtmlToHtmlContentContext.java @@ -36,11 +36,12 @@ public class HtmlToHtmlContentContext implements XSSFilterRule { /** * Logger */ - private Logger log = LoggerFactory.getLogger(this.getClass()); + private final Logger log = LoggerFactory.getLogger(this.getClass()); /** * @see XSSFilterRule#check(PolicyHandler, String) */ + @Override public boolean check(final PolicyHandler policyHandler, final String str) { try { return policyHandler.getAntiSamy().scan(str).getNumberOfErrors() == 0; @@ -54,6 +55,7 @@ public class HtmlToHtmlContentContext implements XSSFilterRule { /** * @see XSSFilterRule#filter(PolicyHandler, java.lang.String) */ + @Override public String filter(final PolicyHandler policyHandler, final String str) { try { log.debug("Protecting (HTML -> HTML) :\n{}", str); @@ -77,6 +79,7 @@ public class HtmlToHtmlContentContext implements XSSFilterRule { /** * @see XSSFilterRule#supportsPolicy() */ + @Override public boolean supportsPolicy() { return true; } diff --git a/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java b/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java index 995d4dd..59d25b7 100644 --- a/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java +++ b/src/main/java/org/apache/sling/xss/impl/XSSAPIAdapterFactory.java @@ -42,11 +42,12 @@ import org.slf4j.LoggerFactory; ) public class XSSAPIAdapterFactory implements AdapterFactory { - private static final Logger LOGGER = LoggerFactory.getLogger(XSSAPIAdapterFactory.class); + private final Logger LOGGER = LoggerFactory.getLogger(XSSAPIAdapterFactory.class); @Reference XSSAPI xssApi; + @Override public <AdapterType> AdapterType getAdapter(@Nonnull Object adaptable, @Nonnull Class<AdapterType> type) { if (adaptable instanceof ResourceResolver) { return getAdapter((ResourceResolver) adaptable, type); diff --git a/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java b/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java index c5d3b8a..c0cc39c 100644 --- a/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java +++ b/src/main/java/org/apache/sling/xss/impl/XSSFilterImpl.java @@ -59,7 +59,7 @@ import org.slf4j.LoggerFactory; ) public class XSSFilterImpl implements XSSFilter, ResourceChangeListener, ExternalResourceChangeListener { - private static final Logger LOGGER = LoggerFactory.getLogger(XSSFilterImpl.class); + private final Logger LOGGER = LoggerFactory.getLogger(XSSFilterImpl.class); // Default href configuration copied from the config.xml supplied with AntiSamy static final Attribute DEFAULT_HREF_ATTRIBUTE = new Attribute( @@ -83,10 +83,10 @@ public class XSSFilterImpl implements XSSFilter, ResourceChangeListener, Externa private final XSSFilterRule plainHtmlContext = new PlainTextToHtmlContentContext(); // policies cache - private Map<String, PolicyHandler> policies = new ConcurrentHashMap<>(); + private final Map<String, PolicyHandler> policies = new ConcurrentHashMap<>(); @Reference - private ResourceResolverFactory resourceResolverFactory = null; + private ResourceResolverFactory resourceResolverFactory; @Reference private ServiceUserMapped serviceUserMapped; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
