Merge branch 'main' into pmd-UnnecessaryImport

Author: Vincent Potucek

bom/application/pom.xml

@@ -194,7 +194,7 @@
         <log4j2-api.version>2.24.3</log4j2-api.version>
         <log4j-jboss-logmanager.version>1.3.1.Final</log4j-jboss-logmanager.version>
         <avro.version>1.12.0</avro.version>
-        <apicurio-registry.version>2.6.11.Final</apicurio-registry.version>
+        <apicurio-registry.version>2.6.12.Final</apicurio-registry.version>
         <apicurio-common-rest-client.version>0.1.18.Final</apicurio-common-rest-client.version> <!-- must be the version Apicurio Registry uses -->
         <testcontainers.version>1.21.1</testcontainers.version> <!-- Make sure to also update docker-java.version to match its needs -->
         <docker-java.version>3.4.2</docker-java.version> <!-- must be the version Testcontainers use: https://central.sonatype.com/artifact/org.testcontainers/testcontainers -->

bom/dev-ui/pom.xml

@@ -13,7 +13,7 @@
     <description>Dependency management for dev-ui. Importable by third party extension developers.</description>
 
     <properties>
-        <vaadin.version>24.7.8</vaadin.version>
+        <vaadin.version>24.8.0</vaadin.version>
         <lit.version>3.2.1</lit.version>
         <lit-element.version>4.1.1</lit-element.version>
         <lit-html.version>3.2.1</lit-html.version>

core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java

