refactor!: remove deprecated Material theme variants (#7495)

web-padawan · web-flow · commit 8e86e642b89b · 2025-05-22T15:38:13.000+02:00
diff --git a/vaadin-button-flow-parent/vaadin-button-flow/src/main/java/com/vaadin/flow/component/button/ButtonVariant.java b/vaadin-button-flow-parent/vaadin-button-flow/src/main/java/com/vaadin/flow/component/button/ButtonVariant.java
@@ -30,19 +30,7 @@ public enum ButtonVariant implements ThemeVariant {
     LUMO_WARNING("warning"),
     LUMO_ERROR("error"),
     LUMO_CONTRAST("contrast"),
-    LUMO_ICON("icon"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_CONTAINED("contained"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_OUTLINED("outlined");
+    LUMO_ICON("icon");
 
     private final String variant;
 
diff --git a/vaadin-card-flow-parent/vaadin-card-flow/src/main/java/com/vaadin/flow/component/card/CardVariant.java b/vaadin-card-flow-parent/vaadin-card-flow/src/main/java/com/vaadin/flow/component/card/CardVariant.java
@@ -25,37 +25,7 @@ public enum CardVariant implements ThemeVariant {
     LUMO_OUTLINED("outlined"),
     LUMO_HORIZONTAL("horizontal"),
     LUMO_STRETCH_MEDIA("stretch-media"),
-    LUMO_COVER_MEDIA("cover-media"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_ELEVATED("elevated"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_OUTLINED("outlined"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_HORIZONTAL("horizontal"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_STRETCH_MEDIA("stretch-media"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_COVER_MEDIA("cover-media");
+    LUMO_COVER_MEDIA("cover-media");
 
     private final String variant;
 
diff --git a/vaadin-charts-flow-parent/vaadin-charts-flow/src/main/java/com/vaadin/flow/component/charts/ChartVariant.java b/vaadin-charts-flow-parent/vaadin-charts-flow/src/main/java/com/vaadin/flow/component/charts/ChartVariant.java
@@ -14,25 +14,7 @@
 public enum ChartVariant {
     LUMO_GRADIENT("gradient"),
     LUMO_MONOTONE("monotone"),
-    LUMO_CLASSIC("classic"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_GRADIENT("gradient"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_MONOTONE("monotone"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_CLASSIC("classic");
+    LUMO_CLASSIC("classic");
 
     private final String variant;
 
diff --git a/vaadin-checkbox-flow-parent/vaadin-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroupVariant.java b/vaadin-checkbox-flow-parent/vaadin-checkbox-flow/src/main/java/com/vaadin/flow/component/checkbox/CheckboxGroupVariant.java
@@ -21,14 +21,7 @@
  * Set of theme variants applicable for {@code vaadin-checkbox-group} component.
  */
 public enum CheckboxGroupVariant implements ThemeVariant {
-    LUMO_VERTICAL("vertical"),
-    LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_VERTICAL("vertical");
+    LUMO_VERTICAL("vertical"), LUMO_HELPER_ABOVE_FIELD("helper-above-field");
 
     private final String variant;
 
diff --git a/vaadin-combo-box-flow-parent/vaadin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/ComboBoxVariant.java b/vaadin-combo-box-flow-parent/vaadin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/ComboBoxVariant.java
@@ -25,13 +25,7 @@ public enum ComboBoxVariant implements ThemeVariant {
     LUMO_ALIGN_LEFT("align-left"),
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
-    LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
+    LUMO_HELPER_ABOVE_FIELD("helper-above-field");
 
     private final String variant;
 
diff --git a/vaadin-combo-box-flow-parent/vaadin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/MultiSelectComboBoxVariant.java b/vaadin-combo-box-flow-parent/vaadin-combo-box-flow/src/main/java/com/vaadin/flow/component/combobox/MultiSelectComboBoxVariant.java
@@ -26,13 +26,7 @@ public enum MultiSelectComboBoxVariant implements ThemeVariant {
     LUMO_ALIGN_LEFT("align-left"),
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
-    LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
+    LUMO_HELPER_ABOVE_FIELD("helper-above-field");
 
     private final String variant;
 
diff --git a/vaadin-date-picker-flow-parent/vaadin-date-picker-flow/src/main/java/com/vaadin/flow/component/datepicker/DatePickerVariant.java b/vaadin-date-picker-flow-parent/vaadin-date-picker-flow/src/main/java/com/vaadin/flow/component/datepicker/DatePickerVariant.java
@@ -25,13 +25,7 @@ public enum DatePickerVariant implements ThemeVariant {
     LUMO_ALIGN_LEFT("align-left"),
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
-    LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
+    LUMO_HELPER_ABOVE_FIELD("helper-above-field");
 
     private final String variant;
 
diff --git a/vaadin-date-picker-flow-parent/vaadin-date-picker-flow/src/test/java/com/vaadin/flow/component/datepicker/DatePickerVariantTest.java b/vaadin-date-picker-flow-parent/vaadin-date-picker-flow/src/test/java/com/vaadin/flow/component/datepicker/DatePickerVariantTest.java
@@ -67,14 +67,6 @@ public void addLumoHelperAboveField_themeAttributeUpdated() {
         assertThemeAttribute("helper-above-field");
     }
 
-    @Test
-    public void addMaterialAlwaysFloatLabel_themeAttributeUpdated() {
-        assertThemeAttribute(null);
-        datePicker.addThemeVariants(
-                DatePickerVariant.MATERIAL_ALWAYS_FLOAT_LABEL);
-        assertThemeAttribute("always-float-label");
-    }
-
     @Test
     public void addAndRemoveMultipleVariants_themeAttributeUpdated() {
         assertThemeAttribute(null);
diff --git a/vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerVariant.java b/vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow/src/main/java/com/vaadin/flow/component/datetimepicker/DateTimePickerVariant.java
@@ -26,13 +26,7 @@ public enum DateTimePickerVariant implements ThemeVariant {
     LUMO_ALIGN_LEFT("align-left"),
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
-    LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
+    LUMO_HELPER_ABOVE_FIELD("helper-above-field");
 
     private final String variant;
 
diff --git a/vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow/src/test/java/com/vaadin/flow/component/datetimepicker/DateTimePickerVariantTest.java b/vaadin-date-time-picker-flow-parent/vaadin-date-time-picker-flow/src/test/java/com/vaadin/flow/component/datetimepicker/DateTimePickerVariantTest.java
@@ -70,14 +70,6 @@ public void addLumoHelperAboveField_themeAttributeUpdated() {
         assertThemeAttribute("helper-above-field");
     }
 
-    @Test
-    public void addMaterialAlwaysFloatLabel_themeAttributeUpdated() {
-        assertThemeAttribute(null);
-        dateTimePicker.addThemeVariants(
-                DateTimePickerVariant.MATERIAL_ALWAYS_FLOAT_LABEL);
-        assertThemeAttribute("always-float-label");
-    }
-
     @Test
     public void addAndRemoveMultipleVariants_themeAttributeUpdated() {
         assertThemeAttribute(null);
diff --git a/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/DialogVariant.java b/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/main/java/com/vaadin/flow/component/dialog/DialogVariant.java
@@ -21,13 +21,7 @@
  * Set of theme variants applicable for {@code vaadin-dialog} component.
  */
 public enum DialogVariant implements ThemeVariant {
-    LUMO_NO_PADDING("no-padding"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_NO_PADDING("no-padding");
+    LUMO_NO_PADDING("no-padding");
 
     private final String variant;
 
diff --git a/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/test/java/com/vaadin/flow/component/dialog/DialogThemeVariantTest.java b/vaadin-dialog-flow-parent/vaadin-dialog-flow/src/test/java/com/vaadin/flow/component/dialog/DialogThemeVariantTest.java
@@ -32,15 +32,6 @@ public void addAndRemoveLumoNoPaddingVariant_themeAttributeUpdated() {
         assertThemeAttribute(null);
     }
 
-    @Test
-    public void addAndRemoveMaterialNoPaddingVariant_themeAttributeUpdated() {
-        assertThemeAttribute(null);
-        dialog.addThemeVariants(DialogVariant.MATERIAL_NO_PADDING);
-        assertThemeAttribute("no-padding");
-        dialog.removeThemeVariants(DialogVariant.MATERIAL_NO_PADDING);
-        assertThemeAttribute(null);
-    }
-
     private void assertThemeAttribute(String expected) {
         String actual = dialog.getThemeName();
         assertEquals("Unexpected theme attribute on dialog", expected, actual);
diff --git a/vaadin-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/GridVariant.java b/vaadin-grid-flow-parent/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/GridVariant.java
@@ -24,13 +24,7 @@ public enum GridVariant {
     LUMO_COLUMN_BORDERS("column-borders"),
     LUMO_ROW_STRIPES("row-stripes"),
     LUMO_COMPACT("compact"),
-    LUMO_WRAP_CELL_CONTENT("wrap-cell-content"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_COLUMN_DIVIDERS("column-dividers");
+    LUMO_WRAP_CELL_CONTENT("wrap-cell-content");
 
     private final String variant;
 
diff --git a/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow/src/main/java/com/vaadin/flow/component/gridpro/GridProVariant.java b/vaadin-grid-pro-flow-parent/vaadin-grid-pro-flow/src/main/java/com/vaadin/flow/component/gridpro/GridProVariant.java
@@ -18,12 +18,6 @@ public enum GridProVariant {
     LUMO_ROW_STRIPES("row-stripes"),
     LUMO_COMPACT("compact"),
     LUMO_WRAP_CELL_CONTENT("wrap-cell-content"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_COLUMN_DIVIDERS("column-dividers"),
     LUMO_HIGHLIGHT_EDITABLE_CELLS("highlight-editable-cells"),
     LUMO_HIGHLIGHT_READ_ONLY_CELLS("highlight-read-only-cells");
 
diff --git a/vaadin-menu-bar-flow-parent/vaadin-menu-bar-flow/src/main/java/com/vaadin/flow/component/menubar/MenuBarVariant.java b/vaadin-menu-bar-flow-parent/vaadin-menu-bar-flow/src/main/java/com/vaadin/flow/component/menubar/MenuBarVariant.java
@@ -29,25 +29,7 @@ public enum MenuBarVariant implements ThemeVariant {
     LUMO_CONTRAST("contrast"),
     LUMO_ICON("icon"),
     LUMO_END_ALIGNED("end-aligned"),
-    LUMO_DROPDOWN_INDICATORS("dropdown-indicators"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_CONTAINED("contained"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_OUTLINED("outlined"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_END_ALIGNED("end-aligned");
+    LUMO_DROPDOWN_INDICATORS("dropdown-indicators");
 
     private final String variant;
 
diff --git a/vaadin-popover-flow-parent/vaadin-popover-flow/src/main/java/com/vaadin/flow/component/popover/PopoverVariant.java b/vaadin-popover-flow-parent/vaadin-popover-flow/src/main/java/com/vaadin/flow/component/popover/PopoverVariant.java
@@ -21,14 +21,7 @@
  * Set of theme variants applicable for the {@link Popover} component.
  */
 public enum PopoverVariant implements ThemeVariant {
-    ARROW("arrow"),
-    LUMO_NO_PADDING("no-padding"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_NO_PADDING("no-padding");
+    ARROW("arrow"), LUMO_NO_PADDING("no-padding");
 
     private final String variant;
 
diff --git a/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioGroupVariant.java b/vaadin-radio-button-flow-parent/vaadin-radio-button-flow/src/main/java/com/vaadin/flow/component/radiobutton/RadioGroupVariant.java
@@ -21,14 +21,7 @@
  * Set of theme variants applicable for {@code vaadin-radio-group} component.
  */
 public enum RadioGroupVariant implements ThemeVariant {
-    LUMO_VERTICAL("vertical"),
-    LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_VERTICAL("vertical");
+    LUMO_VERTICAL("vertical"), LUMO_HELPER_ABOVE_FIELD("helper-above-field");
 
     private final String variant;
 
diff --git a/vaadin-rich-text-editor-flow-parent/vaadin-rich-text-editor-flow/src/main/java/com/vaadin/flow/component/richtexteditor/RichTextEditorVariant.java b/vaadin-rich-text-editor-flow-parent/vaadin-rich-text-editor-flow/src/main/java/com/vaadin/flow/component/richtexteditor/RichTextEditorVariant.java
@@ -15,14 +15,7 @@
  * component.
  */
 public enum RichTextEditorVariant implements ThemeVariant {
-    LUMO_NO_BORDER("no-border"),
-    LUMO_COMPACT("compact"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_NO_BORDER("no-border");
+    LUMO_NO_BORDER("no-border"), LUMO_COMPACT("compact");
 
     private final String variant;
 
diff --git a/vaadin-select-flow-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/SelectVariant.java b/vaadin-select-flow-parent/vaadin-select-flow/src/main/java/com/vaadin/flow/component/select/SelectVariant.java
@@ -25,13 +25,7 @@ public enum SelectVariant implements ThemeVariant {
     LUMO_ALIGN_LEFT("align-left"),
     LUMO_ALIGN_CENTER("align-center"),
     LUMO_ALIGN_RIGHT("align-right"),
-    LUMO_HELPER_ABOVE_FIELD("helper-above-field"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_ALWAYS_FLOAT_LABEL("always-float-label");
+    LUMO_HELPER_ABOVE_FIELD("helper-above-field");
 
     private final String variant;
 
diff --git a/vaadin-select-flow-parent/vaadin-select-flow/src/test/java/com/vaadin/flow/component/select/SelectVariantTest.java b/vaadin-select-flow-parent/vaadin-select-flow/src/test/java/com/vaadin/flow/component/select/SelectVariantTest.java
@@ -67,13 +67,6 @@ public void addLumoHelperAboveField_themeAttributeUpdated() {
         assertThemeAttribute("helper-above-field");
     }
 
-    @Test
-    public void addMaterialAlwaysFloatLabel_themeAttributeUpdated() {
-        assertThemeAttribute(null);
-        select.addThemeVariants(SelectVariant.MATERIAL_ALWAYS_FLOAT_LABEL);
-        assertThemeAttribute("always-float-label");
-    }
-
     @Test
     public void addAndRemoveMultipleVariants_themeAttributeUpdated() {
         assertThemeAttribute(null);
diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheetVariant.java b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabSheetVariant.java
@@ -33,19 +33,7 @@ public enum TabSheetVariant implements ThemeVariant {
     LUMO_TABS_HIDE_SCROLL_BUTTONS("hide-scroll-buttons"),
     LUMO_TABS_EQUAL_WIDTH_TABS("equal-width-tabs"),
     LUMO_BORDERED("bordered"),
-    LUMO_NO_PADDING("no-padding"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_TABS_FIXED("fixed"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_BORDERED("bordered");
+    LUMO_NO_PADDING("no-padding");
 
     private final String variant;
 
diff --git a/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabsVariant.java b/vaadin-tabs-flow-parent/vaadin-tabs-flow/src/main/java/com/vaadin/flow/component/tabs/TabsVariant.java
@@ -31,13 +31,7 @@ public enum TabsVariant implements ThemeVariant {
     LUMO_SMALL("small"),
     LUMO_MINIMAL("minimal"),
     LUMO_HIDE_SCROLL_BUTTONS("hide-scroll-buttons"),
-    LUMO_EQUAL_WIDTH_TABS("equal-width-tabs"),
-    /**
-     * @deprecated Since 24.7, the Material theme is deprecated and will be
-     *             removed in Vaadin 25.
-     */
-    @Deprecated
-    MATERIAL_FIXED("fixed");
+    LUMO_EQUAL_WIDTH_TABS("equal-width-tabs");
 
     private final String variant;
 
diff --git a/vaadin-text-field-flow-parent/vaadin-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextAreaVariant.java b/vaadin-text-field-flow-parent/vaadin-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextAreaVariant.java
diff --git a/vaadin-text-field-flow-parent/vaadin-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextFieldVariant.java b/vaadin-text-field-flow-parent/vaadin-text-field-flow/src/main/java/com/vaadin/flow/component/textfield/TextFieldVariant.java
diff --git a/vaadin-time-picker-flow-parent/vaadin-time-picker-flow/src/main/java/com/vaadin/flow/component/timepicker/TimePickerVariant.java b/vaadin-time-picker-flow-parent/vaadin-time-picker-flow/src/main/java/com/vaadin/flow/component/timepicker/TimePickerVariant.java
diff --git a/vaadin-time-picker-flow-parent/vaadin-time-picker-flow/src/test/java/com/vaadin/flow/component/timepicker/tests/TimePickerVariantTest.java b/vaadin-time-picker-flow-parent/vaadin-time-picker-flow/src/test/java/com/vaadin/flow/component/timepicker/tests/TimePickerVariantTest.java
