Merge pull request quarkusio#48124 from geoand/quarkusio#48122

Follow the Common Log Format in access logs for HTTP version when 'H' is used

Author: geoand

extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/RequestLineAttribute.java

@@ -38,32 +38,8 @@ public String readAttribute(final RoutingContext exchange) {
             httpMethod = exchange.request().method();
             uri = exchange.request().uri();
         }
-        StringBuilder sb = new StringBuilder()
-                .append(httpMethod)
-                .append(' ')
-                .append(uri);
-        sb.append(' ');
-        String httpVersion = "-";
-        switch (exchange.request().version()) {
-            case HTTP_1_0:
-                httpVersion = "HTTP/1.0";
-                break;
-            case HTTP_1_1:
-                httpVersion = "HTTP/1.1";
-                break;
-            case HTTP_2:
-                httpVersion = "HTTP/2";
-                break;
-            default:
-                // best effort to try and infer the HTTP version from
-                // any "unknown" enum value
-                httpVersion = exchange.request().version().name()
-                        .replace("HTTP_", "HTTP/")
-                        .replace("_", ".");
-                break;
-        }
-        sb.append(httpVersion);
-        return sb.toString();
+
+        return httpMethod + " " + uri + " " + RequestProtocolAttribute.getHttpVersionStr(exchange.request().version());
     }
 
     @Override

extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/attribute/RequestProtocolAttribute.java

@@ -1,5 +1,6 @@
 package io.quarkus.vertx.http.runtime.attribute;
 
+import io.vertx.core.http.HttpVersion;
 import io.vertx.ext.web.RoutingContext;
 
 /**
@@ -19,14 +20,30 @@ private RequestProtocolAttribute() {
 
     @Override
     public String readAttribute(final RoutingContext exchange) {
-        return exchange.request().version().name();
+        return getHttpVersionStr(exchange.request().version());
     }
 
     @Override
     public void writeAttribute(final RoutingContext exchange, final String newValue) throws ReadOnlyAttributeException {
         throw new ReadOnlyAttributeException("Request getProtocol", newValue);
     }
 
+    static String getHttpVersionStr(HttpVersion version) {
+        // best effort to try and infer the HTTP version from
+        // any "unknown" enum value
+        return switch (version) {
+            case HTTP_1_0 -> "HTTP/1.0";
+            case HTTP_1_1 -> "HTTP/1.1";
+            case HTTP_2 -> "HTTP/2";
+            default ->
+                // best effort to try and infer the HTTP version from
+                // any "unknown" enum value
+                version.name()
+                        .replace("HTTP_", "HTTP/")
+                        .replace("_", ".");
+        };
+    }
+
     public static final class Builder implements ExchangeAttributeBuilder {
 
         @Override