From 0a339688cd2994f9ee1d612c918b4369868e546b Mon Sep 17 00:00:00 2001
From: AKurakin <akurakin@mfd.ru>
Date: Fri, 26 May 2023 19:54:42 +0300
Subject: [PATCH] backend-api http://jira.mfd.msk:8088/browse/CLS-331 fix NPE

---
 .../service/validation/ActionMetaValidation.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java
index c9d171354..e74398bf2 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java
@@ -63,8 +63,12 @@ public class ActionMetaValidation implements InitializingBean {
         return null;
     }
 
+    static boolean isTrue(Boolean b) {
+        return b!=null && b;
+    }
+
     private <T extends Object> Function<T, IValidator> validatorConstructor(ObjectExtracted metaAction) {
-        if (!metaAction.getFields().stream().anyMatch(field -> field.getField().isRequired())) {
+        if (!metaAction.getFields().stream().anyMatch(field -> isTrue(field.getField().isRequired()))) {
             log.debug("Action {}: no any required fields. Do not need validator.", metaAction.getClassName());
             // нет обязательных полей для валидации
             return null;
@@ -79,7 +83,7 @@ public class ActionMetaValidation implements InitializingBean {
             }
             for (FieldExtracted field : metaAction.getFields()) {
                 try {
-                    if (field.getField().isRequired() != null && field.getField().isRequired()) {
+                    if (isTrue(field.getField().isRequired())) {
                         Object value = field.extractValue(object);
                     }
                 } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
@@ -111,7 +115,7 @@ public class ActionMetaValidation implements InitializingBean {
             IAction object = context.getValidatedObject();
             for (FieldExtracted field : metaAction.getFields()) {
                 try {
-                    if (field.getField().isRequired() != null && field.getField().isRequired()) {
+                    if (isTrue(field.getField().isRequired())) {
                         Object value = field.extractValue(object);
                         if (value == null)
                             return of(BackEndError.ValidationError, field.getMemberName());