diff --git a/pom.xml b/pom.xml
index 0191837600..f25775832f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,8 @@
 
         <drivers.dir>${project.basedir}/drivers</drivers.dir>
         <drivers.downloader.phase>pre-integration-test</drivers.downloader.phase>
+
+        <spotless.plugin.version>3.1.0</spotless.plugin.version>
     </properties>
 
     <!-- tag::spring-version[] -->
@@ -217,13 +219,17 @@
             </plugin>
 
             <plugin>
-                <groupId>net.revelc.code.formatter</groupId>
-                <artifactId>formatter-maven-plugin</artifactId>
-                <version>2.24.1</version>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>${spotless.plugin.version}</version>
                 <configuration>
-                    <configFile>https://raw.githubusercontent.com/vaadin/flow/main/eclipse/VaadinJavaConventions.xml</configFile>
-                    <skipHtmlFormatting>true</skipHtmlFormatting>
-                    <lineEnding>LF</lineEnding>
+                    <java>
+                        <eclipse>
+                            <file>https://raw.githubusercontent.com/vaadin/flow/main/eclipse/VaadinJavaConventions.xml</file>
+                        </eclipse>
+                        <endWithNewline/>
+                        <removeUnusedImports/>
+                    </java>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/ChangeEvent.java b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/ChangeEvent.java
index f4c618e3b8..8facb61a8e 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/ChangeEvent.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/ChangeEvent.java
@@ -7,5 +7,5 @@ public class ChangeEvent extends ComponentEvent<TextField> {
     public ChangeEvent(TextField source, boolean fromClient) {
         super(source, fromClient);
     }
-    
+
 }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/CustomTextField.java b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/CustomTextField.java
