Skip to content

Commit cb640ea

Browse files
committed
FINERACT-2538: Fix String Locale compiler warning in EnumValueValidator
1 parent d093a08 commit cb640ea

6 files changed

Lines changed: 20 additions & 20 deletions

File tree

fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/domain/Calendar.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ private static String constructRecurrence(final CalendarFrequencyType frequencyT
518518
final StringBuilder recurrenceBuilder = new StringBuilder(200);
519519

520520
recurrenceBuilder.append("FREQ=");
521-
recurrenceBuilder.append(frequencyType.toString().toUpperCase());
521+
recurrenceBuilder.append(frequencyType.toString().toUpperCase(java.util.Locale.ROOT));
522522
if (interval > 1) {
523523
recurrenceBuilder.append(";INTERVAL=");
524524
recurrenceBuilder.append(interval);
@@ -528,7 +528,7 @@ private static String constructRecurrence(final CalendarFrequencyType frequencyT
528528
final CalendarWeekDaysType weekDays = CalendarWeekDaysType.fromInt(repeatsOnDay);
529529
if (!weekDays.isInvalid()) {
530530
recurrenceBuilder.append(";BYDAY=");
531-
recurrenceBuilder.append(weekDays.toString().toUpperCase());
531+
recurrenceBuilder.append(weekDays.toString().toUpperCase(java.util.Locale.ROOT));
532532
}
533533
}
534534
}
@@ -548,7 +548,7 @@ private static String constructRecurrence(final CalendarFrequencyType frequencyT
548548
final CalendarWeekDaysType weekday = CalendarWeekDaysType.fromInt(repeatsOnDay);
549549
if (!weekday.isInvalid()) {
550550
recurrenceBuilder.append(";BYDAY=");
551-
recurrenceBuilder.append(weekday.toString().toUpperCase());
551+
recurrenceBuilder.append(weekday.toString().toUpperCase(java.util.Locale.ROOT));
552552
}
553553
}
554554
}

fineract-core/src/main/java/org/apache/fineract/portfolio/calendar/service/CalendarUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,10 @@ public static String getRRuleReadable(final LocalDate startDate, final String re
299299
NthDayNameEnum nthDayName = NthDayNameEnum.from(nthDayType.toString());
300300
DayNameEnum weekdayType = DayNameEnum.from(weekDay.getDay().name());
301301
if (recur.getInterval() == 1 || recur.getInterval() == -1) {
302-
humanReadable = "Monthly on " + nthDayName.getCode().toLowerCase() + " " + weekdayType.getCode().toLowerCase();
302+
humanReadable = "Monthly on " + nthDayName.getCode().toLowerCase(java.util.Locale.ROOT) + " " + weekdayType.getCode().toLowerCase(java.util.Locale.ROOT);
303303
} else {
304-
humanReadable = "Every " + recur.getInterval() + " months on " + nthDayName.getCode().toLowerCase() + " "
305-
+ weekdayType.getCode().toLowerCase();
304+
humanReadable = "Every " + recur.getInterval() + " months on " + nthDayName.getCode().toLowerCase(java.util.Locale.ROOT) + " "
305+
+ weekdayType.getCode().toLowerCase(java.util.Locale.ROOT);
306306
}
307307
} else if (monthDay != null) {
308308
if (monthDay == -1) {
@@ -756,7 +756,7 @@ public static void validateNthDayOfMonthFrequency(DataValidatorBuilder baseDataV
756756
if (nthDayType == NthDayType.ONE || nthDayType == NthDayType.TWO || nthDayType == NthDayType.THREE
757757
|| nthDayType == NthDayType.FOUR) {
758758
baseDataValidator.reset().parameter(repeatsOnDayParamName).value(repeatsOnDay).cantBeBlankWhenParameterProvidedIs(
759-
repeatsOnNthDayOfMonthParamName, NthDayNameEnum.from(nthDayType.toString()).getCode().toLowerCase());
759+
repeatsOnNthDayOfMonthParamName, NthDayNameEnum.from(nthDayType.toString()).getCode().toLowerCase(java.util.Locale.ROOT));
760760
}
761761
}
762762
}

fineract-core/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -531,8 +531,8 @@ public void validateHasDeletePermission(final String resourceType) {
531531
}
532532

