Repository: struts Updated Branches: refs/heads/master c53c6d8c8 -> 24085bdc5
Adds some logginf to allowed methods Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/24085bdc Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/24085bdc Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/24085bdc Branch: refs/heads/master Commit: 24085bdc5a15094b3752d3926f75882ee2a87b54 Parents: c53c6d8 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Fri Feb 5 09:36:21 2016 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Fri Feb 5 09:36:21 2016 +0100 ---------------------------------------------------------------------- .../xwork2/config/entities/ActionConfig.java | 1 + .../xwork2/config/entities/AllowedMethods.java | 27 ++++++++++++++++++++ .../providers/XmlConfigurationProvider.java | 8 +++--- .../config/entities/ActionConfigTest.java | 4 +-- 4 files changed, 33 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/24085bdc/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java index a821c93..e12a86b 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/entities/ActionConfig.java @@ -199,6 +199,7 @@ public class ActionConfig extends Located implements Serializable { } sb.append(")"); sb.append(" - ").append(location); + sb.append(" - ").append(allowedMethods); sb.append("}"); return sb.toString(); } http://git-wip-us.apache.org/repos/asf/struts/blob/24085bdc/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java index 976117d..22fea12 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/entities/AllowedMethods.java @@ -1,5 +1,23 @@ +/* + * Copyright 2002-2006,2009 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.opensymphony.xwork2.config.entities; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -7,6 +25,8 @@ import java.util.regex.Pattern; public class AllowedMethods { + private static final Logger LOG = LogManager.getLogger(AllowedMethods.class); + private Set<AllowedMethod> allowedMethods; public static AllowedMethods build(Set<String> methods) { @@ -40,6 +60,8 @@ public class AllowedMethods { } } + LOG.debug("Defined allowed methods: {}", allowedMethods); + return new AllowedMethods(allowedMethods); } @@ -85,6 +107,11 @@ public class AllowedMethods { String original(); } + @Override + public String toString() { + return "allowedMethods=" + allowedMethods; + } + private static class PatternAllowedMethod implements AllowedMethod { private final Pattern allowedMethodPattern; http://git-wip-us.apache.org/repos/asf/struts/blob/24085bdc/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java index 1ea9c3e..1779764 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java @@ -469,11 +469,9 @@ public class XmlConfigurationProvider implements ConfigurationProvider { .build(); packageContext.addActionConfig(name, actionConfig); - if (LOG.isDebugEnabled()) { - LOG.debug("Loaded {}{} in '{}' package: {}", - StringUtils.isNotEmpty(packageContext.getNamespace()) ? (packageContext.getNamespace() + "/") : "", - name, packageContext.getName(), actionConfig); - } + LOG.debug("Loaded {}{} in '{}' package: {}", + StringUtils.isNotEmpty(packageContext.getNamespace()) ? (packageContext.getNamespace() + "/") : "", + name, packageContext.getName(), actionConfig); } protected boolean verifyAction(String className, String name, Location loc) { http://git-wip-us.apache.org/repos/asf/struts/blob/24085bdc/core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java b/core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java index d22bd74..0f8315a 100644 --- a/core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/config/entities/ActionConfigTest.java @@ -30,7 +30,7 @@ public class ActionConfigTest extends XWorkTestCase { .build(); assertTrue("Wrong toString(): "+cfg.toString(), - "{ActionConfig bob (foo.Bar.execute()) - foo/xwork.xml:10:12}".equals(cfg.toString())); + "{ActionConfig bob (foo.Bar.execute()) - foo/xwork.xml:10:12 - allowedMethods=[LiteralAllowedMethod{allowedMethod='execute'}]}".equals(cfg.toString())); } public void testToStringWithNoMethod() { @@ -39,6 +39,6 @@ public class ActionConfigTest extends XWorkTestCase { .build(); assertTrue("Wrong toString(): "+cfg.toString(), - "{ActionConfig bob (foo.Bar) - foo/xwork.xml:10:12}".equals(cfg.toString())); + "{ActionConfig bob (foo.Bar) - foo/xwork.xml:10:12 - allowedMethods=[]}".equals(cfg.toString())); } }
