quarkus.application.name and quarkus.application.version are not alwa…

…ys set Especially when running tests.
quarkusio · Jan 12, 2021 · 08cb956 · 08cb956
1 parent 17283c9
commit 08cb956
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java b/...deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/console/DevConsole.java
@@ -47,8 +47,9 @@ public class DevConsole implements Handler<RoutingContext> {
         this.globalData.put("httpRootPath", httpRootPath);
         this.globalData.put("frameworkRootPath", frameworkRootPath);
         this.globalData.put("quarkusVersion", Version.getVersion());
-        this.globalData.put("applicationName", config.getValue("quarkus.application.name", String.class));
-        this.globalData.put("applicationVersion", config.getValue("quarkus.application.version", String.class));
+        this.globalData.put("applicationName", config.getOptionalValue("quarkus.application.name", String.class).orElse(""));
+        this.globalData.put("applicationVersion",
+                config.getOptionalValue("quarkus.application.version", String.class).orElse(""));
 
         try {
             Enumeration<URL> extensionDescriptors = getClass().getClassLoader()

diff --git a/extensions/vertx-http/deployment/src/main/resources/dev-templates/main.html b/extensions/vertx-http/deployment/src/main/resources/dev-templates/main.html
@@ -20,8 +20,8 @@
     {#if currentExtensionName && currentExtensionName != 'Eclipse Vert.x - HTTP'}
       {currentExtensionName} /
     {/if}
-    {#insert title/} |
-    {applicationName} {applicationVersion}
+    {#insert title/}
+    {#if applicationName and applicationVersion} | {applicationName} {applicationVersion}{/if}
   </title>
  </head>
  <body>
@@ -31,7 +31,7 @@
       <span id="navbar_title" class="align-middle">Dev Console</span>
     </a>
     <span class="navbar-text">
-      {applicationName} {applicationVersion} (powered by Quarkus {quarkusVersion})
+      {#if applicationName and applicationVersion}{applicationName} {applicationVersion} (powered by Quarkus {quarkusVersion}){/if}
     </span>
   </nav>