SONARJAVA-6096 Group import declarations by specificity by asya-vorobeva · Pull Request #5457 · SonarSource/sonar-java

asya-vorobeva · 2026-02-12T15:18:54Z

hashicorp-vault-sonar-prod · 2026-02-12T15:19:24Z

tomasz-tylenda-sonarsource

Let's resolve this the issue of S2208 before we move to the rest of this PR.

java-checks/src/main/java/org/sonar/java/checks/WildcardImportsShouldNotBeUsedCheck.java

…r tests Replace custom fullQualifiedName method with ExpressionsHelper.concatenate for better code reuse. Add comprehensive parameterized tests for the concatenate method covering all import types including module imports. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Add JavaVersionAwareVisitor implementation to S2208 to restrict it to Java 24 and earlier. Java 25's import organization strategy (S8445) allows wildcard imports when properly grouped by specificity, making this restriction incompatible with Java 25+. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Add new rule to enforce proper grouping of import declarations by specificity. Import order should be: module imports, on-demand package imports, single-type imports, followed by static imports in the same order. Rule only applies to Java 25+ projects. Key features: - Classifies imports using ImportTree.isModule(), isStatic() and ExpressionsHelper.concatenate() for wildcard detection - Reports ordering violations with clear descriptive messages - Uses SENTINEL_IMPORT enum value to simplify initialization logic - Properly cleans up imports list in leaveNode() Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Add comprehensive test suite with sample files: - ImportDeclarationOrderCheckSample.java: Tests violations with mixed import orders - ImportDeclarationOrderCheckSampleNoIssues.java: Tests correctly ordered imports - Tests verify rule only runs on Java 25+ Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Add JSON and HTML metadata for ImportDeclarationOrderCheck rule: - S8445.json: Rule configuration with Minor severity, 2min remediation - S8445.html: Rule documentation with examples and rationale - Sonar_way_profile.json: Add S8445 to Sonar way profile Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

…y when module declarations aren't present

java-checks/src/main/java/org/sonar/java/checks/ImportDeclarationOrderCheck.java

java-checks-test-sources/default/src/main/java/checks/ImportDeclarationOrderCheckSample.java

java-checks/src/main/java/org/sonar/java/checks/ImportDeclarationOrderCheck.java

java-checks/src/main/java/org/sonar/java/checks/WildcardImportsShouldNotBeUsedCheck.java

tomasz-tylenda-sonarsource

Overall LGTM. Since this now targets only Java 25, we should not have problems with regressions on existing code.

java-checks/src/test/java/org/sonar/java/checks/WildcardImportsShouldNotBeUsedCheckTest.java

java-checks-test-sources/default/src/main/java/checks/ImportDeclarationOrderCheckSample.java

...st-sources/default/src/main/java/checks/ImportDeclarationOrderCheckSampleNoIssuesSample.java

tomasz-tylenda-sonarsource

LGTM, please take a look at the two small comments.

tomasz-tylenda-sonarsource · 2026-02-14T15:08:35Z

java-checks/src/main/java/org/sonar/java/checks/ImportDeclarationOrderCheck.java

+      .stream()
+      .filter(importTree -> importTree.is(Tree.Kind.IMPORT))
+      .map(ImportTree.class::cast)
+      .forEach(imports::add);


using List<ImportTree> imports = (...).toList() creates unmodifiable list, which is generally preferred.

It's really preferred when it's publicly accessible / can be potentially modified by external modules. In the case when it's private access within one class, I don't think it's important.

tomasz-tylenda-sonarsource · 2026-02-14T15:18:19Z

java-checks-test-sources/default/src/main/java/checks/ImportDeclarationOrderCheckSample.java

+
+// Basic violation: package import after single-type import
+import java.util.List; // Compliant
+import java.io.*; // Noncompliant {{Reorder this on-demand package import to come before single-type imports.}}


Just noticed this. Right now the squiggly line is on the import keyword. It think it it would be nicer to underline the import itself. It can be done with reportIssue(importTree.qualifiedIdentifier(), message); and tested with
// ^^^^^^^^^ on the next line.

I'll do it, but as we've discussed, the whole functionality will be updated to QuickFix and single raise. So there's no real sense doing it.

sonarqube-next · 2026-02-15T12:52:56Z

Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
0 Dependency risks
96.9% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

asya-vorobeva requested a review from tomasz-tylenda-sonarsource February 12, 2026 15:21

tomasz-tylenda-sonarsource reviewed Feb 12, 2026

View reviewed changes

java-checks/src/main/java/org/sonar/java/checks/WildcardImportsShouldNotBeUsedCheck.java Outdated Show resolved Hide resolved

asya-vorobeva requested a review from tomasz-tylenda-sonarsource February 13, 2026 08:57

asya-vorobeva and others added 7 commits February 13, 2026 11:54

Add autoscan expected results for S8445

44d8fea

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Changed S2208 rule to work for all Java versions and raise issues onl…

8d5b335

…y when module declarations aren't present

asya-vorobeva force-pushed the asya/s8445 branch from 0b9d7b7 to 8d5b335 Compare February 13, 2026 10:54

Changed autoscan expected results

989c74f

asya-vorobeva force-pushed the asya/s8445 branch from 43d1c14 to 989c74f Compare February 13, 2026 12:35

tomasz-tylenda-sonarsource reviewed Feb 13, 2026

View reviewed changes

asya-vorobeva requested a review from tomasz-tylenda-sonarsource February 13, 2026 13:47

asya-vorobeva force-pushed the asya/s8445 branch from 1643095 to 185bf76 Compare February 13, 2026 14:00

tomasz-tylenda-sonarsource reviewed Feb 13, 2026

View reviewed changes

asya-vorobeva force-pushed the asya/s8445 branch from 185bf76 to 121f790 Compare February 13, 2026 16:50

asya-vorobeva requested a review from tomasz-tylenda-sonarsource February 13, 2026 16:50

Reverted some changes

7a18835

asya-vorobeva force-pushed the asya/s8445 branch from 121f790 to 7a18835 Compare February 14, 2026 15:01

tomasz-tylenda-sonarsource approved these changes Feb 14, 2026

View reviewed changes

Fix

5875311

asya-vorobeva merged commit 207cac2 into master Feb 15, 2026
16 checks passed

asya-vorobeva deleted the asya/s8445 branch February 15, 2026 14:43

Conversation

asya-vorobeva commented Feb 12, 2026 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hashicorp-vault-sonar-prod bot commented Feb 12, 2026 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tomasz-tylenda-sonarsource left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tomasz-tylenda-sonarsource left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tomasz-tylenda-sonarsource left a comment

Choose a reason for hiding this comment

Uh oh!

tomasz-tylenda-sonarsource Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

asya-vorobeva Feb 15, 2026

Choose a reason for hiding this comment

Uh oh!

tomasz-tylenda-sonarsource Feb 14, 2026

Choose a reason for hiding this comment

Uh oh!

asya-vorobeva Feb 15, 2026

Choose a reason for hiding this comment

Uh oh!

sonarqube-next bot commented Feb 15, 2026

Quality Gate passed

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

asya-vorobeva commented Feb 12, 2026 •

edited by atlassian bot

Loading

hashicorp-vault-sonar-prod bot commented Feb 12, 2026 •

edited by atlassian bot

Loading