SONARJAVA-6866 Fix S9358: Move conditional expressions inside operations

[romainbrenguier]

Summary

• Move ternary expressions inside the common operation they feed, fixing 5 S9358 violations:
  • AssertThrowsInsteadOfTryCatchFailCheck: move ternary inside Replacements constructor (2 occurrences)
  • AndroidMobileDatabaseEncryptionKeysCheck: move ternary inside arguments.get() call
  • JParser: inline ternary into firstTokenAfter() and extract shared boolean to avoid duplicate e.isUpperBound() calls (2 occurrences)

Test plan

• AssertThrowsInsteadOfTryCatchFailCheckTest passes
• AndroidMobileDatabaseEncryptionKeysCheckTest passes
• JParserTest passes

🤖 Generated with Claude Code

---

Summary by Gitar

• Code improvements:
  • Refactored HashCodeMismatchedFieldsCheck to use early continue statements for cleaner loop structure
  • Removed nested conditional checks in LocalVariablesShouldNotSpanSwitchCaseGroupsCheck using early return

_{This will update automatically on new commits.}

[hashicorp-vault-sonar-prod]

SONARJAVA-6866

[gitar-bot]

Code Review ✅ Approved 1 resolved / 1 findings

Moves conditional expressions inside operations to fix S9358 violations across multiple check classes, addressing the branch reintroduces continue statements it set out to remove finding. All tests pass successfully.

✅ 1 resolved

✅ Quality: Branch reintroduces continue statements it set out to remove

📄 java-checks/src/main/java/org/sonar/java/checks/HashCodeMismatchedFieldsCheck.java:120-131 📄 java-checks/src/main/java/org/sonar/java/checks/HashCodeMismatchedFieldsCheck.java:141-150 📄 java-checks/src/main/java/org/sonar/java/checks/LocalVariablesShouldNotSpanSwitchCaseGroupsCheck.java:52-61
The net branch diff (15adb94..HEAD) converts nested-if loop bodies into if (...) { continue; } in HashCodeMismatchedFieldsCheck (two loops) and LocalVariablesShouldNotSpanSwitchCaseGroupsCheck — the exact pattern commits 680c546 ("S909: Remove continue statements") and 1fbbe55 explicitly aimed to eliminate, and these two files are not mentioned in the PR description (which lists only AssertThrowsInsteadOfTryCatchFailCheck, AndroidMobileDatabaseEncryptionKeysCheck and JParser). Since this PR's purpose is clearing quality-gate issues, these changed lines will be analyzed as new code and re-raise S909, so the change works against its own goal. Behaviour is unchanged (I verified the pattern-variable flow scoping compiles and the branch logic is equivalent), so this is cosmetic: either restore the master nested-if form in both files or drop them from the PR.

Options

Auto-apply is off → Gitar will not commit updates to this branch.
Display: compact → Showing less information.

Comment with these commands to change the behavior for this request:

Auto-apply	Compact
gitar auto-apply:on	gitar display:verbose

_{Was this helpful? React with 👍 / 👎 | Gitar}

[sonarqube-next]

Quality Gate passed

Issues
0 New issues
3 Fixed issues
0 Accepted issues

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

See analysis details on SonarQube