🦺 Guard against submit handler returning null

rmcdouga · rmcdouga · commit 9572eb603bbe · 2025-12-26T09:44:05.000-05:00
diff --git a/spring/fluentforms-jersey-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyJerseyAfSubmission.java b/spring/fluentforms-jersey-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyJerseyAfSubmission.java
@@ -313,7 +313,7 @@ public Response processRequest(FormDataMultiPart inFormData, HttpHeaders headers
 
 		private Response processSubmission(AfSubmissionHandler handler, FormDataMultiPart inFormData, HttpHeaders headers, String formName) {
 			logger.atInfo().addArgument(handler.getClass().getName()).log("Calling AfSubmissionHandler={}");
-			return formulateResponse(handler.processSubmission(formulateSubmission(inFormData, headers, formName)));
+			return formulateResponse(requireNonNull(handler.processSubmission(formulateSubmission(inFormData, headers, formName)), "SubmissionHandler code cannot return null"));
 		}
 		
 		private String determineFormName(String guideContainerPath) {
diff --git a/spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyAfSubmission.java b/spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyAfSubmission.java
@@ -582,7 +582,7 @@ public ResponseEntity<byte[]> processRequest(MultipartHttpServletRequest inFormD
 	
 		private ResponseEntity<byte[]> processSubmission(AfSubmissionHandler handler, MultipartHttpServletRequest inFormData, String formName) {
 			logger.atInfo().addArgument(handler.getClass().getName()).log("Calling AfSubmissionHandler={}");
-			return formulateResponse(handler.processSubmission(formulateSubmission(inFormData, formName)));
+			return formulateResponse(requireNonNull(handler.processSubmission(formulateSubmission(inFormData, formName)), "SubmissionHandler code cannot return null"));
 		}
 		
 		private String determineFormName(String guideContainerPath) {

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ public Response processRequest(FormDataMultiPart inFormData, HttpHeaders headers`
`313`	`313`
`314`	`314`	`private Response processSubmission(AfSubmissionHandler handler, FormDataMultiPart inFormData, HttpHeaders headers, String formName) {`
`315`	`315`	`logger.atInfo().addArgument(handler.getClass().getName()).log("Calling AfSubmissionHandler={}");`
`316`		`- return formulateResponse(handler.processSubmission(formulateSubmission(inFormData, headers, formName)));`
	`316`	`+ return formulateResponse(requireNonNull(handler.processSubmission(formulateSubmission(inFormData, headers, formName)), "SubmissionHandler code cannot return null"));`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`private String determineFormName(String guideContainerPath) {`
Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ public ResponseEntity<byte[]> processRequest(MultipartHttpServletRequest inFormD`
`582`	`582`
`583`	`583`	`private ResponseEntity<byte[]> processSubmission(AfSubmissionHandler handler, MultipartHttpServletRequest inFormData, String formName) {`
`584`	`584`	`logger.atInfo().addArgument(handler.getClass().getName()).log("Calling AfSubmissionHandler={}");`
`585`		`- return formulateResponse(handler.processSubmission(formulateSubmission(inFormData, formName)));`
	`585`	`+ return formulateResponse(requireNonNull(handler.processSubmission(formulateSubmission(inFormData, formName)), "SubmissionHandler code cannot return null"));`
`586`	`586`	`}`
`587`	`587`
`588`	`588`	`private String determineFormName(String guideContainerPath) {`