chore: replace logic to get production mode info

vaadin · May 16, 2023 · 683ba1d · 683ba1d
1 parent de90aec
commit 683ba1d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/flow-html-components/pom.xml b/flow-html-components/pom.xml
@@ -26,11 +26,6 @@
             <artifactId>flow-data</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>jakarta.platform</groupId>
             <artifactId>jakarta.jakartaee-web-api</artifactId>

diff --git a/flow-html-components/src/main/java/com/vaadin/flow/component/html/Label.java b/flow-html-components/src/main/java/com/vaadin/flow/component/html/Label.java
@@ -24,6 +24,7 @@
 import com.vaadin.flow.component.PropertyDescriptor;
 import com.vaadin.flow.component.PropertyDescriptors;
 import com.vaadin.flow.component.Tag;
+import com.vaadin.flow.server.VaadinService;
 import com.vaadin.flow.shared.Registration;
 import org.slf4j.LoggerFactory;
 
@@ -137,8 +138,7 @@ public Optional<String> getFor() {
     @Override
     protected void onAttach(AttachEvent attachEvent) {
         super.onAttach(attachEvent);
-        if (skipForAttributeCheck(attachEvent)
-                || !attachEvent.isInitialAttach()) {
+        if (skipForAttributeCheck() || !attachEvent.isInitialAttach()) {
             return; // skip check in production so that customer / clients /
             // ops-teams are not complaining about this warning to the
             // devs. This should be dealt with by devs in development
@@ -173,17 +173,18 @@ && getChildren().findAny().isEmpty()) {
      * @return true if in production mode or the mode is unclear, false if in
      *         development mode
      **/
-    private static boolean skipForAttributeCheck(AttachEvent attachEvent) {
+    private static boolean skipForAttributeCheck() {
         if (productionMode != null) {
             return productionMode;
         }
 
-        var session = attachEvent.getSession();
-        if (session == null) {
+        var service = VaadinService.getCurrent();
+        if (service == null) {
             return true;
         }
 
-        productionMode = session.getConfiguration().isProductionMode();
+        productionMode = service.getDeploymentConfiguration()
+                .isProductionMode();
         return productionMode;
     }
 }