fix(#7): Исправления кода проверок идентификаторов форм по результатам

ревью - Код стал быстрее и понятнее
1C-Company · Aug 10, 2022 · 7c7e0a8 · 7c7e0a8
1 parent b39e293
commit 7c7e0a8
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/...es/com.e1c.dt.check.form/src/com/e1c/dt/check/internal/form/InvalidItemIdServiceImpl.java b/...es/com.e1c.dt.check.form/src/com/e1c/dt/check/internal/form/InvalidItemIdServiceImpl.java
@@ -132,8 +132,8 @@ public Map<FormItem, String> validate(Form form)
             .entrySet()
             .stream()
             .filter(idAndItems -> idAndItems.getValue().size() > 1);
-        Stream<Map.Entry<FormItem, String>> duplicateIdIssues = duplicateIdAndItems.flatMap(idAndItems -> idAndItems
-            .getValue()
+        Stream<Map.Entry<FormItem, String>> duplicateIdIssues =
+            duplicateIdAndItems.flatMap(idAndItems -> idAndItems.getValue()
                 .stream()
                 .skip(1)
                 .map(item -> new AbstractMap.SimpleEntry<>(item, MessageFormat
@@ -180,13 +180,8 @@ private Optional<Integer> calculateNewIdFor(FormItem item)
             return Optional.of(-1);
         }
         IBmObject topObject = item.bmGetTopObject();
-        if (!(topObject instanceof Form))
-        {
-            return Optional.empty();
-        }
-        Form form = (Form)item.bmGetTopObject();
-        int newValue = formIdentifierService.getNextItemId(form);
-        return Optional.of(newValue);
+        return topObject instanceof Form ? Optional.of(formIdentifierService.getNextItemId((Form)topObject))
+            : Optional.empty();
     }
 
 }