Fix empty config values propagation #9506

microprofile/messaging/core/src/main/java/io/helidon/microprofile/messaging/AdHocConfigBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,10 @@ AdHocConfigBuilder put(String key, String value) {
     }
 
     AdHocConfigBuilder putAll(Config configToPut) {
-        configuration.putAll(configToPut.detach().asMap().orElse(Map.of()));
+        for (var e : configToPut.detach().asMap().orElseGet(Map::of).entrySet()) {
+            String value = e.getValue();
+            configuration.put(e.getKey(), value.isEmpty() ? "${EMPTY}" : value);
+        }
         return this;
     }
 

microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/AdHocConfigBuilderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,11 +18,14 @@
 
 import java.util.Map;
 
+import io.helidon.common.media.type.MediaTypes;
 import io.helidon.config.Config;
 import io.helidon.config.ConfigSources;
+import io.helidon.config.mp.MpConfig;
 import io.helidon.config.mp.MpConfigSources;
 
 import org.eclipse.microprofile.config.spi.ConfigProviderResolver;
+import org.eclipse.microprofile.config.spi.ConfigSource;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -191,4 +194,18 @@ void putAllTest() {
         assertThat(c.getValue(ADDITION_ATTR_1, String.class), is(ADDITION_ATTR_1_VALUE));
         assertThat(c.getValue(ADDITION_ATTR_2, String.class), is(ADDITION_ATTR_2_VALUE));
     }
+
+    @Test
+    void emptyTest() {
+        ConfigSource mpSource = MpConfigSources.create(Map.of("ssl.endpoint.first", "${EMPTY}"));
+
+        org.eclipse.microprofile.config.Config c = AdHocConfigBuilder
+                .from(Config.just(() -> ConfigSources.create(
+                        "ssl.endpoint.second: ${EMPTY}",
+                        MediaTypes.APPLICATION_X_YAML)))
+                .putAll(MpConfig.toHelidonConfig(ConfigProviderResolver.instance().getBuilder().withSources(mpSource).build()))
+                .build();
+        assertThat(c.getValue("ssl.endpoint.first", String.class), is(""));
+        assertThat(c.getValue("ssl.endpoint.second", String.class), is(""));
+    }
 }

microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/connector/ConnectorConfigTest.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2025 Oracle and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.helidon.microprofile.messaging.connector;
+
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import io.helidon.common.reactive.Multi;
+import io.helidon.config.mp.MpConfig;
+import io.helidon.microprofile.messaging.MessagingCdiExtension;
+import io.helidon.microprofile.testing.AddBean;
+import io.helidon.microprofile.testing.AddConfigBlock;
+import io.helidon.microprofile.testing.AddExtension;
+import io.helidon.microprofile.testing.DisableDiscovery;
+import io.helidon.microprofile.testing.junit5.HelidonTest;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.reactive.messaging.Channel;
+import org.eclipse.microprofile.reactive.messaging.Message;
+import org.eclipse.microprofile.reactive.messaging.spi.Connector;
+import org.eclipse.microprofile.reactive.messaging.spi.IncomingConnectorFactory;
+import org.eclipse.microprofile.reactive.streams.operators.PublisherBuilder;
+import org.eclipse.microprofile.reactive.streams.operators.ReactiveStreams;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@HelidonTest(resetPerTest = true)
+@DisableDiscovery
+@AddExtension(MessagingCdiExtension.class)
+public class ConnectorConfigTest {
+
+    @Inject
+    @Channel("config-channel-in")
+    private Multi<Config> configMulti;
+
+    @Test
+    @AddConfigBlock(value = """
+            mp.messaging.incoming:
+                config-channel-in:
+                    connector: config-connector
+                    non-empty-value: a_value
+                    empty-value: ${EMPTY}
+            """, type = "yaml")
+    @AddBean(ConfigConnector.class)
+    void emptyConfigValueTest() throws ExecutionException, InterruptedException {
+        Config connectorConfig = configMulti.collectList().get().getFirst();
+        var helidonConfig = MpConfig.toHelidonConfig(connectorConfig);
+        var kafkaesqueConfig = helidonConfig.detach().asMap().orElseGet(Map::of);
+        assertThat(kafkaesqueConfig.get("non-empty-value"), Matchers.is("a_value"));
+        assertTrue(kafkaesqueConfig.containsKey("empty-value"));
+        assertThat(kafkaesqueConfig.get("empty-value"), Matchers.is(""));
+    }
+
+    @ApplicationScoped
+    @Connector("config-connector")
+    public static class ConfigConnector implements IncomingConnectorFactory {
+
+        @Override
+        public PublisherBuilder<? extends Message<?>> getPublisherBuilder(Config config) {
+            return ReactiveStreams.of(config).map(Message::of);
+        }
+    }
+}

microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/connector/ConnectorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,79 +16,73 @@
 
 package io.helidon.microprofile.messaging.connector;
 
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import io.helidon.microprofile.messaging.AbstractCDITest;
+import io.helidon.microprofile.messaging.MessagingCdiExtension;
+import io.helidon.microprofile.testing.AddBean;
+import io.helidon.microprofile.testing.AddConfig;
+import io.helidon.microprofile.testing.AddConfigBlock;
+import io.helidon.microprofile.testing.AddExtension;
+import io.helidon.microprofile.testing.DisableDiscovery;
+import io.helidon.microprofile.testing.junit5.HelidonTest;
 
-import jakarta.enterprise.inject.spi.DeploymentException;
+import jakarta.enterprise.inject.spi.CDI;
 import jakarta.enterprise.util.AnnotationLiteral;
 import org.eclipse.microprofile.reactive.messaging.spi.Connector;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@Disabled
-public class ConnectorTest extends AbstractCDITest {
-
-    @Override
-    public void setUp() {
-        //starting container manually
-    }
+@HelidonTest(resetPerTest = true)
+@DisableDiscovery
+@AddExtension(MessagingCdiExtension.class)
+public class ConnectorTest {
 
     @Test
+    @AddConfig(key = "mp.messaging.incoming.iterable-channel-in.connector", value = "iterable-connector")
+    @AddBean(IterableConnector.class)
+    @AddBean(ConnectedBean.class)
     void connectorTest() throws InterruptedException {
-        cdiContainer = startCdiContainer(
-                Map.of("mp.messaging.incoming.iterable-channel-in.connector", "iterable-connector"),
-                IterableConnector.class,
-                ConnectedBean.class);
         assertThat("Not connected in time.", ConnectedBean.LATCH.await(2, TimeUnit.SECONDS));
     }
 
     @Test
+    @AddConfigBlock(value = """
+            mp.messaging.outgoing:
+                to-connector-1.connector: iterable-connector
+                to-connector-2.connector: iterable-connector
+                to-connector-3.connector: iterable-connector
+                to-connector-4.connector: iterable-connector
+            """, type = "yaml")
+    @AddBean(IterableConnector.class)
+    @AddBean(LeakingPayloadBean.class)
     void payloadLeakTest() throws InterruptedException {
-        cdiContainer = startCdiContainer(
-                Map.of(
-                        "mp.messaging.outgoing.to-connector-1.connector", "iterable-connector",
-                        "mp.messaging.outgoing.to-connector-2.connector", "iterable-connector",
-                        "mp.messaging.outgoing.to-connector-3.connector", "iterable-connector",
-                        "mp.messaging.outgoing.to-connector-4.connector", "iterable-connector"
-                        ),
-                IterableConnector.class,
-                LeakingPayloadBean.class);
-        IterableConnector connector = (IterableConnector) cdiContainer.select(ConnectorLiteral.INSTANCE).get();
+        IterableConnector connector = (IterableConnector) CDI.current().select(ConnectorLiteral.INSTANCE).get();
         assertThat("Not connected in time.", connector.await());
     }
 
     @Test
+    @AddConfig(key = "mp.messaging.incoming.iterable-channel-in.connector", value = "iterable-connector")
+    @AddBean(IterableConnector.class)
+    @AddBean(ConnectedProcessorBean.class)
     void connectorWithProcessorTest() throws InterruptedException {
-        cdiContainer = startCdiContainer(
-                Map.of("mp.messaging.incoming.iterable-channel-in.connector", "iterable-connector"),
-                IterableConnector.class,
-                ConnectedProcessorBean.class);
         assertThat("Not connected in time.", ConnectedProcessorBean.LATCH.await(2, TimeUnit.SECONDS));
     }
 
     @Test
+    @AddConfigBlock(value = """
+            mp.messaging.incoming:
+                iterable-channel-in.connector: iterable-connector
+            mp.messaging.outgoing:
+                iterable-channel-out.connector: iterable-connector
+            """, type = "yaml")
+    @AddBean(IterableConnector.class)
+    @AddBean(ConnectedOnlyProcessorBean.class)
     void connectorWithProcessorOnlyTest() throws InterruptedException {
-        Map<String, String> p = Map.of(
-                "mp.messaging.incoming.iterable-channel-in.connector", "iterable-connector",
-                "mp.messaging.outgoing.iterable-channel-out.connector", "iterable-connector");
-        cdiContainer = startCdiContainer(p, IterableConnector.class, ConnectedOnlyProcessorBean.class);
-        IterableConnector connector = (IterableConnector) cdiContainer.select(ConnectorLiteral.INSTANCE).get();
+        IterableConnector connector = (IterableConnector) CDI.current().select(ConnectorLiteral.INSTANCE).get();
         assertThat("Not connected in time.", connector.await());
     }
 
-    @Test
-    void missingConnectorTest() {
-        assertThrows(DeploymentException.class, () ->
-                cdiContainer = startCdiContainer(
-                        Map.of("mp.messaging.incoming.iterable-channel-in.connector", "iterable-connector"),
-                        ConnectedBean.class));
-    }
-
     public static final class ConnectorLiteral extends AnnotationLiteral<Connector> implements Connector {
 
         public static final ConnectorLiteral INSTANCE = new ConnectorLiteral();

microprofile/messaging/core/src/test/java/io/helidon/microprofile/messaging/connector/Processor2ConnectorTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,8 +29,8 @@
 
 import io.helidon.common.reactive.BufferedEmittingPublisher;
 import io.helidon.common.reactive.Multi;
-import io.helidon.microprofile.testing.junit5.AddBean;
-import io.helidon.microprofile.testing.junit5.AddConfig;
+import io.helidon.microprofile.testing.AddBean;
+import io.helidon.microprofile.testing.AddConfigBlock;
 import io.helidon.microprofile.testing.junit5.HelidonTest;
 
 import jakarta.enterprise.context.ApplicationScoped;
@@ -58,10 +58,15 @@
 
 @HelidonTest
 @AddBean(Processor2ConnectorTest.TestConnector.class)
-@AddConfig(key = "mp.messaging.incoming.from-connector-imp.connector", value = "test-connector")
-@AddConfig(key = "mp.messaging.outgoing.to-connector-imp.connector", value = "test-connector")
-@AddConfig(key = "mp.messaging.incoming.from-connector-rs.connector", value = "test-connector")
-@AddConfig(key = "mp.messaging.outgoing.to-connector-rs.connector", value = "test-connector")
+@AddConfigBlock(value = """
+        mp.messaging:
+            incoming:
+                from-connector-imp.connector: test-connector
+                from-connector-rs.connector: test-connector
+            outgoing:
+                to-connector-imp.connector: test-connector
+                to-connector-rs.connector: test-connector
+        """, type = "yaml")
 public class Processor2ConnectorTest {
 
     static final Duration TIME_OUT = Duration.ofSeconds(5);