Config: remove the warning for ConfigInjectionStaticInitBuildItem

- deprecate ConfigInjectionStaticInitBuildItem
mkouba · Oct 5, 2023 · 0611e6c · 0611e6c
1 parent a8da59a
commit 0611e6c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 278 deletions.
diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ConfigBuildStep.java
@@ -30,7 +30,6 @@
 import jakarta.enterprise.context.Dependent;
 import jakarta.enterprise.inject.CreationException;
 
-import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigValue;
 import org.eclipse.microprofile.config.inject.ConfigProperties;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -42,10 +41,8 @@
 import org.jboss.jandex.DotName;
 import org.jboss.jandex.FieldInfo;
 import org.jboss.jandex.MethodInfo;
-import org.jboss.jandex.ParameterizedType;
 import org.jboss.jandex.Type;
 import org.jboss.jandex.Type.Kind;
-import org.jboss.logging.Logger;
 
 import io.quarkus.arc.Unremovable;
 import io.quarkus.arc.deployment.BeanRegistrationPhaseBuildItem.BeanConfiguratorBuildItem;
@@ -67,7 +64,6 @@
 import io.quarkus.deployment.builditem.ConfigPropertiesBuildItem;
 import io.quarkus.deployment.builditem.ConfigurationBuildItem;
 import io.quarkus.deployment.builditem.GeneratedClassBuildItem;
-import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.configuration.definition.RootDefinition;
 import io.quarkus.deployment.recording.RecorderContext;