@@ -538,6 +538,25 @@ interface Debug {
 
     @ConfigGroup
     interface Compression {
+        /**
+         * Whether compression should be enabled.
+         */
+        @WithDefault("true")
+        boolean enabled();
+
+        /**
+         * Whether the compression should be executed within a container.
+         */
+        Optional<Boolean> containerBuild();
+
+        /**
+         * The image used for compression. Defaults to {@code quarkus.native.builder-image} if not
+         * set.
+         * <p>
+         * Setting this variable will automatically activate
+         */
+        Optional<String> containerImage();
+
         /**
          * The compression level in [1, 10].
          * 10 means <em>best</em>.

core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/UpxCompressionBuildStep.java

@@ -41,7 +41,7 @@ public void compress(NativeConfig nativeConfig, NativeImageRunnerBuildItem nativ
             BuildProducer<UpxCompressedBuildItem> upxCompressedProducer,
             BuildProducer<ArtifactResultBuildItem> artifactResultProducer) {
 
-        if (nativeConfig.compression().level().isEmpty()) {
+        if (nativeConfig.compression().level().isEmpty() || !nativeConfig.compression().enabled()) {
             log.debug("UPX compression disabled");
             return;
         }
@@ -52,7 +52,8 @@ public void compress(NativeConfig nativeConfig, NativeImageRunnerBuildItem nativ
 
         String effectiveBuilderImage = nativeConfig.builderImage().getEffectiveImage();
         Optional<File> upxPathFromSystem = getUpxFromSystem();
-        if (upxPathFromSystem.isPresent()) {
+        if (upxPathFromSystem.isPresent() && !nativeConfig.compression().containerBuild().orElse(false)
+                && nativeConfig.compression().containerImage().isEmpty()) {
             log.debug("Running UPX from system path");
             if (!runUpxFromHost(upxPathFromSystem.get(), image.getPath().toFile(), nativeConfig)) {
                 throw new IllegalStateException("Unable to compress the native executable");
@@ -61,9 +62,12 @@ public void compress(NativeConfig nativeConfig, NativeImageRunnerBuildItem nativ
             log.error("Compression of native executables is not yet implemented for remote container builds.");
             throw new IllegalStateException(
                     "Unable to compress the native executable: Compression of native executables is not yet supported for remote container builds");
-        } else if (nativeImageRunner.isContainerBuild()) {
-            log.info("Running UPX from a container using the builder image: " + effectiveBuilderImage);
-            if (!runUpxInContainer(image, nativeConfig, effectiveBuilderImage)) {
+        } else if (nativeConfig.compression().containerBuild().orElse(true) &&
+                (nativeImageRunner.isContainerBuild() ||
+                        nativeConfig.compression().containerImage().isPresent())) {
+            String compressorImage = nativeConfig.compression().containerImage().orElse(effectiveBuilderImage);
+            log.info("Running UPX from a container using the compressor image: " + compressorImage);
+            if (!runUpxInContainer(image, nativeConfig, compressorImage)) {
                 throw new IllegalStateException("Unable to compress the native executable");
             }
         } else {

docs/src/main/asciidoc/kafka-dev-services.adoc

@@ -89,8 +89,14 @@ quarkus.kafka.devservices.image-name=quay.io/strimzi-test-container/test-contain
 
 You can configure the Dev Services for Kafka to create topics once the broker is started.
 Topics are created with given number of partitions and 1 replica.
+The syntax is the following:
 
-The following example creates a topic named `test` with 3 partitions, and a second topic named `messages` with 2 partitions.
+[source, properties]
+----
+quarkus.kafka.devservices.topic-partitions.<topic-name>=<number-of-partitions>
+----
+
+The following example creates a topic named `test` with three partitions, and a second topic named `messages` with two partitions.
 
 [source, properties]
 ----

docs/src/main/asciidoc/upx.adoc

@@ -25,13 +25,30 @@ Note that UPX compression:
 The UPX compression requires:
 
 * the `upx` command to be available in the system `PATH`;
+* an explicitly defined `quarkus.native.compression.container-image`;
 * or to have built the native executable using an in-container build.
 
+If `quarkus.native.compression.container-image` is not set explicitly, it will implicitly default to `quarkus.native.builder-image`.
+
 If you have the `upx` command available on your path, Quarkus uses it.
-Otherwise, if you built the native image using an in-container build (using `quarkus.native.container-build=true`) and if the builder image provides the `upx` command, Quarkus compresses the executable from inside the container.
+Otherwise, if you built the native image using an in-container build (using `quarkus.native.container-build=true`) and if the compression image provides the `upx` command, Quarkus compresses the executable from inside the container.
+
+If you want to force compression to take place in a container, you can set `quarkus.native.compression.container-build` to `true` (or `false` to explicitly not run compression in a container).
 
 If you are not in one of these cases, the compression fails.
 
+Setting `quarkus.native.compression.container-image` results in the compression to run in a container.
+If you want to set the variable, but not run the compression in a container, set `quakrus.native.compression.container-build` explicitly to `false`.
+
+[IMPORTANT]
+.`WORKDIR` for the image used for compression
+====
+The executable to compress is mounted in directory `/project`.
+Since the container runs `upx` in the current working directory, the `WORKDIR` of the image used for compression must be `/project`.
+====
+
+Compression can be explicitly en-/disabled by setting `quarkus.native.compression.enabled`.
+
 [IMPORTANT]
 .upx is cross-platform.
 ====

extensions/devservices/deployment/src/main/java/io/quarkus/devservices/deployment/ContainerLogForwarder.java

@@ -13,21 +13,20 @@
 import org.testcontainers.containers.output.FrameConsumerResultCallback;
 import org.testcontainers.containers.output.OutputFrame;
 
+import io.quarkus.deployment.dev.devservices.ContainerInfo;
 import io.quarkus.deployment.dev.devservices.DevServiceDescriptionBuildItem;
 
 public class ContainerLogForwarder implements Closeable {
 
     private final DevServiceDescriptionBuildItem devService;
     private final AtomicLong timestamp = new AtomicLong(0L);
     private final Logger logger;
-    private final String shortId;
     private FrameConsumerResultCallback resultCallback;
     private final AtomicBoolean running = new AtomicBoolean(false);
 
     public ContainerLogForwarder(DevServiceDescriptionBuildItem devService) {
         this.devService = devService;
         this.logger = Logger.getLogger(devService.getName());
-        this.shortId = devService.getContainerInfo().getShortId();
     }
 
     public DevServiceDescriptionBuildItem getDevService() {
@@ -39,22 +38,28 @@ public boolean isRunning() {
     }
 
     public void start() {
-        if (running.compareAndSet(false, true)) {
-            this.resultCallback = new FrameConsumerResultCallback();
-            this.resultCallback.addConsumer(STDOUT, frame -> {
-                if (running.get())
-                    logger.infof("[%s] %s", shortId, updateTimestamp(frame));
-            });
-            this.resultCallback.addConsumer(STDERR, frame -> {
-                if (running.get())
-                    logger.errorf("[%s] %s", shortId, updateTimestamp(frame));
-            });
-            DockerClientFactory.lazyClient().logContainerCmd(devService.getContainerInfo().id())
-                    .withFollowStream(true)
-                    .withStdErr(true)
-                    .withStdOut(true)
-                    .withSince(timestamp.intValue())
-                    .exec(resultCallback);
+        ContainerInfo containerInfo = devService.getContainerInfo();
+
+        if (containerInfo != null) {
+            String shortId = containerInfo.getShortId();
+
+            if (running.compareAndSet(false, true)) {
+                this.resultCallback = new FrameConsumerResultCallback();
+                this.resultCallback.addConsumer(STDOUT, frame -> {
+                    if (running.get())
+                        logger.infof("[%s] %s", shortId, updateTimestamp(frame));
+                });
+                this.resultCallback.addConsumer(STDERR, frame -> {
+                    if (running.get())
+                        logger.errorf("[%s] %s", shortId, updateTimestamp(frame));
+                });
+                DockerClientFactory.lazyClient().logContainerCmd(containerInfo.id())
+                        .withFollowStream(true)
+                        .withStdErr(true)
+                        .withStdOut(true)
+                        .withSince(timestamp.intValue())
+                        .exec(resultCallback);
+            }
         }
     }
 

extensions/devservices/deployment/src/main/java/io/quarkus/devservices/deployment/DevServicesProcessor.java

@@ -13,7 +13,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +61,7 @@ public class DevServicesProcessor {
 
     static volatile ConsoleStateManager.ConsoleContext context;
     static volatile boolean logForwardEnabled = false;
-    static Map<String, ContainerLogForwarder> containerLogForwarders = new HashMap<>();
+    static Set<ContainerLogForwarder> containerLogForwarders = new HashSet<>();
 
     @BuildStep
     public DevServicesNetworkIdBuildItem networkId(
@@ -110,15 +109,14 @@ public List<DevServiceDescriptionBuildItem> config(
             LaunchModeBuildItem launchModeBuildItem,
             Optional<DevServicesLauncherConfigResultBuildItem> devServicesLauncherConfig,
             List<DevServicesResultBuildItem> devServicesResults) {
+        containerLogForwarders.clear();
         List<DevServiceDescriptionBuildItem> serviceDescriptions = buildServiceDescriptions(
                 dockerStatusBuildItem, devServicesResults, devServicesLauncherConfig);
 
         for (DevServiceDescriptionBuildItem devService : serviceDescriptions) {
-            if (devService.hasContainerInfo()) {
-                containerLogForwarders.compute(devService.getContainerInfo().id(),
-                        (id, forwarder) -> Objects.requireNonNullElseGet(forwarder,
-                                () -> new ContainerLogForwarder(devService)));
-            }
+
+            containerLogForwarders.add(new ContainerLogForwarder(devService));
+
         }
 
         // Build commands if we are in local dev mode
@@ -131,11 +129,11 @@ public List<DevServiceDescriptionBuildItem> config(
 
         // Dev UI Log stream
         for (DevServiceDescriptionBuildItem service : serviceDescriptions) {
-            if (service.getContainerInfo() != null) {
-                footerLogProducer.produce(new FooterLogBuildItem(service.getName(), () -> {
-                    return createLogPublisher(service.getContainerInfo().id());
-                }));
-            }
+
+            footerLogProducer.produce(new FooterLogBuildItem(service.getName(), () -> {
+                ContainerInfo containerInfo = service.getContainerInfo();
+                return createLogPublisher(containerInfo);
+            }));
         }
 
         if (context == null) {
@@ -162,22 +160,28 @@ public List<DevServiceDescriptionBuildItem> config(
         return serviceDescriptions;
     }
 
-    private Flow.Publisher<String> createLogPublisher(String containerId) {
+    private Flow.Publisher<String> createLogPublisher(ContainerInfo containerInfo) {
+
         try (FrameConsumerResultCallback resultCallback = new FrameConsumerResultCallback()) {
             SubmissionPublisher<String> publisher = new SubmissionPublisher<>();
             resultCallback.addConsumer(OutputFrame.OutputType.STDERR,
                     frame -> publisher.submit(frame.getUtf8String()));
             resultCallback.addConsumer(OutputFrame.OutputType.STDOUT,
                     frame -> publisher.submit(frame.getUtf8String()));
-            LogContainerCmd logCmd = DockerClientFactory.lazyClient()
-                    .logContainerCmd(containerId)
-                    .withFollowStream(true)
-                    .withTailAll()
-                    .withStdErr(true)
-                    .withStdOut(true);
-            logCmd.exec(resultCallback);
+            if (containerInfo != null) {
+                String containerId = containerInfo.id();
+                LogContainerCmd logCmd = DockerClientFactory.lazyClient()
+                        .logContainerCmd(containerId)
+                        .withFollowStream(true)
+                        .withTailAll()
+                        .withStdErr(true)
+                        .withStdOut(true);
+                logCmd.exec(resultCallback);
+            }
 
             return publisher;
+        } catch (RuntimeException re) {
+            throw re;
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -259,14 +263,14 @@ private ContainerInfo.ContainerPort[] getExposedPorts(Container container) {
 
     private synchronized void toggleLogForwarders() {
         if (logForwardEnabled) {
-            for (ContainerLogForwarder logForwarder : containerLogForwarders.values()) {
+            for (ContainerLogForwarder logForwarder : containerLogForwarders) {
                 if (logForwarder.isRunning()) {
                     logForwarder.close();
                 }
             }
             logForwardEnabled = false;
         } else {
-            for (ContainerLogForwarder logForwarder : containerLogForwarders.values()) {
+            for (ContainerLogForwarder logForwarder : containerLogForwarders) {
                 logForwarder.start();
             }
             logForwardEnabled = true;

extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/blocking/BlockingServerInterceptor.java

@@ -37,6 +37,62 @@
 public class BlockingServerInterceptor implements ServerInterceptor, Function<String, Boolean>, Prioritized {
     private static final Logger log = Logger.getLogger(BlockingServerInterceptor.class);
 
+    // Reserved keywords, based on the jls, see:
+    // https://github.com/grpc/grpc-java/blob/master/compiler/src/java_plugin/cpp/java_generator.cpp#L90
+    private static final Set<String> GRPC_JAVA_RESERVED_KEYWORDS = Set.of(
+            "abstract",
+            "assert",
+            "boolean",
+            "break",
+            "byte",
+            "case",
+            "catch",
+            "char",
+            "class",
+            "const",
+            "continue",
+            "default",
+            "do",
+            "double",
+            "else",
+            "enum",
+            "extends",
+            "final",
+            "finally",
+            "float",
+            "for",
+            "goto",
+            "if",
+            "implements",
+            "import",
+            "instanceof",
+            "int",
+            "interface",
+            "long",
+            "native",
+            "new",
+            "package",
+            "private",
+            "protected",
+            "public",
+            "return",
+            "short",
+            "static",
+            "strictfp",
+            "super",
+            "switch",
+            "synchronized",
+            "this",
+            "throw",
+            "throws",
+            "transient",
+            "try",
+            "void",
+            "volatile",
+            "while",
+            "true",
+            "false");
+
     private final Vertx vertx;
     private final Set<String> blockingMethods;
     private final Set<String> virtualMethods;
@@ -68,12 +124,22 @@ public BlockingServerInterceptor(Vertx vertx, List<String> blockingMethods, List
     @Override
     public Boolean apply(String name) {
         String methodName = name.substring(name.lastIndexOf("/") + 1);
-        return blockingMethods.contains(methodName.toLowerCase());
+        return blockingMethods.contains(toLowerCaseBeanSpec(methodName));
     }
 
     public Boolean applyVirtual(String name) {
         String methodName = name.substring(name.lastIndexOf("/") + 1);
-        return virtualMethods.contains(methodName.toLowerCase());
+        return virtualMethods.contains(toLowerCaseBeanSpec(methodName));
+    }
+
+    private String toLowerCaseBeanSpec(String name) {
+
+        // Methods cannot always be lowercased for comparison.
+        // - gRPC allows using method names which normally would not work in java because of reserved keywords.
+        // - Underscores are removed.
+
+        String lowerBeanSpec = name.toLowerCase().replace("_", "");
+        return GRPC_JAVA_RESERVED_KEYWORDS.contains(lowerBeanSpec) ? lowerBeanSpec + "_" : lowerBeanSpec;
     }
 
     @Override