put changes behing the feature flag

vaadin · Aug 15, 2022 · 64f077a · 64f077a
1 parent 871a756
commit 64f077a
Showing 1 changed file with 42 additions and 12 deletions.
diff --git a/...aadin-time-picker-flow/src/main/java/com/vaadin/flow/component/timepicker/TimePicker.java b/...aadin-time-picker-flow/src/main/java/com/vaadin/flow/component/timepicker/TimePicker.java
@@ -23,6 +23,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.vaadin.experimental.Feature;
+import com.vaadin.experimental.FeatureFlags;
 import com.vaadin.flow.component.AttachEvent;
 import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.shared.ClientValidationUtil;
@@ -119,7 +121,9 @@ private TimePicker(LocalTime time, boolean isInitialValueOptional) {
 
         addValueChangeListener(e -> validate());
 
-        addClientValidatedEventListener(event -> validate());
+        if (getFeatureFlags().isEnabled(FeatureFlags.ENFORCE_FIELD_VALIDATION)) {
+            addClientValidatedEventListener(event -> validate());
+        }
     }
 
     /**
@@ -276,24 +280,34 @@ public boolean isInvalid() {
 
     @Override
     public Validator<LocalTime> getDefaultValidator() {
-        return (value, context) -> checkValidity(value);
+        if (getFeatureFlags().isEnabled(FeatureFlags.ENFORCE_FIELD_VALIDATION)) {
+            return (value, context) -> checkValidity(value);
+        }
+
+        return Validator.alwaysPass();
     }
 
     @Override
     public Registration addValidationStatusChangeListener(
             ValidationStatusChangeListener<LocalTime> listener) {
-        return addClientValidatedEventListener(event -> {
-            listener.validationStatusChanged(
-                    new ValidationStatusChangeEvent<LocalTime>(this,
-                            !isInvalid()));
-        });
+        if (getFeatureFlags().isEnabled(FeatureFlags.ENFORCE_FIELD_VALIDATION)) {
+            return addClientValidatedEventListener(event -> {
+                listener.validationStatusChanged(
+                        new ValidationStatusChangeEvent<LocalTime>(this,
+                                !isInvalid()));
+            });
+        }
+
+        return null;
     }
 
     private ValidationResult checkValidity(LocalTime value) {
-        var hasNonParsableValue = value == getEmptyValue()
-                && isInputValuePresent();
-        if (hasNonParsableValue) {
-            return ValidationResult.error("");
+        if (getFeatureFlags().isEnabled(FeatureFlags.ENFORCE_FIELD_VALIDATION)) {
+            var hasNonParsableValue = value == getEmptyValue()
+                    && isInputValuePresent();
+            if (hasNonParsableValue) {
+                return ValidationResult.error("");
+            }
         }
 
         var greaterThanMaxValidation = ValidationUtil.checkGreaterThanMax(value,
@@ -469,7 +483,23 @@ protected void onAttach(AttachEvent attachEvent) {
         super.onAttach(attachEvent);
         initConnector();
         requestLocaleUpdate();
-        ClientValidationUtil.preventWebComponentFromSettingItselfToValid(this);
+        if (getFeatureFlags().isEnabled(FeatureFlags.ENFORCE_FIELD_VALIDATION)) {
+            ClientValidationUtil.preventWebComponentFromSettingItselfToValid(this);
+        } else {
+            FieldValidationUtil.disableClientValidation(this);
+        }
+    }
+
+    /**
+     * Gets the feature flags for the current UI.
+     * <p>
+     * Extracted with protected visibility to support mocking
+     *
+     * @return the current set of feature flags
+     */
+    private FeatureFlags getFeatureFlags() {
+        return FeatureFlags
+                .get(UI.getCurrent().getSession().getService().getContext());
     }
 
     private void initConnector() {