You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2018/09/03 10:05:21 UTC
[sling-whiteboard] branch master updated: minor code improvements
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new 66c1f19 minor code improvements
66c1f19 is described below
commit 66c1f19874aab6733e6f4f942a2ecccc37207eb2
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Sep 3 12:05:06 2018 +0200
minor code improvements
---
.../resolver/internal/BundledScriptTracker.java | 29 ++++++++--------------
.../scripting/resolver/internal/LogWriter.java | 6 ++---
.../resolver/internal/ScriptContextProvider.java | 2 --
3 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java b/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java
index 7d711d7..496a004 100644
--- a/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java
+++ b/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java
@@ -77,13 +77,13 @@ import aQute.bnd.annotation.headers.ProvideCapability;
version = "1.0.0")
public class BundledScriptTracker implements BundleTrackerCustomizer<List<ServiceRegistration<Servlet>>> {
static final String NS_SLING_SCRIPTING_EXTENDER = "sling.scripting";
- static final String NS_SLING_RESOURCE_TYPE = "sling.resourceType";
+
+ private static final String NS_SLING_RESOURCE_TYPE = "sling.resourceType";
private static final Logger LOGGER = LoggerFactory.getLogger(BundledScriptTracker.class);
private static final String AT_SLING_SELECTORS = "sling.resourceType.selectors";
private static final String AT_SLING_EXTENSIONS = "sling.resourceType.extensions";
private static final String REGISTERING_BUNDLE = "org.apache.sling.scripting.resolver.internal.BundledScriptTracker.registering_bundle";
-
- static final String AT_VERSION = "version";
+ private static final String AT_VERSION = "version";
private static final String AT_EXTENDS = "extends";
@Reference
@@ -352,21 +352,14 @@ public class BundledScriptTracker implements BundleTrackerCustomizer<List<Servic
.filter(reg ->
{
Hashtable<String, Object> props = toProperties(reg);
- if (getResourceType(props).equals(m_rt)) {
- if (
- Arrays.asList(PropertiesUtil.toStringArray(props.get(ServletResolverConstants.SLING_SERVLET_METHODS),
- new String[]{"GET", "HEAD"}))
- .contains(slingRequest.getMethod())
- &&
- Arrays.asList(PropertiesUtil
- .toStringArray(props.get(ServletResolverConstants.SLING_SERVLET_EXTENSIONS),
- new String[]{"html"}))
- .contains(slingRequest.getRequestPathInfo().getExtension() == null ? "html" :
- slingRequest.getRequestPathInfo().getExtension())) {
- return true;
- }
- }
- return false;
+ return getResourceType(props).equals(m_rt) &&
+ Arrays.asList(PropertiesUtil
+ .toStringArray(props.get(ServletResolverConstants.SLING_SERVLET_METHODS), new String[]{"GET", "HEAD"}))
+ .contains(slingRequest.getMethod()) &&
+ Arrays.asList(PropertiesUtil
+ .toStringArray(props.get(ServletResolverConstants.SLING_SERVLET_EXTENSIONS), new String[]{"html"}))
+ .contains(slingRequest.getRequestPathInfo().getExtension() == null ? "html" :
+ slingRequest.getRequestPathInfo().getExtension());
})
.sorted((left, right) ->
{
diff --git a/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/LogWriter.java b/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/LogWriter.java
index 15ab5fe..a168d04 100644
--- a/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/LogWriter.java
+++ b/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/LogWriter.java
@@ -27,20 +27,20 @@ class LogWriter extends Writer {
/**
* The logger to which the error messages are written
*/
- private Logger logger;
+ final private Logger logger;
/**
* The internal buffer to gather message data until being flushed or a CR or
* LF is encountered in the message data.
*/
- private StringBuilder lineBuffer;
+ final private StringBuilder lineBuffer;
/**
* Creates a writer based on the given logger.
*
* @param logger the logger
*/
- public LogWriter(Logger logger) {
+ LogWriter(Logger logger) {
this.logger = logger;
this.lineBuffer = new StringBuilder();
}
diff --git a/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/ScriptContextProvider.java b/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/ScriptContextProvider.java
index 4715599..0a183e2 100644
--- a/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/ScriptContextProvider.java
+++ b/scripting-resolver/org-apache-sling-scripting-resolver/src/main/java/org/apache/sling/scripting/resolver/internal/ScriptContextProvider.java
@@ -53,8 +53,6 @@ import org.slf4j.LoggerFactory;
)
public class ScriptContextProvider {
- private static final Logger LOGGER = LoggerFactory.getLogger(ScriptContextProvider.class);
-
private BundleContext m_bundleContext;
private static final Set<String> PROTECTED_BINDINGS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(