index 3710ac72f3..988b548920 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/CustomTextField.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/CustomTextField.java
@@ -5,9 +5,9 @@
 public class CustomTextField extends LabeledTextField {
 
     private final Element errorElement = new Element("span");
-    
+
     public CustomTextField() {
         super();
         getElement().appendChild(errorElement);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/LabeledTextField.java b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/LabeledTextField.java
index 4647fbc33e..220685e292 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/LabeledTextField.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/LabeledTextField.java
@@ -13,4 +13,4 @@ public class LabeledTextField extends Component {
     public LabeledTextField() {
         getElement().appendChild(labelElement, inputElement);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/SetIdView.java b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/SetIdView.java
index 4373613661..cb6a1da9d3 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/SetIdView.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/SetIdView.java
@@ -5,10 +5,10 @@
 public class SetIdView extends VerticalLayout {
 
     public SetIdView() {
-// tag::id[]
+        // tag::id[]
         var component = new ShoppingCartSummaryLabel();
         component.setId("my-component");
-// end::id[]
+        // end::id[]
     }
-    
+
 }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/ShoppingCartSummaryLabel.java b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/ShoppingCartSummaryLabel.java
index fc37c5d107..638207e521 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/ShoppingCartSummaryLabel.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/ShoppingCartSummaryLabel.java
@@ -16,13 +16,15 @@ public class ShoppingCartSummaryLabel extends Component {
     @Override
     protected void onAttach(AttachEvent attachEvent) {
         // This assumes the session already contains a ShopEventBus
-        var eventBus = attachEvent.getSession().getAttribute(ShopEventBus.class);
+        var eventBus = attachEvent.getSession()
+                .getAttribute(ShopEventBus.class);
         eventBus.register(eventHandler);
     }
 
     @Override
     protected void onDetach(DetachEvent detachEvent) {
-        var eventBus = detachEvent.getSession().getAttribute(ShopEventBus.class);
+        var eventBus = detachEvent.getSession()
+                .getAttribute(ShopEventBus.class);
         eventBus.unregister(eventHandler);
     }
 
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/TextField.java b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/TextField.java
index e91085a1ea..1e7b337530 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/TextField.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/TextField.java
@@ -15,10 +15,11 @@
 public class TextField extends Component {
 
     public TextField(String value) {
-        getElement().setProperty("value",value);
+        getElement().setProperty("value", value);
     }
-// end::basic[]
-// tag::events[]
+
+    // end::basic[]
+    // tag::events[]
     @Synchronize("change")
     public String getValue() {
         return getElement().getProperty("value");
@@ -33,7 +34,7 @@ public Registration addValueChangeListener(
             ComponentEventListener<ChangeEvent> listener) {
         return addListener(ChangeEvent.class, listener);
     }
-// end::events[]
-// tag::basic[]
+    // end::events[]
+    // tag::basic[]
 }
 // end::basic[]
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/UserNameLabel.java b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/UserNameLabel.java
index ff4d1d8d3a..73e56f5afc 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/basics/UserNameLabel.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/basics/UserNameLabel.java
@@ -10,7 +10,8 @@ public class UserNameLabel extends Component {
     @Override
     protected void onAttach(AttachEvent attachEvent) {
         // This assumes the username has been stored in the session after login
-        String userName = (String) attachEvent.getSession().getAttribute("username");
+        String userName = (String) attachEvent.getSession()
+                .getAttribute("username");
         getElement().setText("Hello %s, weclome back!".formatted(userName));
     }
 }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/element/UserInputExample.java b/src/main/java/com/vaadin/demo/reference/componentinternals/element/UserInputExample.java
index c98df35a2b..9af17f596f 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/element/UserInputExample.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/element/UserInputExample.java
@@ -14,7 +14,8 @@ public UserInputExample() {
         textInput.setAttribute("placeholder", "Enter your name");
         // end::create[]
         // tag::listen[]
-        textInput.addPropertyChangeListener("value", "change", e -> {});
+        textInput.addPropertyChangeListener("value", "change", e -> {
+        });
         // end::listen[]
 
         // tag::process[]
@@ -25,7 +26,7 @@ public UserInputExample() {
             getElement().appendChild(response);
         });
         // end::process[]
-        
+
         getElement().appendChild(textInput, button);
     }
 }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/events/ChangeEvent.java b/src/main/java/com/vaadin/demo/reference/componentinternals/events/ChangeEvent.java
index f34fabe1b8..5b28f0b3ec 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/events/ChangeEvent.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/events/ChangeEvent.java
@@ -6,5 +6,5 @@ public class ChangeEvent extends ComponentEvent<TextField> {
 
     public ChangeEvent(TextField source, boolean fromClient) {
         super(source, fromClient);
-    }    
+    }
 }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ChangeEvent.java b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ChangeEvent.java
index d55af4a2a4..cd3b789c43 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ChangeEvent.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ChangeEvent.java
@@ -9,4 +9,4 @@ public class ChangeEvent extends ComponentEvent<TextField> {
     public ChangeEvent(TextField source, boolean fromClient) {
         super(source, fromClient);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ClickEvent.java b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ClickEvent.java
index 303651448f..4a9103cb2e 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ClickEvent.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ClickEvent.java
@@ -10,12 +10,12 @@ public class ClickEvent extends ComponentEvent<NativeButton> {
 
     private final int button;
 
-    public ClickEvent(NativeButton source, boolean fromClient, 
+    public ClickEvent(NativeButton source, boolean fromClient,
             @EventData("event.button") int button) {
         super(source, fromClient);
         this.button = button;
     }
-    
+
     public int getButton() {
         return button;
     }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ContinuousInputEvent.java b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ContinuousInputEvent.java
index 4105d7d950..630afc5a71 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ContinuousInputEvent.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/ContinuousInputEvent.java
@@ -6,16 +6,18 @@
 import com.vaadin.flow.component.EventData;
 import com.vaadin.flow.dom.DebouncePhase;
 
+// @formatter:off hidden-source-line
 @DomEvent(
-    value = "input", 
+    value = "input",
     debounce = @DebounceSettings(
-        timeout = 500, 
-        phases = { 
+        timeout = 500,
+        phases = {
             DebouncePhase.LEADING,
-            DebouncePhase.INTERMEDIATE 
+            DebouncePhase.INTERMEDIATE
         }
     )
 )
+// @formatter:on hidden-source-line
 public class ContinuousInputEvent extends ComponentEvent<TextField> {
 
     private final String value;
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/InputEvent.java b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/InputEvent.java
index acec671aea..0ea4234816 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/InputEvent.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/InputEvent.java
@@ -6,6 +6,7 @@
 import com.vaadin.flow.component.EventData;
 import com.vaadin.flow.dom.DebouncePhase;
 
+// @formatter:off hidden-source-line
 @DomEvent(
     value = "input",
     debounce = @DebounceSettings(
@@ -13,16 +14,17 @@
         phases = DebouncePhase.TRAILING
     )
 )
+// @formatter:on hidden-source-line
 public class InputEvent extends ComponentEvent<TextField> {
 
     private final String value;
 
-    public InputEvent(TextField source, boolean fromClient, 
+    public InputEvent(TextField source, boolean fromClient,
             @EventData("element.value") String value) {
         super(source, fromClient);
         this.value = value;
     }
-    
+
     public String getValue() {
         return value;
     }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/TextField.java b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/TextField.java
index 8b07623d3e..1f45a6106c 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/TextField.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/events/dom/TextField.java
@@ -5,5 +5,5 @@
 
 @Tag("input")
 public class TextField extends Component {
-   
-}
\ No newline at end of file
+
+}
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/properties/annotation/TextField.java b/src/main/java/com/vaadin/demo/reference/componentinternals/properties/annotation/TextField.java
index 60f817be38..3e58e12ff5 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/properties/annotation/TextField.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/properties/annotation/TextField.java
@@ -7,7 +7,7 @@
 @Tag("input")
 public class TextField extends Component {
 
-// tag::property[]
+    // tag::property[]
     @Synchronize("change")
     public String getValue() {
         return getElement().getProperty("value");
@@ -16,5 +16,5 @@ public String getValue() {
     public void setValue(String value) {
         getElement().setProperty("value", value);
     }
-// end::property[]
+    // end::property[]
 }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/properties/element/TextField.java b/src/main/java/com/vaadin/demo/reference/componentinternals/properties/element/TextField.java
index 471d6194d6..d11c014f0a 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/properties/element/TextField.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/properties/element/TextField.java
@@ -6,7 +6,7 @@
 @Tag("input")
 public class TextField extends Component {
 
-// tag::property[]
+    // tag::property[]
     public TextField() {
         getElement().addPropertyChangeListener("value", "change", e -> {
         });
@@ -19,5 +19,5 @@ public String getValue() {
     public void setValue(String value) {
         getElement().setProperty("value", value);
     }
-// end::property[]
+    // end::property[]
 }
diff --git a/src/main/java/com/vaadin/demo/reference/componentinternals/properties/helper/TextField.java b/src/main/java/com/vaadin/demo/reference/componentinternals/properties/helper/TextField.java
index 7f15f68792..baccd38581 100644
--- a/src/main/java/com/vaadin/demo/reference/componentinternals/properties/helper/TextField.java
+++ b/src/main/java/com/vaadin/demo/reference/componentinternals/properties/helper/TextField.java
@@ -9,9 +9,9 @@
 
 @Tag("input")
 public class TextField extends Component {
-// tag::property[]    
-    private static final PropertyDescriptor<String, String> VALUE 
-        = PropertyDescriptors.propertyWithDefault("value", "");
+    // tag::property[]
+    private static final PropertyDescriptor<String, String> VALUE = PropertyDescriptors
+            .propertyWithDefault("value", "");
 
     public String getValue() {
         return get(VALUE);
@@ -20,11 +20,11 @@ public String getValue() {
     public void setValue(String value) {
         set(VALUE, value);
     }
-// end::property[]
+    // end::property[]
 
-// tag::attribute[]
-    private static final PropertyDescriptor<String, Optional<String>> PLACEHOLDER 
-        = PropertyDescriptors.optionalAttributeWithDefault("placeholder", "");
+    // tag::attribute[]
+    private static final PropertyDescriptor<String, Optional<String>> PLACEHOLDER = PropertyDescriptors
+            .optionalAttributeWithDefault("placeholder", "");
 
     public Optional<String> getPlaceholder() {
         return get(PLACEHOLDER);
@@ -33,5 +33,5 @@ public Optional<String> getPlaceholder() {
     public void setPlaceholder(String placeholder) {
         set(PLACEHOLDER, placeholder);
     }
-// end::attribute[]
+    // end::attribute[]
 }
diff --git a/src/test/java/com/vaadin/demo/reference/componentinternals/element/AttributeTest.java b/src/test/java/com/vaadin/demo/reference/componentinternals/element/AttributeTest.java
index 326736e494..9c9c5c631f 100644
--- a/src/test/java/com/vaadin/demo/reference/componentinternals/element/AttributeTest.java
+++ b/src/test/java/com/vaadin/demo/reference/componentinternals/element/AttributeTest.java
@@ -11,7 +11,7 @@
 import com.vaadin.flow.dom.ElementFactory;
 
 public class AttributeTest {
-    
+
     @Test
     public void demonstrate_working_with_attributes() {
         // tag::set[]
@@ -27,13 +27,13 @@ public void demonstrate_working_with_attributes() {
         assertTrue(nameField.hasAttribute("autofocus"));
 
         // Remove the "autofocus" attribute
-        assertEquals(List.of("autofocus", "id", "placeholder"), 
-            nameField.getAttributeNames().toList());
+        assertEquals(List.of("autofocus", "id", "placeholder"),
+                nameField.getAttributeNames().toList());
 
         nameField.removeAttribute("autofocus");
-        
-        assertEquals(List.of("id", "placeholder"), 
-            nameField.getAttributeNames().toList());
+
+        assertEquals(List.of("id", "placeholder"),
+                nameField.getAttributeNames().toList());
         // end::getchange[]
     }
 }
diff --git a/src/test/java/com/vaadin/demo/reference/componentinternals/element/PropertyTest.java b/src/test/java/com/vaadin/demo/reference/componentinternals/element/PropertyTest.java
index 78d7652702..b95443d705 100644
--- a/src/test/java/com/vaadin/demo/reference/componentinternals/element/PropertyTest.java
+++ b/src/test/java/com/vaadin/demo/reference/componentinternals/element/PropertyTest.java
@@ -50,7 +50,7 @@ public void demonstrate_setPropertyJson() {
         items.add("Option 1");
         items.add("Option 2");
         items.add("Option 3");
-        element.setPropertyJson("items", items);        
+        element.setPropertyJson("items", items);
         // end::setarray[]
         assertEquals(items.toString(), element.getProperty("items"));
     }
@@ -64,7 +64,8 @@ public void demonstrate_setPropertyBean() {
         element.setPropertyBean("config", config);
         // end::setbean[]
         assertEquals(config, element.getPropertyBean("config", MyConfig.class));
-        assertNotSame(config, element.getPropertyBean("config", MyConfig.class));
+        assertNotSame(config,
+                element.getPropertyBean("config", MyConfig.class));
     }
 
     record MyConfig(String myBean, int myInt) {
diff --git a/src/test/java/com/vaadin/demo/reference/componentinternals/element/TextContentTest.java b/src/test/java/com/vaadin/demo/reference/componentinternals/element/TextContentTest.java
index 1b0cc7ae7b..010bd0e633 100644
--- a/src/test/java/com/vaadin/demo/reference/componentinternals/element/TextContentTest.java
+++ b/src/test/java/com/vaadin/demo/reference/componentinternals/element/TextContentTest.java
@@ -8,7 +8,7 @@
 import com.vaadin.flow.dom.ElementFactory;
 
 public class TextContentTest {
-    
+
     @Test
     public void demonstrate_setText() {
         // tag::settext[]
@@ -17,10 +17,11 @@ public void demonstrate_setText() {
         assertEquals("<div>Hello world</div>", element.toString());
 
         // <div>
-        //  Hello world<span></span>
+        // Hello world<span></span>
         // </div>
         element.appendChild(ElementFactory.createSpan());
-        assertEquals("<div>\n Hello world<span></span>\n</div>", element.toString());
+        assertEquals("<div>\n Hello world<span></span>\n</div>",
+                element.toString());
 
         // <div>Replacement text</div> (the span is removed)
         element.setText("Replacement text");
@@ -36,11 +37,12 @@ public void demonstrate_getText_and_getTextRecursively() {
 
         Element name = ElementFactory.createStrong("Rudolph Reindeer");
         // <div>
-        //  Welcome back <strong>Rudolph Reindeer</strong>
+        // Welcome back <strong>Rudolph Reindeer</strong>
         // </div>
         element.appendChild(name);
 
-        assertEquals("Welcome back Rudolph Reindeer", element.getTextRecursively());        
+        assertEquals("Welcome back Rudolph Reindeer",
+                element.getTextRecursively());
         assertEquals("Welcome back ", element.getText());
         // end::gettext[]
     }