You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2020/01/13 08:25:33 UTC
[sling-org-apache-sling-engine] branch master updated: SLING-8993 :
Remove old deprecation warning
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-engine.git
The following commit(s) were added to refs/heads/master by this push:
new f8d2112 SLING-8993 : Remove old deprecation warning
f8d2112 is described below
commit f8d2112c601a54fec3dd7ea096fe02d27a72b92b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jan 13 09:25:21 2020 +0100
SLING-8993 : Remove old deprecation warning
---
.../apache/sling/engine/impl/SlingMainServlet.java | 23 +++++-----------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java b/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
index fb3426d..26670b2 100644
--- a/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
+++ b/src/main/java/org/apache/sling/engine/impl/SlingMainServlet.java
@@ -134,8 +134,6 @@ public class SlingMainServlet extends GenericServlet {
String servlet_name();
}
- private static final String DEPRECATED_ENCODING_PROPERTY = "sling.default.parameter.encoding";
-
@Reference(cardinality = ReferenceCardinality.OPTIONAL, policy = ReferencePolicy.DYNAMIC)
private volatile AdapterManager adapterManager;
@@ -375,11 +373,10 @@ public class SlingMainServlet extends GenericServlet {
// ---------- Property Setter for SCR --------------------------------------
@Modified
- protected void modified(final Map<String, Object> componentConfig,
- final Config config) {
+ protected void modified(final Config config) {
this.isModification.set(true);
- setup(componentConfig, config);
+ setup(config);
}
private Dictionary<String, Object> getServletContextRegistrationProps(final String servletName) {
@@ -394,7 +391,7 @@ public class SlingMainServlet extends GenericServlet {
return servletConfig;
}
- protected void setup(final Map<String, Object> componentConfig, final Config config) {
+ protected void setup(final Config config) {
final String[] props = config.sling_additional_response_headers();
if ( props != null ) {
final ArrayList<StaticResponseHeader> mappings = new ArrayList<>(props.length);
@@ -428,15 +425,6 @@ public class SlingMainServlet extends GenericServlet {
RequestData.setMaxCallCounter(config.sling_max_calls());
RequestData.setSlingMainServlet(this);
- // Warn about the obsolete parameter encoding configuration (SLING-5370)
- if (componentConfig.get(DEPRECATED_ENCODING_PROPERTY) != null) {
- log.warn("Please configure the default request parameter encoding using "
- + "the 'org.apache.sling.engine.parameters' configuration PID; the property "
- + DEPRECATED_ENCODING_PROPERTY + "="
- + componentConfig.get(DEPRECATED_ENCODING_PROPERTY)
- + " is obsolete and ignored");
- }
-
if (this.contextRegistration == null) {
// register the servlet context
final Dictionary<String, String> contextProperties = new Hashtable<>();
@@ -483,12 +471,11 @@ public class SlingMainServlet extends GenericServlet {
}
@Activate
- protected void activate(final BundleContext bundleContext, final Map<String, Object> componentConfig,
- final Config config) {
+ protected void activate(final BundleContext bundleContext, final Config config) {
this.bundleContext = bundleContext;
this.isModification.set(false);
- this.setup(componentConfig, config);
+ this.setup(config);
}
@Override