533533
private void validateHasPermission(final String prefix, final String resourceType) {
534-
final String authorizationMessage = "User has no authority to " + prefix + " " + resourceType.toLowerCase() + "s";
535-
final String matchPermission = prefix + "_" + resourceType.toUpperCase();
534+
final String authorizationMessage = "User has no authority to " + prefix + " " + resourceType.toLowerCase(java.util.Locale.ROOT) + "s";
535+
final String matchPermission = prefix + "_" + resourceType.toUpperCase(java.util.Locale.ROOT);
536536

537537
if (!hasNotPermissionForAnyOf("ALL_FUNCTIONS", "ALL_FUNCTIONS_READ", matchPermission)) {
538538
return;
@@ -615,7 +615,7 @@ public void validateHasReadPermission(final String function, final Long userId)
615615
}
616616

617617
public void validateHasCheckerPermissionTo(final String function) {
618-
final String checkerPermissionName = function.toUpperCase() + "_CHECKER";
618+
final String checkerPermissionName = function.toUpperCase(java.util.Locale.ROOT) + "_CHECKER";
619619
if (hasNotPermissionTo("CHECKER_SUPER_USER") && hasNotPermissionTo(checkerPermissionName)) {
620620
final String authorizationMessage = "User has no authority to be a checker for: " + function;
621621
throw new NoAuthorizationException(authorizationMessage);

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/domain/SmsCampaign.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ private static String constructRecurrence(final CalendarFrequencyType frequencyT
523523
final StringBuilder recurrenceBuilder = new StringBuilder(200);
524524

525525
recurrenceBuilder.append("FREQ=");
526-
recurrenceBuilder.append(frequencyType.toString().toUpperCase());
526+
recurrenceBuilder.append(frequencyType.toString().toUpperCase(java.util.Locale.ROOT));
527527
if (interval > 1) {
528528
recurrenceBuilder.append(";INTERVAL=");
529529
recurrenceBuilder.append(interval);
@@ -533,7 +533,7 @@ private static String constructRecurrence(final CalendarFrequencyType frequencyT
533533
final CalendarWeekDaysType weekDays = CalendarWeekDaysType.fromInt(repeatsOnDay);
534534
if (!weekDays.isInvalid()) {
535535
recurrenceBuilder.append(";BYDAY=");
536-
recurrenceBuilder.append(weekDays.toString().toUpperCase());
536+
recurrenceBuilder.append(weekDays.toString().toUpperCase(java.util.Locale.ROOT));
537537
}
538538
}
539539
}

fineract-provider/src/main/java/org/apache/fineract/portfolio/note/service/NoteWritePlatformServiceJpaRepositoryImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ private CommandProcessingResult updateClientNote(final JsonCommand command) {
250250

251251
final Note noteForUpdate = this.noteRepository.findByClientAndId(client, noteId);
252252
if (noteForUpdate == null) {
253-
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase());
253+
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase(java.util.Locale.ROOT));
254254
}
255255

256256
final Map<String, Object> changes = noteForUpdate.update(command);
@@ -280,7 +280,7 @@ private CommandProcessingResult updateGroupNote(final JsonCommand command) {
280280
final Note noteForUpdate = this.noteRepository.findByGroupAndId(group, noteId);
281281

282282
if (noteForUpdate == null) {
283-
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase());
283+
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase(java.util.Locale.ROOT));
284284
}
285285

286286
final Map<String, Object> changes = noteForUpdate.update(command);
@@ -307,7 +307,7 @@ private CommandProcessingResult updateLoanNote(final JsonCommand command) {
307307
final Loan loan = this.loanRepository.findOneWithNotFoundDetection(resourceId);
308308
final Note noteForUpdate = this.noteRepository.findByLoanAndId(loan, noteId);
309309
if (noteForUpdate == null) {
310-
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase());
310+
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase(java.util.Locale.ROOT));
311311
}
312312

313313
final Map<String, Object> changes = noteForUpdate.update(command);
@@ -334,7 +334,7 @@ private CommandProcessingResult updateLoanTransactionNote(final JsonCommand comm
334334
final Note noteForUpdate = this.noteRepository.findByLoanTransactionAndId(loanTransaction, noteId);
335335

336336
if (noteForUpdate == null) {
337-
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase());
337+
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase(java.util.Locale.ROOT));
338338
}
339339

340340
final Map<String, Object> changes = noteForUpdate.update(command);
@@ -356,7 +356,7 @@ private CommandProcessingResult updateSavingAccountNote(final JsonCommand comman
356356

357357
final Note noteForUpdate = this.noteRepository.findBySavingsAccountAndId(savingAccount, noteId);
358358
if (noteForUpdate == null) {
359-
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase());
359+
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase(java.util.Locale.ROOT));
360360
}
361361
final Map<String, Object> changes = noteForUpdate.update(command);
362362
if (!changes.isEmpty()) {
@@ -463,7 +463,7 @@ private Note getNoteForDelete(final JsonCommand command) {
463463
break;
464464
}
465465
if (noteForUpdate == null) {
466-
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase());
466+
throw new NoteNotFoundException(noteId, resourceId, type.name().toLowerCase(java.util.Locale.ROOT));
467467
}
468468
return noteForUpdate;
469469
}

fineract-validation/src/main/java/org/apache/fineract/validation/constraints/EnumValueValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ public class EnumValueValidator implements ConstraintValidator<EnumValue, String
3030

3131
@Override
3232
public void initialize(EnumValue annotation) {
33-
acceptedValues = Arrays.stream(annotation.enumClass().getEnumConstants()).map(e -> e.name().toLowerCase())
33+
acceptedValues = Arrays.stream(annotation.enumClass().getEnumConstants()).map(e -> e.name().toLowerCase(java.util.Locale.ROOT))
3434
.collect(Collectors.toSet());
3535
}
3636

3737
@Override
3838
public boolean isValid(String value, ConstraintValidatorContext context) {
39-
return value != null && acceptedValues.contains(value.toLowerCase());
39+
return value != null && acceptedValues.contains(value.toLowerCase(java.util.Locale.ROOT));
4040
}
4141
}

0 commit comments

Comments
 (0)