From 52421939f117561646163dc748f241d6f38b3318 Mon Sep 17 00:00:00 2001
From: Mikhail Shabarov <61410877+mshabarov@users.noreply.github.com>
Date: Fri, 15 Oct 2021 18:20:07 +0300
Subject: [PATCH] fix: Disable dev mode gizmo to not use web-sockets (#43)

* Revert "test: Swap the Push to long polling (#41)"

This reverts commit 578a5290

* fix: Disable dev mode gizmo to not use web-sockets

* fix: Disable dev mode gizmo in the servlet init params
---
 .../java/com/vaadin/flow/quarkus/it/AppShellConfig.java    | 4 ----
 .../main/java/com/vaadin/flow/quarkus/it/TestServlet.java  | 7 +++++--
 pom.xml                                                    | 6 +++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/integration-tests/common-test-code/src/main/java/com/vaadin/flow/quarkus/it/AppShellConfig.java b/integration-tests/common-test-code/src/main/java/com/vaadin/flow/quarkus/it/AppShellConfig.java
index 65ee0f2..578e2f6 100644
--- a/integration-tests/common-test-code/src/main/java/com/vaadin/flow/quarkus/it/AppShellConfig.java
+++ b/integration-tests/common-test-code/src/main/java/com/vaadin/flow/quarkus/it/AppShellConfig.java
@@ -1,12 +1,8 @@
 package com.vaadin.flow.quarkus.it;
 
 import com.vaadin.flow.component.page.AppShellConfigurator;
-import com.vaadin.flow.component.page.Push;
-import com.vaadin.flow.shared.ui.Transport;
 import com.vaadin.flow.theme.Theme;
 
 @Theme("reusable-theme")
-// TODO: Enable websockets when they are in use in Quarkus
-@Push(transport = Transport.LONG_POLLING)
 public class AppShellConfig implements AppShellConfigurator {
 }
diff --git a/integration-tests/common-test-code/src/main/java/com/vaadin/flow/quarkus/it/TestServlet.java b/integration-tests/common-test-code/src/main/java/com/vaadin/flow/quarkus/it/TestServlet.java
index e64fbc5..e33ec5e 100644
--- a/integration-tests/common-test-code/src/main/java/com/vaadin/flow/quarkus/it/TestServlet.java
+++ b/integration-tests/common-test-code/src/main/java/com/vaadin/flow/quarkus/it/TestServlet.java
@@ -6,7 +6,10 @@
 import com.vaadin.quarkus.QuarkusVaadinServlet;
 
 @WebServlet(urlPatterns = "/*", name = "TestServlet", asyncSupported = true, initParams = {
-        @WebInitParam(name = "org.atmosphere.websocket.suppressJSR356", value = "true") })
+        @WebInitParam(name = "org.atmosphere.websocket.suppressJSR356", value = "true"),
+        // TODO: Enable dev mode gizmo when websockets are in use
+        @WebInitParam(name = "devmode.gizmo.enabled", value = "false")})
 public class TestServlet extends QuarkusVaadinServlet {
-    // This servlet is here to give the suppressJSR356 parameter
+    // This servlet is here to give the suppressJSR356 parameter and disable
+    // dev mode gizmo which triggers unsupported web-sockets connection
 }
diff --git a/pom.xml b/pom.xml
index 8161ea8..4e3db28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
         <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
         <maven.compiler.parameters>true</maven.compiler.parameters>
 
-        <vaadin.flow.version>8.0-SNAPSHOT</vaadin.flow.version>
+        <vaadin.flow.version>9.0-SNAPSHOT</vaadin.flow.version>
         <quarkus.version>2.3.0.Final</quarkus.version>
 
         <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
@@ -42,7 +42,7 @@
     </properties>
 
     <repositories>
-        <!-- The order of definitions matters. Explicitly defining central 
+        <!-- The order of definitions matters. Explicitly defining central
             here to make sure it has the highest priority. -->
         <repository>
             <id>central</id>
@@ -61,7 +61,7 @@
     </repositories>
 
     <pluginRepositories>
-        <!-- The order of definitions matters. Explicitly defining central 
+        <!-- The order of definitions matters. Explicitly defining central
             here to make sure it has the highest priority. -->
         <pluginRepository>
             <id>central</id>