@@ -146,7 +146,7 @@ public class CheckstyleProfileExporter extends ProfileExporter { | |||
private void appendRuleParameters(Writer writer, ActiveRule activeRule) throws IOException { | |||
for (RuleParam ruleParam : activeRule.getRule().getParams()) { | |||
String value = activeRule.getParameter(ruleParam.getKey(), true); | |||
String value = activeRule.getParameter(ruleParam.getKey()); | |||
if (StringUtils.isNotBlank(value)) { | |||
appendModuleProperty(writer, ruleParam.getKey(), value); | |||
} |
@@ -104,7 +104,7 @@ public class CheckstyleProfileExporterTest { | |||
.setConfigKey("Checker/JavadocPackage"); | |||
rule.createParameter("format"); | |||
rule.createParameter("message"); // not set in the profile and no default value => not exported in checkstyle | |||
rule.createParameter("ignore").setDefaultValue("true"); | |||
rule.createParameter("ignore"); | |||
profile.activateRule(rule, RulePriority.MAJOR) | |||
.setParameter("format", "abcde"); |
@@ -5,7 +5,6 @@ | |||
<module name="JavadocPackage"> | |||
<property name="severity" value="warning" /> | |||
<property name="format" value="abcde" /> | |||
<property name="ignore" value="true" /> | |||
</module> | |||
<module name="TreeWalker"> | |||
<module name="FileContentsHolder"/> |
@@ -143,23 +143,13 @@ public class ActiveRule implements Cloneable { | |||
} | |||
public String getParameter(String key) { | |||
return getParameter(key, false); | |||
} | |||
public String getParameter(String key, boolean useDefaultValueIfNeeded) { | |||
if (activeRuleParams != null) { | |||
for (ActiveRuleParam param : activeRuleParams) { | |||
if (StringUtils.equals(key, param.getKey())) { | |||
return param.getValue(useDefaultValueIfNeeded); | |||
return param.getValue(); | |||
} | |||
} | |||
} | |||
if (useDefaultValueIfNeeded && rule.getParams()!=null) { | |||
RuleParam param = rule.getParam(key); | |||
if (param != null) { | |||
return param.getDefaultValue(); | |||
} | |||
} | |||
return null; | |||
} | |||
@@ -102,13 +102,6 @@ public class ActiveRuleParam implements Cloneable { | |||
return value; | |||
} | |||
public String getValue(boolean useDefaultValueIfNeeded) { | |||
if (value==null && useDefaultValueIfNeeded) { | |||
return ruleParam.getDefaultValue(); | |||
} | |||
return value; | |||
} | |||
public void setValue(String value) { | |||
this.value = value; | |||
} |