Update to Quarkus 1.1.0.Final

ruddy32 · Jan 5, 2020 · 81ee6a2 · 81ee6a2
1 parent 8ae8712
commit 81ee6a2
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 23 deletions.
diff --git a/deployment/src/main/java/net/moewes/quarkus/vaadin/deployment/VaadinProcessor.java b/deployment/src/main/java/net/moewes/quarkus/vaadin/deployment/VaadinProcessor.java
@@ -11,7 +11,7 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
-import io.quarkus.deployment.builditem.substrate.ReflectiveClassBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.undertow.deployment.ServletBuildItem;
 import java.util.Collection;
 import net.moewes.quarkus.vaadin.QuarkusVaadinServlet;
@@ -24,9 +24,8 @@
 
 public class VaadinProcessor {
 
-  static private DotName ROUTE_ANNOTATION = DotName.createSimple(Route.class.getName());
-
   private static final Logger log = Logger.getLogger(VaadinProcessor.class);
+  static private DotName ROUTE_ANNOTATION = DotName.createSimple(Route.class.getName());
 
   @BuildStep
   FeatureBuildItem featureBuildItem() {

diff --git a/example/pom.xml b/example/pom.xml
@@ -119,9 +119,9 @@
                 <configuration>
                   <enableHttpUrlHandler>true</enableHttpUrlHandler>
                   <additionalBuildArgs>
-                    <additionalBuildArg>
-                      -H:ReflectionConfigurationFiles=${project.basedir}/graal-reflection.json
-                    </additionalBuildArg>
+                    <!--          <additionalBuildArg>
+                                -H:ReflectionConfigurationFiles=${project.basedir}/graal-reflection.json
+                              </additionalBuildArg> -->
                     <additionalBuildArg>--allow-incomplete-classpath</additionalBuildArg>
                   </additionalBuildArgs>
                 </configuration>

diff --git a/example/src/main/java/net/moewes/cloud/ui/plain/TabView.java b/example/src/main/java/net/moewes/cloud/ui/plain/TabView.java
@@ -0,0 +1,39 @@
+package net.moewes.cloud.ui.plain;
+
+import com.vaadin.flow.component.Text;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.tabs.Tab;
+import com.vaadin.flow.component.tabs.Tabs;
+import com.vaadin.flow.router.Route;
+
+@Route("tabs")
+public class TabView extends VerticalLayout {
+
+  public TabView() {
+    Tab tab1 = new Tab("Tab one");
+    Tab tab2 = new Tab("Tab two");
+    Tab tab3 = new Tab("Tab three");
+    Tabs tabs = new Tabs(tab1, tab2, tab3);
+
+    add(tabs);
+
+    Text newText = new Text("");
+    Text oldText = new Text("");
+    VerticalLayout l = new VerticalLayout();
+    l.setPadding(true);
+    l.setSpacing(true);
+
+    l.add(newText, oldText);
+
+    add(l);
+
+    tabs.addSelectedChangeListener(event -> {
+      newText.setText("Current tab : " + event.getSelectedTab().getLabel());
+
+      if (event.getPreviousTab() != null) {
+        oldText.setText(
+            "Previous tab : " + event.getPreviousTab().getLabel());
+      }
+    });
+  }
+}
diff --git a/example/src/main/resources/META-INF/resources/index.html b/example/src/main/resources/META-INF/resources/index.html
@@ -99,6 +99,8 @@
 
 
 
+
+
   </style>
 </head>
 <body>
@@ -140,7 +142,7 @@ <h2>Other Features</h2>
       <h3>Application</h3>
       <ul>
         <li>Version: 1.0-SNAPSHOT</li>
-        <li>Quarkus Version: 0.23.2</li>
+        <li>Quarkus Version: 1.1.0.Final</li>
         <li>Vaadin Version: 14.0.7</li>
       </ul>
     </div>

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <surefire-plugin.version>2.22.0</surefire-plugin.version>
-    <quarkus.version>0.23.2</quarkus.version>
+    <quarkus.version>1.1.0.Final</quarkus.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>1.8</maven.compiler.target>

diff --git a/runtime/src/main/java/net/moewes/quarkus/vaadin/MyTestView.java b/runtime/src/main/java/net/moewes/quarkus/vaadin/MyTestView.java
diff --git a/runtime/src/main/java/net/moewes/quarkus/vaadin/QuarkusVaadinServlet.java b/runtime/src/main/java/net/moewes/quarkus/vaadin/QuarkusVaadinServlet.java
@@ -51,8 +51,6 @@ public void init(ServletConfig servletConfig) throws ServletException {
         } catch (ClassNotFoundException e) {
           e.printStackTrace();
         }
-
-
       }
 
       log.info("init");
-Original file line number
+Diff line change
@@ Expand Up @@
             } catch (ClassNotFoundException e) {
               e.printStackTrace();
             }
           }
           log.info("init");
@@ Expand Down @@