ConfigBean not resolving config correctly

pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/AbstractConfiguredServiceProvider.java

@@ -255,13 +255,12 @@ public void onPhaseEvent(Event event,
             }
         } else if (phase == Phase.FINAL_RESOLVE) {
             // post-initialize ourselves
-            if (isRootProvider()) {
-                if (drivesActivation()) {
-                    ContextualServiceQuery query = DefaultContextualServiceQuery
-                            .builder().serviceInfoCriteria(PicoServices.EMPTY_CRITERIA)
-                            .build();
-                    maybeActivate(query);
-                }
+            if (isRootProvider()
+                    && drivesActivation()) {
+                ContextualServiceQuery query = DefaultContextualServiceQuery
+                        .builder().serviceInfoCriteria(PicoServices.EMPTY_CRITERIA)
+                        .build();
+                maybeActivate(query);
             }
 
             assertInitialized(true);
@@ -668,6 +667,7 @@ protected boolean drivesActivation() {
      */
     // expected that the generated configured service overrides this to set its new config bean value
     protected CB acceptConfig(Config config) {
+        assertIsInitializing();
         return Objects.requireNonNull(toConfigBean(config));
     }
 
@@ -720,20 +720,16 @@ void resolveConfigDrivenServices() {
 
             LogEntryAndResult logEntryAndResult = createLogEntryAndResult(Phase.PENDING);
             try {
+                if (csp.configBean().isEmpty()) {
+                    throw new PicoServiceProviderException("Expected service to have been configured already", this);
+                }
                 csp.startTransitionCurrentActivationPhase(logEntryAndResult, Phase.PENDING);
-                io.helidon.common.config.Config commonConfig = PicoServices.realizedGlobalBootStrap().config()
-                        .orElseThrow(this::expectedConfigurationSetGlobally);
-                csp.acceptConfig(commonConfig);
             } catch (Throwable t) {
                 csp.onFailedFinish(logEntryAndResult, t, true);
             }
         });
     }
 
-    private PicoException expectedConfigurationSetGlobally() {
-        return new PicoException("Expected to have configuration set globally - see PicoServices.globalBootstrap()");
-    }
-
     private void activateConfigDrivenServices() {
         assertIsInitialized();
         assert (isRootProvider());

pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/DefaultPicoConfigBeanRegistry.java

@@ -34,12 +34,12 @@
 import io.helidon.builder.AttributeVisitor;
 import io.helidon.builder.config.ConfigBean;
 import io.helidon.builder.config.spi.ConfigBeanInfo;
-import io.helidon.builder.config.spi.ConfigProvider;
 import io.helidon.builder.config.spi.MetaConfigBeanInfo;
 import io.helidon.common.config.Config;
 import io.helidon.common.config.ConfigException;
 import io.helidon.config.ConfigValue;
 import io.helidon.config.metadata.ConfiguredOption;
+import io.helidon.pico.api.Bootstrap;
 import io.helidon.pico.api.PicoException;
 import io.helidon.pico.api.PicoServiceProviderException;
 import io.helidon.pico.api.PicoServices;
@@ -185,8 +185,8 @@ public void initialize(PicoServices ignoredPicoServices) {
             Config config = PicoServices.realizedGlobalBootStrap().config().orElse(null);
             if (config == null) {
                 LOGGER.log(System.Logger.Level.WARNING,
-                           "unable to initialize - no config to read - be sure to provide or initialize "
-                                   + ConfigProvider.class.getName() + " prior to service activation.");
+                           "Unable to initialize - there is no config to read - be sure to initialize "
+                                   + Bootstrap.class.getName() + " config prior to service activation.");
                 reset(true);
                 return;
             }

pico/configdriven/tests/configuredby/src/main/java/io/helidon/pico/configdriven/configuredby/test/AbstractConfiguredByTest.java

@@ -141,8 +141,8 @@ void testRegistry() {
         list = services.lookupAll(criteria);
         desc = list.stream().map(ServiceProvider::description).collect(Collectors.toList());
         assertThat("no root providers expected in result, but all are auto-started unless overridden", desc,
-                   contains("FakeWebServer{3}:ACTIVE",
-                            "FakeWebServerNotDrivenAndHavingConfiguredByOverrides{2}:PENDING"));
+                   contains("FakeWebServer{fake-server}:ACTIVE",
+                            "FakeWebServerNotDrivenAndHavingConfiguredByOverrides{fake-server}:PENDING"));
 
         criteria = DefaultServiceInfoCriteria.builder()
                 .serviceTypeName(FakeTlsWSNotDrivenByCB.class.getName())
@@ -173,7 +173,7 @@ void testRegistry() {
         list = services.lookupAll(criteria);
         desc = list.stream().map(ServiceProvider::description).collect(Collectors.toList());
         assertThat("Slave providers expected here since we have default configuration for this service", desc,
-                   contains("ASingletonService{1}:ACTIVE"));
+                   contains("ASingletonService{@default}:ACTIVE"));
     }
 
     //    @Test