Skip to content

Commit b20c43d

Browse files
rnveachromani
authored andcommitted
config: upgrade sevntu to 1.44.1
1 parent a5576ee commit b20c43d

File tree

6 files changed

+27
-31
lines changed

6 files changed

+27
-31
lines changed

config/intellij-idea-inspections.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,7 @@
11841184
<option name="IGNORE_JAVADOC_PERIOD" value="true" />
11851185
<option name="IGNORE_DUPLICATED_THROWS" value="false" />
11861186
<option name="IGNORE_POINT_TO_ITSELF" value="false" />
1187-
<option name="myAdditionalJavadocTags" value="" />
1187+
<option name="myAdditionalJavadocTags" value="noinspectionreason" />
11881188
</inspection_tool>
11891189
<inspection_tool class="JavaFxDefaultTag" enabled="true" level="ERROR" enabled_by_default="true" />
11901190
<inspection_tool class="JavaFxUnresolvedFxIdReference" enabled="true" level="ERROR" enabled_by_default="true" />

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@
9696
<checkstyle.version>10.4</checkstyle.version>
9797
<sonar.version>8.9.0.43852</sonar.version>
9898
<sonar-java.version>7.2.0.26923</sonar-java.version>
99-
<maven.sevntu.checkstyle.plugin.version>1.42.0</maven.sevntu.checkstyle.plugin.version>
99+
<maven.sevntu.checkstyle.plugin.version>1.44.1</maven.sevntu.checkstyle.plugin.version>
100100
<!-- it should be a version of checkstyle that is compatible/compiled with sevntu -->
101101
<maven.sevntu.checkstyle.plugin.checkstyle.version>
102-
10.0
102+
10.4
103103
</maven.sevntu.checkstyle.plugin.checkstyle.version>
104104
<antrun.plugin.version>3.1.0</antrun.plugin.version>
105105
<checkstyle.configLocation>https://raw.githubusercontent.com/checkstyle/checkstyle/checkstyle-${maven.sevntu.checkstyle.plugin.checkstyle.version}/config/checkstyle_checks.xml</checkstyle.configLocation>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public CheckstyleExecutor(CheckstyleConfiguration configuration,
6565
* Execute Checkstyle and return the generated XML report.
6666
*
6767
* @noinspection TooBroadScope
68+
* @noinspectionreason Cache the value of the default locale.
6869
*/
6970
public void execute(SensorContext context) {
7071
if (Objects.nonNull(listener)) {

src/main/java/org/sonar/plugins/checkstyle/metadata/CheckstyleMetadata.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ else if ("anyTokenTypesSet".equals(paramType)) {
240240
*/
241241
private static boolean isMoreThanVarCharSizeLimit(String... values) {
242242
int totalByteSize = 0;
243-
for (String x : values) {
244-
final String tokenString = x + COMMA_STRING;
243+
for (String value : values) {
244+
final String tokenString = value + COMMA_STRING;
245245
totalByteSize += tokenString.getBytes(StandardCharsets.UTF_8).length;
246246
}
247247
totalByteSize += "'SINGLE_SELECT_LIST,multiple=true,values=\""
@@ -345,9 +345,10 @@ public static String getFullCheckName(String checkName) {
345345
result.append(MODULE_NAME_EXCEPTIONS.get(checkName));
346346
}
347347
else {
348-
for (int i = 0; i < checkName.length(); i++) {
349-
result.append(checkName.charAt(i));
350-
if (i + 1 < checkName.length() && Character.isUpperCase(checkName.charAt(i + 1))) {
348+
for (int index = 0; index < checkName.length(); index++) {
349+
result.append(checkName.charAt(index));
350+
if (index + 1 < checkName.length()
351+
&& Character.isUpperCase(checkName.charAt(index + 1))) {
351352
result.append(' ');
352353
}
353354
}

src/test/java/org/sonar/plugins/checkstyle/CheckstyleAuditListenerTest.java

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -76,39 +76,32 @@ public void before() {
7676
when(predicates.hasAbsolutePath(anyString())).thenReturn(filePredicate);
7777
}
7878

79-
/**
80-
* We do suppression to keep code the same in view
81-
*
82-
* @noinspection TooBroadScope
83-
*/
8479
@Test
8580
public void testUtilityMethods() {
86-
AuditEvent eventTest;
87-
88-
eventTest = new AuditEvent(this, "", new Violation(0, "", "", null, "",
81+
final AuditEvent event1 = new AuditEvent(this, "", new Violation(0, "", "", null, "",
8982
CheckstyleAuditListenerTest.class, "msg"));
90-
assertThat(CheckstyleAuditListener.getLineId(eventTest)).isEqualTo(1);
91-
assertThat(CheckstyleAuditListener.getMessage(eventTest)).isEqualTo("msg");
92-
assertThat(CheckstyleAuditListener.getRuleKey(eventTest)).isEqualTo(
83+
assertThat(CheckstyleAuditListener.getLineId(event1)).isEqualTo(1);
84+
assertThat(CheckstyleAuditListener.getMessage(event1)).isEqualTo("msg");
85+
assertThat(CheckstyleAuditListener.getRuleKey(event1)).isEqualTo(
9386
CheckstyleAuditListenerTest.class.getName());
9487

95-
eventTest = new AuditEvent(this, "", new Violation(1, "", "", null, "",
88+
final AuditEvent event2 = new AuditEvent(this, "", new Violation(1, "", "", null, "",
9689
CheckstyleAuditListenerTest.class, "msg"));
97-
assertThat(CheckstyleAuditListener.getLineId(eventTest)).isEqualTo(1);
98-
assertThat(CheckstyleAuditListener.getMessage(eventTest)).isEqualTo("msg");
99-
assertThat(CheckstyleAuditListener.getRuleKey(eventTest)).isEqualTo(
90+
assertThat(CheckstyleAuditListener.getLineId(event2)).isEqualTo(1);
91+
assertThat(CheckstyleAuditListener.getMessage(event2)).isEqualTo("msg");
92+
assertThat(CheckstyleAuditListener.getRuleKey(event2)).isEqualTo(
10093
CheckstyleAuditListenerTest.class.getName());
10194

102-
eventTest = new AuditEvent(this);
103-
assertThat(CheckstyleAuditListener.getLineId(eventTest)).isEqualTo(1);
104-
assertThat(CheckstyleAuditListener.getMessage(eventTest)).isNull();
105-
assertThat(CheckstyleAuditListener.getRuleKey(eventTest)).isNull();
95+
final AuditEvent event3 = new AuditEvent(this);
96+
assertThat(CheckstyleAuditListener.getLineId(event3)).isEqualTo(1);
97+
assertThat(CheckstyleAuditListener.getMessage(event3)).isNull();
98+
assertThat(CheckstyleAuditListener.getRuleKey(event3)).isNull();
10699

107-
eventTest = new AuditEvent(this, "", new Violation(0, "", "", null, "module",
100+
final AuditEvent event4 = new AuditEvent(this, "", new Violation(0, "", "", null, "module",
108101
CheckstyleAuditListenerTest.class, "msg"));
109-
assertThat(CheckstyleAuditListener.getLineId(eventTest)).isEqualTo(1);
110-
assertThat(CheckstyleAuditListener.getMessage(eventTest)).isEqualTo("msg");
111-
assertThat(CheckstyleAuditListener.getRuleKey(eventTest)).isEqualTo("module");
102+
assertThat(CheckstyleAuditListener.getLineId(event4)).isEqualTo(1);
103+
assertThat(CheckstyleAuditListener.getMessage(event4)).isEqualTo("msg");
104+
assertThat(CheckstyleAuditListener.getRuleKey(event4)).isEqualTo("module");
112105
}
113106

114107
@Test

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ public void getUrlException() throws URISyntaxException {
107107
* We do suppression as we need to cache value initialLocale
108108
*
109109
* @noinspection TooBroadScope
110+
* @noinspectionreason Cache the value of the default locale.
110111
*/
111112
@Test
112113
public void generateXmlReportInEnglish() throws Exception {

0 commit comments

Comments
 (0)