Skip to content

Commit 5cba6ae

Browse files
committed
minor: resolve IntelijIdea inspections (Single character alternation; Scope of variable is too broad; Annotator)
1 parent c0cc087 commit 5cba6ae

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

checkstyle-sonar-plugin/config/intellij-idea-inspections.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1977,6 +1977,8 @@
19771977
<option value="deprecation" />
19781978
<option value="unchecked" />
19791979
<option value="rawtypes" />
1980+
<!-- Locale changes and caching, requires storage of value in advance in final -->
1981+
<option value="TooBroadScope" />
19801982
</list>
19811983
</option>
19821984
</inspection_tool>

checkstyle-sonar-plugin/src/main/java/org/sonar/plugins/checkstyle/CheckstyleExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public CheckstyleExecutor(CheckstyleConfiguration configuration,
6060

6161
/**
6262
* Execute Checkstyle and return the generated XML report.
63+
* @noinspection TooBroadScope
6364
*/
6465
public void execute() {
65-
6666
final Locale initialLocale = Locale.getDefault();
6767
Locale.setDefault(Locale.ENGLISH);
6868
final ClassLoader initialClassLoader = Thread.currentThread().getContextClassLoader();

checkstyle-sonar-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleExecutorTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,13 @@ private static JavaResourceLocator createJavaResourceLocator() {
111111
return new DefaultJavaResourceLocator(null, javaClasspath, null);
112112
}
113113

114+
/**
115+
* This is fake description just to keep noinspection.
116+
* @noinspection TooBroadScope
117+
* @throws Exception all could happen
118+
*/
114119
@Test
115-
public void canGenerateXmlReportInEnglish() throws Exception {
120+
public void generateXmlReportInEnglish() throws Exception {
116121
final Locale initialLocale = Locale.getDefault();
117122
Locale.setDefault(Locale.FRENCH);
118123

@@ -140,7 +145,7 @@ public void canGenerateXmlReportInEnglish() throws Exception {
140145
}
141146

142147
@Test
143-
public void canGenerateXmlReportNull() throws CheckstyleException {
148+
public void generateXmlReportNull() throws CheckstyleException {
144149
final CheckstyleConfiguration conf = mockConf();
145150
final File report = new File("target/test-tmp/checkstyle-report.xml");
146151
// delete if exists from a previous run

checkstyle-sonar-plugin/src/test/java/org/sonar/plugins/checkstyle/internal/ChecksTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ private static void validateSonarProperties(Map<Object, Object> properties,
281281
Assert.assertFalse("sonar properties value must not have single quote: "
282282
+ keyName, keyValue.matches(".*[^'{}]'[^'{}].*"));
283283
Assert.assertFalse("sonar properties value must not have unescaped braces: "
284-
+ keyName, keyValue.matches(".*[^'](\\{|\\})[^'].*"));
284+
+ keyName, keyValue.matches(".*[^'](\\{|})[^'].*"));
285285

286286
final String moduleName;
287287

0 commit comments

Comments
 (0)