Skip to content

Commit 33555df

Browse files
committed
🦺 Add null checking into AF submission processing
While missing parts should never happen, I've added it in, just in case. This will help later if null annotations are added.
1 parent 9b15ce3 commit 33555df

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

‎spring/fluentforms-jersey-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyJerseyAfSubmission.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com._4point.aem.fluentforms.spring;
22

3+
import static java.util.Objects.requireNonNull;
4+
35
import java.io.ByteArrayInputStream;
46
import java.io.ByteArrayOutputStream;
57
import java.io.IOException;
@@ -338,9 +340,9 @@ class ExtractedData {
338340
"jcr:data", (dataBytes)->{ extractedData.formData = new String(dataBytes, StandardCharsets.UTF_8); return null; }
339341
);
340342
transformFormData(inFormData, fieldFunctions, logger);
341-
return new AfSubmissionHandler.Submission(extractedData.formData,
343+
return new AfSubmissionHandler.Submission(requireNonNull(extractedData.formData, "Form data (jcr:data) part not found in Adaptive Form submission."),
342344
formName,
343-
extractedData.redirectUrl,
345+
requireNonNull(extractedData.redirectUrl, "Redirect URL (:redirect) part not found in Adaptive Form submission."),
344346
transferHeaders(headers)
345347
);
346348
}

‎spring/fluentforms-spring-boot-autoconfigure/src/main/java/com/_4point/aem/fluentforms/spring/AemProxyAfSubmission.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com._4point.aem.fluentforms.spring;
22

3+
import static java.util.Objects.requireNonNull;
4+
35
import java.io.IOException;
46
import java.io.UncheckedIOException;
57
import java.net.URI;
@@ -615,9 +617,9 @@ class ExtractedData {
615617
"jcr:data", (dataBytes)->{ extractedData.formData = new String(dataBytes, StandardCharsets.UTF_8); return null; }
616618
);
617619
transformFormData(inFormData, fieldFunctions, logger);
618-
return new AfSubmissionHandler.Submission(extractedData.formData,
620+
return new AfSubmissionHandler.Submission(requireNonNull(extractedData.formData, "Form data (jcr:data) part not found in Adaptive Form submission."),
619621
formName,
620-
extractedData.redirectUrl,
622+
requireNonNull(extractedData.redirectUrl, "Redirect URL (:redirect) part not found in Adaptive Form submission."),
621623
transferHeaders(inFormData.getRequestHeaders())
622624
);
623625
}

0 commit comments

Comments
 (0)