You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2020/03/30 18:59:03 UTC
[wicket] branch master updated: WICKET-6747 removed obsolete
handler parameter
This is an automated email from the ASF dual-hosted git repository.
svenmeier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new 7724a8b WICKET-6747 removed obsolete handler parameter
7724a8b is described below
commit 7724a8b3cbc70528081af63c3f5e4b5ae02c007a
Author: Sven Meier <sv...@apache.org>
AuthorDate: Mon Mar 30 20:11:48 2020 +0200
WICKET-6747 removed obsolete handler parameter
---
.../src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java | 6 +-----
.../main/java/org/apache/wicket/csp/CSPRequestCycleListener.java | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/wicket-core/src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java b/wicket-core/src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java
index bbecfc3..8823ca7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/CSPHeaderConfiguration.java
@@ -38,7 +38,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
/**
@@ -319,12 +318,9 @@ public class CSPHeaderConfiguration
* The {@link ContentSecurityPolicySettings} that renders the header.
* @param cycle
* The current {@link RequestCycle}.
- * @param currentHandler
- * The handler that is currently being evaluated or executed.
* @return the rendered header.
*/
- public String renderHeaderValue(ContentSecurityPolicySettings settings, RequestCycle cycle,
- IRequestHandler currentHandler)
+ public String renderHeaderValue(ContentSecurityPolicySettings settings, RequestCycle cycle)
{
return directives.entrySet()
.stream()
diff --git a/wicket-core/src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java b/wicket-core/src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java
index a8a353c..ba92fd1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java
+++ b/wicket-core/src/main/java/org/apache/wicket/csp/CSPRequestCycleListener.java
@@ -56,7 +56,7 @@ public class CSPRequestCycleListener implements IRequestCycleListener
.forEach(entry -> {
CSPHeaderMode mode = entry.getKey();
CSPHeaderConfiguration config = entry.getValue();
- String headerValue = config.renderHeaderValue(settings, cycle, handler);
+ String headerValue = config.renderHeaderValue(settings, cycle);
webResponse.setHeader(mode.getHeader(), headerValue);
if (config.isAddLegacyHeaders())
{