FINERACT-2694: Return validation errors instead of 500 NPE when type parameters are omitted

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailCampaignValidator.java

@@ -106,7 +106,7 @@ public void validateCreate(String json) {
         final Long campaignType = this.fromApiJsonHelper.extractLongNamed(EmailCampaignValidator.campaignType, element);
         baseDataValidator.reset().parameter(EmailCampaignValidator.campaignType).value(campaignType).notNull().integerGreaterThanZero();
 
-        if (campaignType.intValue() == EmailCampaignType.SCHEDULE.getValue()) {
+        if (campaignType != null && campaignType.intValue() == EmailCampaignType.SCHEDULE.getValue()) {
             final String recurrenceParamName = this.fromApiJsonHelper.extractStringNamed(EmailCampaignValidator.recurrenceParamName,
                     element);
             baseDataValidator.reset().parameter(EmailCampaignValidator.recurrenceParamName).value(recurrenceParamName).notBlank();
@@ -157,7 +157,7 @@ public void validateForUpdate(String json) {
         final Long campaignType = this.fromApiJsonHelper.extractLongNamed(EmailCampaignValidator.campaignType, element);
         baseDataValidator.reset().parameter(EmailCampaignValidator.campaignType).value(campaignType).notNull().integerGreaterThanZero();
 
-        if (campaignType.intValue() == EmailCampaignType.SCHEDULE.getValue()) {
+        if (campaignType != null && campaignType.intValue() == EmailCampaignType.SCHEDULE.getValue()) {
             final String recurrenceParamName = this.fromApiJsonHelper.extractStringNamed(EmailCampaignValidator.recurrenceParamName,
                     element);
             baseDataValidator.reset().parameter(EmailCampaignValidator.recurrenceParamName).value(recurrenceParamName).notBlank();

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/serialization/SmsCampaignValidator.java

@@ -117,7 +117,7 @@ public void validateCreate(String json) {
         final Long triggerType = this.fromApiJsonHelper.extractLongNamed(SmsCampaignValidator.triggerType, element);
         baseDataValidator.reset().parameter(SmsCampaignValidator.triggerType).value(triggerType).notNull().integerGreaterThanZero();
 
-        if (triggerType.intValue() == SmsCampaignTriggerType.SCHEDULE.getValue()) {
+        if (triggerType != null && triggerType.intValue() == SmsCampaignTriggerType.SCHEDULE.getValue()) {
 
             final Integer frequencyParam = this.fromApiJsonHelper.extractIntegerWithLocaleNamed(SmsCampaignValidator.frequencyParamName,
                     element);
@@ -143,7 +143,7 @@ public void validateCreate(String json) {
         baseDataValidator.reset().parameter(SmsCampaignValidator.message).value(message).notBlank().notExceedingLengthOf(480);
 
         final JsonElement paramValueJsonObject = this.fromApiJsonHelper.extractJsonObjectNamed(SmsCampaignValidator.paramValue, element);
-        if (triggerType.intValue() != SmsCampaignTriggerType.TRIGGERED.getValue()) {
+        if (triggerType != null && triggerType.intValue() != SmsCampaignTriggerType.TRIGGERED.getValue()) {
             baseDataValidator.reset().parameter(SmsCampaignValidator.paramValue).value(paramValueJsonObject).notBlank();
             if (paramValueJsonObject != null && paramValueJsonObject.isJsonObject()) {
                 for (Map.Entry<String, JsonElement> entry : paramValueJsonObject.getAsJsonObject().entrySet()) {
@@ -190,7 +190,7 @@ public void validateForUpdate(String json) {
         final Long triggerType = this.fromApiJsonHelper.extractLongNamed(SmsCampaignValidator.triggerType, element);
         baseDataValidator.reset().parameter(SmsCampaignValidator.triggerType).value(triggerType).notNull().integerGreaterThanZero();
 
-        if (triggerType.intValue() == SmsCampaignTriggerType.SCHEDULE.getValue()) {
+        if (triggerType != null && triggerType.intValue() == SmsCampaignTriggerType.SCHEDULE.getValue()) {
             if (this.fromApiJsonHelper.parameterExists(SmsCampaignValidator.recurrenceParamName, element)) {
                 final String recurrenceParamName = this.fromApiJsonHelper.extractStringNamed(SmsCampaignValidator.recurrenceParamName,
                         element);
@@ -212,7 +212,7 @@ public void validateForUpdate(String json) {
         baseDataValidator.reset().parameter(SmsCampaignValidator.message).value(message).notBlank().notExceedingLengthOf(480);
 
         final JsonElement paramValueJsonObject = this.fromApiJsonHelper.extractJsonObjectNamed(SmsCampaignValidator.paramValue, element);
-        if (triggerType.intValue() != SmsCampaignTriggerType.TRIGGERED.getValue()) {
+        if (triggerType != null && triggerType.intValue() != SmsCampaignTriggerType.TRIGGERED.getValue()) {
             baseDataValidator.reset().parameter(SmsCampaignValidator.paramValue).value(paramValueJsonObject).notBlank();
             if (paramValueJsonObject != null && paramValueJsonObject.isJsonObject()) {
                 for (Map.Entry<String, JsonElement> entry : paramValueJsonObject.getAsJsonObject().entrySet()) {

fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/StandingInstructionDataValidator.java

@@ -183,9 +183,9 @@ public void validateForCreate(final JsonCommand command) {
         }
 
         String errorCode = null;
-        AccountTransferType accountTransferType = AccountTransferType.fromInt(transferType);
         final Integer fromAccountType = this.fromApiJsonHelper.extractIntegerSansLocaleNamed(fromAccountTypeParamName, element);
-        if (fromAccountType != null && toAccountType != null) {
+        if (transferType != null && fromAccountType != null && toAccountType != null) {
+            AccountTransferType accountTransferType = AccountTransferType.fromInt(transferType);
             PortfolioAccountType fromPortfolioAccountType = PortfolioAccountType.fromInt(fromAccountType);
             PortfolioAccountType toPortfolioAccountType = PortfolioAccountType.fromInt(toAccountType);
             if (accountTransferType.isAccountTransfer() && (PortfolioAccountType.LOAN.equals(fromPortfolioAccountType)

fineract-provider/src/test/java/org/apache/fineract/infrastructure/campaigns/email/data/EmailCampaignValidatorTest.java

@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.infrastructure.campaigns.email.data;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.fineract.infrastructure.campaigns.email.domain.EmailCampaignType;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Regression tests for the NullPointerException thrown when the mandatory {@code campaignType} parameter is omitted
+ * from email campaign create/update requests. The validator queued a {@code notNull} validation error but dereferenced
+ * the value before throwing, turning a client error into an HTTP 500.
+ */
+class EmailCampaignValidatorTest {
+
+    private EmailCampaignValidator validator;
+
+    @BeforeEach
+    void setUp() {
+        validator = new EmailCampaignValidator(new FromJsonHelper());
+    }
+
+    @Test
+    void validateCreateWithoutCampaignTypeReportsValidationErrorInsteadOfNpe() {
+        PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
+                () -> validator.validateCreate("{}"));
+
+        assertTrue(ex.getErrors().stream().anyMatch(e -> EmailCampaignValidator.campaignType.equals(e.getParameterName())),
+                "Expected validation error for parameter 'campaignType'");
+    }
+
+    @Test
+    void validateForUpdateWithoutCampaignTypeReportsValidationErrorInsteadOfNpe() {
+        PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
+                () -> validator.validateForUpdate("{}"));
+
+        assertTrue(ex.getErrors().stream().anyMatch(e -> EmailCampaignValidator.campaignType.equals(e.getParameterName())),
+                "Expected validation error for parameter 'campaignType'");
+    }
+
+    @Test
+    void validateCreateWithScheduleCampaignTypeStillRequiresRecurrenceDetails() {
+        String json = """
+                {
+                  "campaignName": "Loan reminders",
+                  "campaignType": CAMPAIGN_TYPE,
+                  "businessRuleId": 1,
+                  "emailSubject": "Reminder",
+                  "emailMessage": "Your repayment is due",
+                  "paramValue": "value"
+                }
+                """.replace("CAMPAIGN_TYPE", String.valueOf(EmailCampaignType.SCHEDULE.getValue()));
+
+        PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
+                () -> validator.validateCreate(json));
+
+        assertTrue(ex.getErrors().stream().anyMatch(e -> EmailCampaignValidator.recurrenceStartDate.equals(e.getParameterName())),
+                "Expected validation error for parameter 'recurrenceStartDate'");
+    }
+}

fineract-provider/src/test/java/org/apache/fineract/infrastructure/campaigns/sms/serialization/SmsCampaignValidatorTest.java

@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.infrastructure.campaigns.sms.serialization;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.fineract.infrastructure.campaigns.sms.constants.SmsCampaignTriggerType;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Regression tests for the NullPointerException thrown when the mandatory {@code triggerType} parameter is omitted from
+ * SMS campaign create/update requests. The validator queued a {@code notNull} validation error but dereferenced the
+ * value before throwing, turning a client error into an HTTP 500.
+ */
+class SmsCampaignValidatorTest {
+
+    private SmsCampaignValidator validator;
+
+    @BeforeEach
+    void setUp() {
+        validator = new SmsCampaignValidator(new FromJsonHelper());
+    }
+
+    @Test
+    void validateCreateWithoutTriggerTypeReportsValidationErrorInsteadOfNpe() {
+        PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
+                () -> validator.validateCreate("{}"));
+
+        assertTrue(ex.getErrors().stream().anyMatch(e -> SmsCampaignValidator.triggerType.equals(e.getParameterName())),
+                "Expected validation error for parameter 'triggerType'");
+    }
+
+    @Test
+    void validateForUpdateWithoutTriggerTypeReportsValidationErrorInsteadOfNpe() {
+        PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
+                () -> validator.validateForUpdate("{}"));
+
+        assertTrue(ex.getErrors().stream().anyMatch(e -> SmsCampaignValidator.triggerType.equals(e.getParameterName())),
+                "Expected validation error for parameter 'triggerType'");
+    }
+
+    @Test
+    void validateCreateWithScheduleTriggerTypeStillRequiresRecurrenceDetails() {
+        String json = """
+                {
+                  "campaignName": "Repayment reminders",
+                  "campaignType": 1,
+                  "triggerType": TRIGGER_TYPE,
+                  "runReportId": 1,
+                  "message": "Your repayment is due",
+                  "locale": "en"
+                }
+                """.replace("TRIGGER_TYPE", String.valueOf(SmsCampaignTriggerType.SCHEDULE.getValue()));
+
+        PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
+                () -> validator.validateCreate(json));
+
+        assertTrue(ex.getErrors().stream().anyMatch(e -> SmsCampaignValidator.recurrenceStartDate.equals(e.getParameterName())),
+                "Expected validation error for parameter 'recurrenceStartDate'");
+    }
+}

fineract-provider/src/test/java/org/apache/fineract/portfolio/account/data/StandingInstructionDataValidatorTest.java

@@ -0,0 +1,90 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.account.data;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.fineract.infrastructure.core.api.JsonCommand;
+import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.apache.fineract.portfolio.account.AccountDetailConstants;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Regression tests for the NullPointerException thrown when the mandatory {@code transferType} parameter is omitted
+ * from standing instruction create requests. The validator queued a {@code notNull} validation error but passed the
+ * null value to {@code AccountTransferType.fromInt} before throwing, turning a client error into an HTTP 500.
+ */
+class StandingInstructionDataValidatorTest {
+
+    private FromJsonHelper fromJsonHelper;
+    private StandingInstructionDataValidator validator;
+
+    @BeforeEach
+    void setUp() {
+        fromJsonHelper = new FromJsonHelper();
+        validator = new StandingInstructionDataValidator(fromJsonHelper, new AccountTransfersDetailDataValidator(fromJsonHelper));
+    }
+
+    private JsonCommand jsonCommand(String json) {
+        return new JsonCommand(1L, fromJsonHelper.parse(json), fromJsonHelper);
+    }
+
+    @Test
+    void validateForCreateWithoutTransferTypeReportsValidationErrorInsteadOfNpe() {
+        PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
+                () -> validator.validateForCreate(jsonCommand("{}")));
+
+        assertTrue(ex.getErrors().stream().anyMatch(e -> AccountDetailConstants.transferTypeParamName.equals(e.getParameterName())),
+                "Expected validation error for parameter 'transferType'");
+    }
+
+    @Test
+    void validateForCreateWithLoanAccountForAccountTransferReportsTransferTypeError() {
+        String json = """
+                {
+                  "fromOfficeId": 1,
+                  "fromClientId": 1,
+                  "fromAccountId": 1,
+                  "fromAccountType": 1,
+                  "toOfficeId": 1,
+                  "toClientId": 1,
+                  "toAccountId": 2,
+                  "toAccountType": 2,
+                  "transferType": 1,
+                  "priority": 1,
+                  "status": 1,
+                  "instructionType": 1,
+                  "recurrenceType": 1,
+                  "name": "test instruction",
+                  "validFrom": "01 January 2026",
+                  "locale": "en",
+                  "dateFormat": "dd MMMM yyyy"
+                }
+                """;
+
+        PlatformApiDataValidationException ex = assertThrows(PlatformApiDataValidationException.class,
+                () -> validator.validateForCreate(jsonCommand(json)));
+
+        assertTrue(ex.getErrors().stream().anyMatch(e -> AccountDetailConstants.transferTypeParamName.equals(e.getParameterName())),
+                "Expected validation error for parameter 'transferType'");
+    }
+}