Support Instance<Optional> injection

extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java

@@ -177,6 +177,7 @@ void validateConfigInjectionPoints(ValidationPhaseBuildItem validationPhase,
                         || DotNames.OPTIONAL_INT.equals(injectedType.name())
                         || DotNames.OPTIONAL_LONG.equals(injectedType.name())
                         || DotNames.OPTIONAL_DOUBLE.equals(injectedType.name())
+                        || DotNames.INSTANCE.equals(injectedType.name())
                         || DotNames.PROVIDER.equals(injectedType.name())
                         || SUPPLIER_NAME.equals(injectedType.name())
                         || SR_CONFIG_VALUE_NAME.equals(injectedType.name())

extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigOptionalsTest.java

@@ -9,7 +9,9 @@
 import java.util.OptionalInt;
 import java.util.OptionalLong;
 
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -56,6 +58,9 @@ public void testOptionals() {
         assertFalse(usingOptionals.missingOptionalInt.isPresent());
         assertFalse(usingOptionals.missingOptionalLong.isPresent());
         assertFalse(usingOptionals.missingOptionalDouble.isPresent());
+
+        assertFalse(usingOptionals.instanceOptional.get().isPresent());
+        assertFalse(usingOptionals.providerOptional.get().isPresent());
     }
 
     @Singleton
@@ -107,6 +112,13 @@ static class UsingOptionals {
         @Inject
         @ConfigProperty(name = "missing")
         OptionalDouble missingOptionalDouble;
-    }
 
+        @Inject
+        @ConfigProperty(name = "missing")
+        Instance<Optional<String>> instanceOptional;
+
+        @Inject
+        @ConfigProperty(name = "missing")
+        Provider<Optional<String>> providerOptional;
+    }
 }

extensions/oidc-client-filter/runtime/src/main/java/io/quarkus/oidc/client/filter/OidcClientRequestFilter.java

@@ -13,9 +13,9 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.Provider;
 
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 
+import io.quarkus.oidc.client.filter.runtime.OidcClientFilterConfig;
 import io.quarkus.oidc.client.runtime.AbstractTokensProducer;
 import io.quarkus.oidc.client.runtime.DisabledOidcClientException;
 import io.quarkus.oidc.common.runtime.OidcConstants;
@@ -26,10 +26,8 @@
 public class OidcClientRequestFilter extends AbstractTokensProducer implements ClientRequestFilter {
     private static final Logger LOG = Logger.getLogger(OidcClientRequestFilter.class);
     private static final String BEARER_SCHEME_WITH_SPACE = OidcConstants.BEARER_SCHEME + " ";
-
     @Inject
-    @ConfigProperty(name = "quarkus.oidc-client-filter.client-name")
-    Optional<String> clientName;
+    OidcClientFilterConfig oidcClientFilterConfig;
 
     @Override
     public void filter(ClientRequestContext requestContext) throws IOException {
@@ -50,6 +48,6 @@ private String getAccessToken() {
     }
 
     protected Optional<String> clientId() {
-        return clientName;
+        return oidcClientFilterConfig.clientName;
     }
 }

extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/config/ConfigMappingWithProviderTest.java

@@ -4,6 +4,7 @@
 
 import java.io.IOException;
 
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -56,11 +57,11 @@ public String hello(@Context HttpRequest request) {
     @Provider
     public static class MappingFilter implements ContainerRequestFilter {
         @Inject
-        Mapping mapping;
+        Instance<Mapping> mapping;
 
         @Override
         public void filter(final ContainerRequestContext requestContext) throws IOException {
-            requestContext.setProperty("mapping.hello", mapping.hello());
+            requestContext.setProperty("mapping.hello", mapping.get().hello());
         }
     }
 

integration-tests/smallrye-config/src/main/java/io/quarkus/it/smallrye/config/ConfigurableExceptionMapper.java

@@ -1,5 +1,6 @@
 package io.quarkus.it.smallrye.config;
 
+import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
@@ -12,17 +13,17 @@ public class ConfigurableExceptionMapper
         implements ExceptionMapper<ConfigurableExceptionMapper.ConfigurableExceptionMapperException> {
     @Inject
     @ConfigProperty(name = "exception.message")
-    String message;
+    Instance<String> message;
     @Inject
-    ExceptionConfig exceptionConfig;
+    Instance<ExceptionConfig> exceptionConfig;
 
     @Override
     public Response toResponse(final ConfigurableExceptionMapperException exception) {
-        if (!message.equals(exceptionConfig.message())) {
+        if (!message.get().equals(exceptionConfig.get().message())) {
             return Response.serverError().build();
         }
 
-        return Response.ok().entity(message).build();
+        return Response.ok().entity(message.get()).build();
     }
 
     public static class ConfigurableExceptionMapperException extends RuntimeException {