Fix SAT warnings (#14202)

* Fix SAT warnings

- checkstyle.ModifierOrderCheck
- checkstyle.OneStatementPerLineCheck
- checkstyle.NeedBracesCheck
- PMD.UseStandardCharsets
- PMD.UseCollectionIsEmpty
- PMD.UnusedLocalVariable
- PMD.SimplifyBooleanReturns where reasonable, suppress where
readability is better without change
- PMD.SimplifyBooleanExpressions

* Include StandardCharsets

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich
2023-01-13 08:11:06 +01:00
committed by GitHub
parent 6aa0dcbc70
commit 4e44de3894
86 changed files with 148 additions and 157 deletions

View File

@@ -348,8 +348,9 @@ public enum Measurand {
}
public MeasureType getMeasureType(@Nullable ParserCustomizationType customizationType) {
if (customizationType == null)
if (customizationType == null) {
return measureType;
}
return Optional.ofNullable(customizations).map(m -> m.get(customizationType))
.map(ParserCustomization::getMeasureType).orElse(measureType);
}