From 586a6ad81a64d39c453cde0df2057e3d7587e4b2 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Lievremont Date: Tue, 10 Sep 2013 10:02:40 +0200 Subject: [PATCH] SONAR-3644 Fix issue when matching component key against original file pattern --- .../org/sonar/plugins/core/issue/ignore/pattern/Pattern.java | 4 ++++ .../core/issue/ignore/pattern/PatternsInitializer.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/Pattern.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/Pattern.java index e46c7c8d48a..17ed6118a09 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/Pattern.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/Pattern.java @@ -155,6 +155,10 @@ public class Pattern { return resource != null && resourcePattern.match(resource); } + public Pattern forResource(String resource) { + return new Pattern(resource, rulePattern.toString(), lineRanges).setCheckLines(isCheckLines()); + } + @Override public String toString() { return ToStringBuilder.reflectionToString(this, ToStringStyle.SHORT_PREFIX_STYLE); diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializer.java index d98b50a9efe..5681d23d9dd 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializer.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/issue/ignore/pattern/PatternsInitializer.java @@ -145,6 +145,6 @@ public class PatternsInitializer implements BatchExtension { List newList = Lists.newArrayList(); patternByComponent.put(component, newList); } - patternByComponent.get(component).add(pattern); + patternByComponent.get(component).add(pattern.forResource(component)); } } -- 2.39.5