CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 28 Packages Projects Releases Wiki Activity

FINERACT-2421: Fix potential NullPointerException in CalendarCommandFromApiJsonDeserializer

Browse Source 
The extractBooleanNamed method can return null when the JSON value is null
or missing. Using primitive boolean causes automatic unboxing which throws
NullPointerException.

Changes:
- CalendarCommandFromApiJsonDeserializer: Use Boolean wrapper instead of
  primitive boolean for 'repeating' field extraction
- CalendarCommandFromApiJsonDeserializer: Use Boolean.TRUE.equals() for
  null-safe boolean comparison
- CalendarCommand: Update field type and constructor parameter from
  boolean to Boolean to support null values

This addresses the FIXME comments on lines 156 and 298 in the original file.
This commit is contained in:
airajena
2025-12-29 10:35:40 +01:00
committed by Arnold Gálovics
parent e294ce88bf
commit b4fa48263b
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/command/CalendarCommand.java
+2 -2
View File
@@ -39,7 +39,7 @@ public class CalendarCommand {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final Integer typeId; private final Integer typeId;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final boolean repeating; private final Boolean repeating;
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final Integer remindById; private final Integer remindById;
@SuppressWarnings("unused") @SuppressWarnings("unused")
@@ -48,7 +48,7 @@ public class CalendarCommand {
private final Integer secondReminder; private final Integer secondReminder;
public CalendarCommand(final String title, final String description, final String location, final LocalDate startDate, public CalendarCommand(final String title, final String description, final String location, final LocalDate startDate,
final LocalDate endDate, final LocalDate createdDate, final Integer duration, final Integer typeId, final boolean repeating, final LocalDate endDate, final LocalDate createdDate, final Integer duration, final Integer typeId, final Boolean repeating,
final Integer remindById, final Integer firstReminder, final Integer secondReminder) { final Integer remindById, final Integer firstReminder, final Integer secondReminder) {
this.title = title; this.title = title;
this.description = description; this.description = description;
fineract-provider/src/main/java/org/apache/fineract/portfolio/calendar/serialization/CalendarCommandFromApiJsonDeserializer.java
+5 -7
View File
@@ -81,7 +81,7 @@ public class CalendarCommandFromApiJsonDeserializer extends AbstractFromApiJsonD
element); element);
final Integer typeId = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(CalendarSupportedParameters.TYPE_ID.getValue(), final Integer typeId = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(CalendarSupportedParameters.TYPE_ID.getValue(),
element); element);
final boolean repeating = this.fromApiJsonHelper.extractBooleanNamed(CalendarSupportedParameters.REPEATING.getValue(), element); final Boolean repeating = this.fromApiJsonHelper.extractBooleanNamed(CalendarSupportedParameters.REPEATING.getValue(), element);
final Integer remindById = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(CalendarSupportedParameters.REMIND_BY_ID.getValue(), final Integer remindById = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(CalendarSupportedParameters.REMIND_BY_ID.getValue(),
element); element);
final Integer firstReminder = this.fromApiJsonHelper final Integer firstReminder = this.fromApiJsonHelper
@@ -153,11 +153,10 @@ public class CalendarCommandFromApiJsonDeserializer extends AbstractFromApiJsonD
.inMinMaxRange(CalendarEntityType.getMinValue(), CalendarEntityType.getMaxValue()); .inMinMaxRange(CalendarEntityType.getMinValue(), CalendarEntityType.getMaxValue());
if (this.fromApiJsonHelper.parameterExists(CalendarSupportedParameters.REPEATING.getValue(), element)) { if (this.fromApiJsonHelper.parameterExists(CalendarSupportedParameters.REPEATING.getValue(), element)) {
// FIXME - Throws NullPointerException when boolean value is null final Boolean repeating = this.fromApiJsonHelper.extractBooleanNamed(CalendarSupportedParameters.REPEATING.getValue(), element);
final boolean repeating = this.fromApiJsonHelper.extractBooleanNamed(CalendarSupportedParameters.REPEATING.getValue(), element);
baseDataValidator.reset().parameter(CalendarSupportedParameters.REPEATING.getValue()).value(repeating).notNull(); baseDataValidator.reset().parameter(CalendarSupportedParameters.REPEATING.getValue()).value(repeating).notNull();
if (repeating) { if (Boolean.TRUE.equals(repeating)) {
final Integer frequency = this.fromApiJsonHelper final Integer frequency = this.fromApiJsonHelper
.extractIntegerSansLocaleNamed(CalendarSupportedParameters.FREQUENCY.getValue(), element); .extractIntegerSansLocaleNamed(CalendarSupportedParameters.FREQUENCY.getValue(), element);
baseDataValidator.reset().parameter(CalendarSupportedParameters.FREQUENCY.getValue()).value(frequency).notBlank() baseDataValidator.reset().parameter(CalendarSupportedParameters.FREQUENCY.getValue()).value(frequency).notBlank()
@@ -295,11 +294,10 @@ public class CalendarCommandFromApiJsonDeserializer extends AbstractFromApiJsonD
.inMinMaxRange(CalendarEntityType.getMinValue(), CalendarEntityType.getMaxValue()); .inMinMaxRange(CalendarEntityType.getMinValue(), CalendarEntityType.getMaxValue());
} }
if (this.fromApiJsonHelper.parameterExists(CalendarSupportedParameters.REPEATING.getValue(), element)) { if (this.fromApiJsonHelper.parameterExists(CalendarSupportedParameters.REPEATING.getValue(), element)) {
// FIXME - Throws NullPointerException when boolean value is null final Boolean repeating = this.fromApiJsonHelper.extractBooleanNamed(CalendarSupportedParameters.REPEATING.getValue(), element);
final boolean repeating = this.fromApiJsonHelper.extractBooleanNamed(CalendarSupportedParameters.REPEATING.getValue(), element);
baseDataValidator.reset().parameter(CalendarSupportedParameters.REPEATING.getValue()).value(repeating).notNull(); baseDataValidator.reset().parameter(CalendarSupportedParameters.REPEATING.getValue()).value(repeating).notNull();
if (repeating) { if (Boolean.TRUE.equals(repeating)) {
final Integer frequency = this.fromApiJsonHelper final Integer frequency = this.fromApiJsonHelper
.extractIntegerSansLocaleNamed(CalendarSupportedParameters.FREQUENCY.getValue(), element); .extractIntegerSansLocaleNamed(CalendarSupportedParameters.FREQUENCY.getValue(), element);
baseDataValidator.reset().parameter(CalendarSupportedParameters.FREQUENCY.getValue()).value(frequency).notBlank() baseDataValidator.reset().parameter(CalendarSupportedParameters.FREQUENCY.getValue()).value(frequency).notBlank()