@@ -80,14 +76,11 @@
  * MicroProfile Config related build steps.
  */
 public class ConfigBuildStep {
-    private static final Logger LOGGER = Logger.getLogger(ConfigBuildStep.class.getName());
 
-    private static final DotName MP_CONFIG = DotName.createSimple(Config.class.getName());
     static final DotName MP_CONFIG_PROPERTY_NAME = DotName.createSimple(ConfigProperty.class.getName());
     private static final DotName MP_CONFIG_PROPERTIES_NAME = DotName.createSimple(ConfigProperties.class.getName());
     private static final DotName MP_CONFIG_VALUE_NAME = DotName.createSimple(ConfigValue.class.getName());
 
-    private static final DotName SR_CONFIG = DotName.createSimple(io.smallrye.config.SmallRyeConfig.class.getName());
     private static final DotName SR_CONFIG_VALUE_NAME = DotName.createSimple(io.smallrye.config.ConfigValue.class.getName());
 
     private static final DotName MAP_NAME = DotName.createSimple(Map.class.getName());
@@ -474,67 +467,6 @@ void validateConfigPropertiesInjectionPoints(
         toRegister.forEach(configProperties::produce);
     }
 
-    @BuildStep
-    void warnStaticInitInjectionPoints(
-            CombinedIndexBuildItem indexBuildItem,
-            ValidationPhaseBuildItem validationPhase,
-            List<ConfigClassBuildItem> configClasses,
-            List<ConfigInjectionStaticInitBuildItem> configInjectionStaticInit,
-            BuildProducer<RunTimeConfigurationDefaultBuildItem> runTimeConfigurationDefault) {
-
-        // Add here annotated classes that are initialized during static init
-        Set<DotName> declaringClassCandidates = configInjectionStaticInit.stream()
-                .map(ConfigInjectionStaticInitBuildItem::getDeclaringCandidate).collect(toSet());
-
-        Set<Type> configClassesTypes = configClasses.stream().map(ConfigClassBuildItem::getTypes).flatMap(Collection::stream)
-                .collect(toSet());
-
-        for (InjectionPointInfo injectionPoint : validationPhase.getContext().getInjectionPoints()) {
-            if (injectionPoint.getType().name().equals(DotNames.INSTANCE)) {
-                continue;
-            }
-
-            Type type = Type.create(injectionPoint.getRequiredType().name(), Type.Kind.CLASS);
-            DotName injectionTypeName = null;
-            if (type.name().equals(MP_CONFIG) || type.name().equals(SR_CONFIG)) {
-                injectionTypeName = type.name();
-            } else if (injectionPoint.getRequiredQualifier(MP_CONFIG_PROPERTY_NAME) != null) {
-                injectionTypeName = MP_CONFIG_PROPERTY_NAME;
-            } else if (configClassesTypes.contains(type)) {
-                injectionTypeName = type.name();
-            }
-
-            if (injectionTypeName != null) {
-                AnnotationTarget target = injectionPoint.getTarget();
-                if (FIELD.equals(target.kind())) {
-                    FieldInfo field = target.asField();
-                    ClassInfo declaringClass = field.declaringClass();
-                    Map<DotName, List<AnnotationInstance>> annotationsMap = declaringClass.annotationsMap();
-                    for (DotName declaringClassCandidate : declaringClassCandidates) {
-                        List<AnnotationInstance> annotationInstances = annotationsMap.get(declaringClassCandidate);
-                        if (annotationInstances != null && annotationInstances.size() == 1) {
-                            AnnotationInstance annotationInstance = annotationInstances.get(0);
-                            if (annotationInstance.target().equals(declaringClass)) {
-                                LOGGER.warn("Directly injecting a " +
-                                        injectionTypeName +
-                                        " into a " +
-                                        declaringClassCandidate +
-                                        " may lead to unexpected results. To ensure proper results, please " +
-                                        "change the type of the field to " +
-                                        ParameterizedType.create(DotNames.INSTANCE, new Type[] { type }, null) +
-                                        ". Offending field is '" +
-                                        field.name() +
-                                        "' of class '" +
-                                        field.declaringClass() +
-                                        "'");
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     @BuildStep
     @Record(RUNTIME_INIT)
     void registerConfigClasses(

diff --git a/...eployment/src/main/java/io/quarkus/arc/deployment/ConfigInjectionStaticInitBuildItem.java b/...eployment/src/main/java/io/quarkus/arc/deployment/ConfigInjectionStaticInitBuildItem.java
@@ -4,6 +4,11 @@
 
 import io.quarkus.builder.item.MultiBuildItem;
 
+/**
+ *
+ * @deprecated This build item is not used anymore
+ */
+@Deprecated(forRemoval = true)
 public final class ConfigInjectionStaticInitBuildItem extends MultiBuildItem {
     private final DotName declaringCandidate;
 

diff --git a/...ployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java b/...ployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java
@@ -43,7 +43,6 @@
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
-import io.quarkus.arc.deployment.ConfigInjectionStaticInitBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.processor.DotNames;
 import io.quarkus.deployment.Capabilities;
@@ -181,11 +180,6 @@ ResteasyInjectionReadyBuildItem setupResteasyInjection(
         return new ResteasyInjectionReadyBuildItem(injectorFactory);
     }
 
-    @BuildStep
-    ConfigInjectionStaticInitBuildItem configInjectionStaticInitProvider() {
-        return new ConfigInjectionStaticInitBuildItem(ResteasyDotNames.PROVIDER);
-    }
-
     @BuildStep
     JaxrsProvidersToRegisterBuildItem setupProviders(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             CombinedIndexBuildItem indexBuildItem,

diff --git a/...nt/src/test/java/io/quarkus/resteasy/test/config/ProviderConfigInjectionWarningsTest.java b/...nt/src/test/java/io/quarkus/resteasy/test/config/ProviderConfigInjectionWarningsTest.java
diff --git a/...s/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java b/...s/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java
@@ -81,7 +81,6 @@
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem;
 import io.quarkus.arc.deployment.BeanContainerBuildItem;
-import io.quarkus.arc.deployment.ConfigInjectionStaticInitBuildItem;
 import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem;
 import io.quarkus.arc.deployment.ContextRegistrationPhaseBuildItem.ContextConfiguratorBuildItem;
 import io.quarkus.arc.deployment.CustomScopeBuildItem;
@@ -685,11 +684,6 @@ SyntheticBeanBuildItem servletContextBean(
                 .supplier(recorder.servletContextSupplier()).done();
     }
 
-    @BuildStep
-    ConfigInjectionStaticInitBuildItem configInjectionStaticInitAnnotations() {
-        return new ConfigInjectionStaticInitBuildItem(WEB_FILTER);
-    }
-
     /**
      * Process a single index.
      *

diff --git a/...t/src/test/java/io/quarkus/undertow/test/config/WebFilterConfigInjectionWarningsTest.java b/...t/src/test/java/io/quarkus/undertow/test/config/WebFilterConfigInjectionWarningsTest.java