diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
index c4ea3871a35..dda2c8377b3 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
@@ -23,6 +23,7 @@ import java.lang.reflect.Executable;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -196,10 +197,9 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 
 	private ApplicationStartup applicationStartup = ApplicationStartup.DEFAULT;
 
-	@SuppressWarnings("NullAway.Init")
-	private List<PropertySourceDescriptor> propertySourceDescriptors;
+	private List<PropertySourceDescriptor> propertySourceDescriptors = Collections.emptyList();
 
-	private Map<String, BeanRegistrar> beanRegistrars = new LinkedHashMap<>();
+	private final Map<String, BeanRegistrar> beanRegistrars = new LinkedHashMap<>();
 
 
 	@Override
@@ -842,6 +842,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 		}
 	}
 
+
 	private static class BeanRegistrarAotContribution implements BeanFactoryInitializationAotContribution {
 
 		private static final String CUSTOMIZER_MAP_VARIABLE = "customizers";