Merge pull request #45129 from amusarra/feature/ext-info

Extension Info - Expose other information about Java and Git
quarkusio · Dec 16, 2024 · e0e74f1 · e0e74f1
2 parents 0997246 + b7ad29c
commit e0e74f1
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 1 deletion.
diff --git a/extensions/info/deployment/src/main/resources/dev-ui/qwc-info.js b/extensions/info/deployment/src/main/resources/dev-ui/qwc-info.js
@@ -104,6 +104,8 @@ export class QwcInfo extends LitElement {
                         <vaadin-icon icon="font-awesome-brands:java"></vaadin-icon>
                         <table class="table">
                             <tr><td class="row-header">Version</td><td>${java.version}</td></tr>
+                            <tr><td class="row-header">Vendor</td><td>${java.vendor}</td></tr>
+                            <tr><td class="row-header">Vendor Version</td><td>${java.vendorVersion}</td></tr>
                         </table>
                     </div>    
                 </qui-card>`;
@@ -151,7 +153,8 @@ export class QwcInfo extends LitElement {
     _renderOptionalData(git){
         if(typeof git.commit.id !== "string"){
             return html`<tr><td class="row-header">Commit User</td><td>${git.commit.user.name} &lt;${git.commit.user.email}&gt;</td></tr>
-                        <tr><td class="row-header">Commit Message</td><td>${unsafeHTML(this._replaceNewLine(git.commit.id.message.full))}</td></tr>`
+                        <tr><td class="row-header">Commit Message</td><td>${unsafeHTML(this._replaceNewLine(git.commit.id.message.full))}</td></tr>
+                        <tr><td class="row-header">Remote URL</td><td>${unsafeHTML(git.remote)}</td></tr>`
         }
     }
 
@@ -165,6 +168,8 @@ export class QwcInfo extends LitElement {
             return html`<qui-card header="Build">
                     <div class="cardContent" slot="content">
                         <table class="table">
+                            <tr><td class="row-header">Quarkus</td><td>${build.quarkusVersion}</td></tr>
+                            <tr><td class="row-header">App Name</td><td>${unsafeHTML(build.name)}</td></tr>
                             <tr><td class="row-header">Group</td><td>${build.group}</td></tr>
                             <tr><td class="row-header">Artifact</td><td>${build.artifact}</td></tr>
                             <tr><td class="row-header">Version</td><td>${build.version}</td></tr>

diff --git a/extensions/info/deployment/src/test/java/io/quarkus/info/deployment/EnabledInfoTest.java b/extensions/info/deployment/src/test/java/io/quarkus/info/deployment/EnabledInfoTest.java
@@ -70,5 +70,7 @@ public void test() {
 
         assertNotNull(javaInfo);
         assertNotNull(javaInfo.version());
+        assertNotNull(javaInfo.vendor());
+        assertNotNull(javaInfo.vendorVersion());
     }
 }
diff --git a/extensions/info/runtime/src/main/java/io/quarkus/info/JavaInfo.java b/extensions/info/runtime/src/main/java/io/quarkus/info/JavaInfo.java
@@ -1,6 +1,31 @@
 package io.quarkus.info;
 
+/**
+ * This interface provides information about the Java runtime.
+ *
+ * @see io.quarkus.info.runtime.InfoRecorder
+ * @see io.quarkus.info.runtime.JavaInfoContributor
+ */
 public interface JavaInfo {
 
+    /**
+     * Return the Java runtime version.
+     *
+     * @return string that represent the Java version
+     */
     String version();
+
+    /**
+     * Return the Java vendor.
+     *
+     * @return string that represent the Java vendor
+     */
+    String vendor();
+
+    /**
+     * Return the Java vendor runtime version.
+     *
+     * @return string that represent the Java vendor version
+     */
+    String vendorVersion();
 }
diff --git a/extensions/info/runtime/src/main/java/io/quarkus/info/runtime/InfoRecorder.java b/extensions/info/runtime/src/main/java/io/quarkus/info/runtime/InfoRecorder.java
@@ -134,6 +134,16 @@ public JavaInfo get() {
                     public String version() {
                         return JavaInfoContributor.getVersion();
                     }
+
+                    @Override
+                    public String vendor() {
+                        return JavaInfoContributor.getVendor();
+                    }
+
+                    @Override
+                    public String vendorVersion() {
+                        return JavaInfoContributor.getVendorVersion();
+                    }
                 };
             }
         };