Pico cfg driven with additional ctor injection points fix

examples/nima/pico/src/test/java/io/helidon/examples/nima/pico/GreetEndpointTest.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2023 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.examples.nima.pico;
+
+import org.junit.jupiter.api.Test;
+
+class GreetEndpointTest {
+
+    @Test
+    void testIt() {
+        PicoMain.main(new String[] {});
+    }
+
+}

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

@@ -324,7 +324,7 @@ public Optional<Object> resolve(InjectionPointInfo ipInfo,
                 .addContractImplemented(configBeanType().getName())
                 .build();
         if (!dep.matchesContracts(criteria)) {
-            return Optional.empty();
+            return Optional.empty();    // we are being injected with neither a config bean nor a service that matches ourselves
         }
 
         // if we are here then we are asking for a config bean for ourselves, or a slave/managed instance

pico/runtime/src/main/java/io/helidon/pico/runtime/DefaultInjectionPlans.java

@@ -109,13 +109,14 @@ private static void accumulate(DependencyInfo dep,
                                     .orElse(null);
                             Object target = (resolved instanceof Optional)
                                     ? ((Optional<?>) resolved).orElse(null) : resolved;
-                            DefaultPicoInjectionPlan.Builder planBuilder = DefaultPicoInjectionPlan.builder()
-                                    .serviceProvider(self)
-                                    .injectionPointInfo(ipInfo)
-                                    .injectionPointQualifiedServiceProviders(toIpQualified(target))
-                                    .unqualifiedProviders(toIpUnqualified(target))
-                                    .wasResolved(resolved != null);
                             if (target != null) {
+                                DefaultPicoInjectionPlan.Builder planBuilder = DefaultPicoInjectionPlan.builder()
+                                        .serviceProvider(self)
+                                        .injectionPointInfo(ipInfo)
+                                        .injectionPointQualifiedServiceProviders(toIpQualified(target))
+                                        .unqualifiedProviders(toIpUnqualified(target))
+                                        .wasResolved(resolved != null);
+
                                 if (ipInfo.optionalWrapped()) {
                                     planBuilder.resolved((target instanceof Optional && ((Optional<?>) target).isEmpty())
                                                                  ? Optional.empty() : Optional.of(target));
@@ -125,9 +126,11 @@ private static void accumulate(DependencyInfo dep,
                                     }
                                     planBuilder.resolved(target);
                                 }
+
+                                PicoInjectionPlan plan = planBuilder.build();
+                                Object prev = result.put(id, plan);
+                                assert (prev == null) : ipInfo;
                             }
-                            Object prev = result.put(id, planBuilder.build());
-                            assert (prev == null) : ipInfo;
                         }
                     });
         }
@@ -143,8 +146,8 @@ private static void accumulate(DependencyInfo dep,
         List<ServiceProvider<?>> serviceProviders =
                 (tmpServiceProviders != null && !tmpServiceProviders.isEmpty())
                         ? tmpServiceProviders.stream()
-                        .filter(sp -> !isSelf(self, sp))
-                        .collect(Collectors.toList())
+                                .filter(sp -> !isSelf(self, sp))
+                                .collect(Collectors.toList())
                         : tmpServiceProviders;
 
         dep.injectionPointDependencies()
@@ -163,7 +166,7 @@ private static void accumulate(DependencyInfo dep,
                             throw DefaultServices.resolutionBasedInjectionError(
                                     ipInfo.dependencyToServiceInfo());
                         }
-                        DefaultPicoInjectionPlan plan = DefaultPicoInjectionPlan.builder()
+                        PicoInjectionPlan plan = DefaultPicoInjectionPlan.builder()
                                 .injectionPointInfo(ipInfo)
                                 .injectionPointQualifiedServiceProviders(serviceProviders)
                                 .serviceProvider(self)