fixes from review

vaadin · Jan 25, 2024 · 85dd5f4 · 85dd5f4
1 parent 420ebc3
commit 85dd5f4
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/flow-data/src/main/java/com/vaadin/flow/data/binder/Binder.java b/flow-data/src/main/java/com/vaadin/flow/data/binder/Binder.java
@@ -314,13 +314,8 @@ default boolean isApplied() {
          * @return predicate for testing {@link #isApplied()}
          */
         default SerializablePredicate<Binding<BEAN, TARGET>> getIsAppliedPredicate() {
-            return binding -> {
-                if (binding.getField() instanceof Component) {
-                    return ((Component) binding.getField()).isVisible();
-                } else {
-                    return true;
-                }
-            };
+            return binding -> !(binding.getField() instanceof Component c)
+                    || c.isVisible();
         }
 
         /**
@@ -2403,7 +2398,7 @@ private BinderValidationStatus<BEAN> doWriteIfValid(BEAN bean,
         // First run fields level validation, if no validation errors then
         // update bean
         List<BindingValidationStatus<?>> bindingResults = currentBindings
-                .stream().filter(Binding::isApplied).map(b -> b.validate(false))
+                .stream().map(b -> b.validate(false))
                 .collect(Collectors.toList());
 
         if (bindingResults.stream()

diff --git a/flow-data/src/test/java/com/vaadin/flow/data/binder/BinderTest.java b/flow-data/src/test/java/com/vaadin/flow/data/binder/BinderTest.java
@@ -786,6 +786,30 @@ public void withValidator_isAppliedIsEvaluated() {
         Assert.assertTrue(binder.isValid());
     }
 
+    @Test
+    public void writeBean_isAppliedIsEvaluated() {
+        AtomicInteger invokes = new AtomicInteger();
+
+        binder.forField(nameField).withValidator(name -> false, "")
+                .bind(Person::getFirstName, Person::setFirstName)
+                .setIsAppliedPredicate(p -> {
+                    invokes.incrementAndGet();
+                    return false;
+                });
+
+        binder.readBean(item);
+        nameField.setValue("");
+
+        binder.writeBeanIfValid(item);
+        Assert.assertEquals("writeBeanIfValid should have invoked isApplied", 1,
+                invokes.get());
+
+        binder.writeBeanAsDraft(item);
+        Assert.assertEquals("writeBeanAsDraft should have invoked isApplied", 2,
+                invokes.get());
+
+    }
+
     @Test
     public void setRequired_withErrorMessage_fieldGetsRequiredIndicatorAndValidator() {
         TestTextField textField = new TestTextField();