This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 1ccdf2d576 Modernize AsyncLoggersWithAsyncAppenderTest
new 0ed62c983b Migrate to ConfigurableInstanceFactory API
new 0d882b14f0 Use PropertyEnvironment in LoggerContext
new 3a59400580 Reduce noise of debug logs
new 2850b5715f Clarify Configurable docs around plugin namespaces
new 7777592073 Rearrange dependency injection of ConfigurationFactory
new 07586b1393 Merge branch 'main' into di-rebased
new ec2f1e75c3 Make FactoryResolver a generic interface
new 69bf306155 Merge branch 'main' into di-rebased
new e6fa11322f Merge pull request #1752 from jvz/di-rebased
The 12862 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/log4j/builders/BuilderManager.java | 14 +-
.../apache/log4j/config/Log4j1Configuration.java | 5 +-
.../apache/log4j/builders/BuilderManagerTest.java | 6 +-
.../apache/log4j/config/XmlConfigurationTest.java | 10 +-
.../apache/logging/log4j/spi/LoggerContext.java | 3 +-
.../java/org/apache/logging/log4j/util/Lazy.java | 24 +
.../org/apache/logging/log4j/util/LazyUtil.java | 29 +
.../core/test/junit/ConfigurationFactoryType.java | 22 +-
....java => ConfigurationFactoryTypeCallback.java} | 29 +-
.../core/test/junit/ContextSelectorCallback.java | 11 +-
.../core/test/junit/LoggerContextResolver.java | 17 +-
.../log4j/core/test/junit/LoggerContextRule.java | 11 +-
.../log4j/core/test/junit/LoggerContextSource.java | 8 +
.../apache/logging/log4j/core/LateConfigTest.java | 14 +-
.../AsyncLoggerConfigWithAsyncEnabledTest.java | 16 +-
...AsyncLoggerContextSelectorInitialStateTest.java | 5 +-
.../core/async/AsyncLoggerContextSelectorTest.java | 20 +-
.../async/AsyncLoggersWithAsyncAppenderTest.java | 4 +-
.../AsyncLoggersWithAsyncLoggerConfigTest.java | 4 +-
.../log4j/core/async/AsyncThreadContextTest.java | 11 +-
.../log4j/core/async/Log4j2Jira1688AsyncTest.java | 48 +-
.../core/config/ConfigurationProcessorTest.java | 145 ++++
.../LoggerContextAwarePostProcessorTest.java | 29 +-
.../log4j/core/config/NullConfigurationTest.java | 18 +-
.../config/plugins/convert/TypeConvertersTest.java | 5 +-
.../validators/RequiredValidatorTest.java | 18 +-
.../validators/ValidHostValidatorTest.java | 19 +-
.../validators/ValidPortValidatorTest.java | 17 +-
.../ValidatingPluginWithFailoverTest.java | 19 +-
.../ValidatingPluginWithGenericBuilderTest.java | 18 +-
...ngPluginWithGenericSubclassFoo1BuilderTest.java | 18 +-
.../ValidatingPluginWithTypedBuilderTest.java | 18 +-
.../log4j/core/impl/Log4jContextFactoryTest.java | 7 +-
.../core/impl/ReusableLogEventFactoryTest.java | 20 +-
.../logging/log4j/core/layout/GelfLayoutTest.java | 18 +-
.../logging/log4j/core/layout/HtmlLayoutTest.java | 22 +-
.../log4j/core/layout/PatternLayoutTest.java | 15 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 42 +-
.../log4j/core/layout/SyslogLayoutTest.java | 20 +-
.../plugins/convert/CoreTypeConvertersTest.java | 27 +-
.../logging/log4j/core/time/ClockFactoryTest.java | 39 +-
.../util/NamedLoggerContextPropertiesTest.java | 14 +-
log4j-core/src/main/java/module-info.java | 13 +-
.../apache/logging/log4j/core/LoggerContext.java | 108 ++-
.../core/annotation/OnPropertyKeyCondition.java | 7 +-
.../log4j/core/appender/db/ColumnMapping.java | 10 +-
.../log4j/core/async/AsyncLoggerContext.java | 10 +-
.../core/async/AsyncLoggerContextSelector.java | 10 +-
.../async/BasicAsyncLoggerContextSelector.java | 8 +-
.../log4j/core/config/AbstractConfiguration.java | 112 +--
.../logging/log4j/core/config/Configuration.java | 8 -
.../config/ConfigurationAwarePostProcessor.java | 24 +-
.../log4j/core/config/ConfigurationFactory.java | 22 +-
.../log4j/core/config/ConfigurationProcessor.java | 154 ++++
.../core/config/DefaultConfigurationFactory.java | 17 +-
.../LoggerContextAwarePostProcessor.java} | 32 +-
.../config/composite/CompositeConfiguration.java | 2 +-
.../log4j/core/config/jason/JsonConfiguration.java | 16 +-
.../log4j/core/config/plugins/PluginAttribute.java | 3 -
.../config/plugins/PluginBuilderAttribute.java | 3 -
.../core/config/plugins/PluginConfiguration.java | 3 -
.../log4j/core/config/plugins/PluginElement.java | 3 -
.../core/config/plugins/PluginLoggerContext.java | 3 -
.../log4j/core/config/plugins/PluginNode.java | 3 -
.../log4j/core/config/plugins/PluginValue.java | 3 -
...acyAnnotationFactoryResolversPostProcessor.java | 40 +
.../util/LegacyPluginAttributeFactoryResolver.java | 71 ++
...egacyPluginBuilderAttributeFactoryResolver.java | 42 +
.../util/LegacyPluginElementFactoryResolver.java | 15 +-
.../util/LegacyPluginNodeFactoryResolver.java | 25 +-
.../util/LegacyPluginValueFactoryResolver.java | 20 +-
.../util/PluginConfigurationFactoryResolver.java | 21 +-
.../util/PluginLoggerContextFactoryResolver.java | 26 +-
.../plugins/visit/PluginAttributeVisitor.java | 110 ---
.../visit/PluginBuilderAttributeVisitor.java | 41 -
.../plugins/visit/PluginConfigurationVisitor.java | 65 --
.../plugins/visit/PluginLoggerContextVisitor.java | 69 --
.../logging/log4j/core/impl/DefaultBundle.java | 164 +---
.../log4j/core/impl/DefaultLogEventFactory.java | 4 +-
.../log4j/core/impl/Log4jContextFactory.java | 80 +-
...java => Log4jInstanceFactoryPostProcessor.java} | 25 +-
...ava => Log4jModuleReflectionPostProcessor.java} | 25 +-
.../log4j/core/impl/SystemPropertyBundle.java | 107 +++
.../logging/log4j/core/jmx/LoggerContextAdmin.java | 7 +-
.../logging/log4j/core/lookup/Interpolator.java | 17 +-
.../logging/log4j/core/lookup/StrSubstitutor.java | 8 +-
.../apache/logging/log4j/core/osgi/Activator.java | 57 +-
.../log4j/core/osgi/BundleContextSelector.java | 6 +-
.../log4j/core/osgi/OsgiBundlePostProcessor.java | 72 ++
.../logging/log4j/core/pattern/PatternParser.java | 2 +-
.../log4j/core/selector/BasicContextSelector.java | 15 +-
.../core/selector/ClassLoaderContextSelector.java | 36 +-
.../log4j/core/selector/ContextSelector.java | 6 +-
.../logging/log4j/core/time/ClockFactory.java | 55 +-
.../logging/log4j/core/util/WatcherFactory.java | 5 +-
...i.spi.ConfigurableInstanceFactoryPostProcessor} | 4 +-
.../logging/log4j/couchdb/CouchDbProvider.java | 7 +-
.../log4j/csv/layout/CsvLogEventLayoutTest.java | 18 +-
.../log4j/flume/appender/FlumeAppender.java | 6 +-
.../flume/appender/FlumePersistentManager.java | 16 +-
.../log4j/flume/appender/FlumeAppenderTest.java | 27 +-
.../log4j/jackson/json/layout/JsonLayoutTest.java | 18 +-
.../log4j/jackson/xml/layout/XmlLayoutTest.java | 12 +-
.../log4j/jackson/yaml/layout/YamlLayoutTest.java | 18 +-
.../template/json/util/RecyclerFactoriesTest.java | 7 +-
.../logging/log4j/mongodb3/MongoDb3Provider.java | 11 +-
.../PluginWithGenericSubclassFoo1Builder.java | 4 +-
.../plugins/test/validation/ValidatingPlugin.java | 10 +-
.../ValidatingPluginWithGenericBuilder.java | 4 +-
.../ValidatingPluginWithTypedBuilder.java | 4 +-
.../test/validation/{generic => di}/AlphaBean.java | 2 +-
.../BaseBean.java => di/AnotherSingletonBean.java} | 8 +-
.../test/validation/{generic => di}/BaseBean.java | 2 +-
.../test/validation/{generic => di}/BetaBean.java | 2 +-
.../test/validation/di/ConfigurablePlugin.java | 67 ++
.../BaseBean.java => di/CustomQualifier.java} | 12 +-
.../{generic/BaseBean.java => di/CustomScope.java} | 12 +-
.../test/validation/di/FirstCircularBean.java | 18 +-
.../test/validation/{generic => di}/GammaBean.java | 2 +-
.../BaseBean.java => di/PrototypeBean.java} | 7 +-
.../test/validation/di/PrototypeChildBean.java | 18 +-
.../validation/di/PrototypeGrandchildBean.java | 18 +-
.../test/validation/di/SecondCircularBean.java | 18 +-
.../BaseBean.java => di/SingletonBean.java} | 8 +-
log4j-plugins-test/src/main/java9/module-info.java | 1 +
.../condition/OnMissingBindingConditionTest.java | 33 +-
.../plugins/condition/OnPropertyConditionTest.java | 91 +-
.../plugins/convert/TypeConverterRegistryTest.java | 15 +-
...t.java => CircularDependencyExceptionTest.java} | 19 +-
.../di/ConfigurableInstanceFactoryTest.java | 300 +++++++
.../log4j/plugins/di/ConstructorInjectionTest.java | 57 ++
.../logging/log4j/plugins/di/CustomScopeTest.java | 61 ++
.../log4j/plugins/di/FieldInjectionTest.java | 70 ++
.../logging/log4j/plugins/di/InjectorTest.java | 919 ---------------------
.../log4j/plugins/di/InstanceFactoryTest.java | 47 ++
.../apache/logging/log4j/plugins/di/KeyTest.java | 15 +-
.../apache/logging/log4j/plugins/di/KeysTest.java | 42 +-
.../log4j/plugins/di/MethodInjectionTest.java | 83 ++
.../log4j/plugins/di/QualifierInjectionTest.java | 98 +++
.../log4j/plugins/util/AnnotationUtilTest.java | 25 +-
log4j-plugins/src/main/java/module-info.java | 32 +-
.../apache/logging/log4j/plugins/Configurable.java | 18 +-
.../org/apache/logging/log4j/plugins/Factory.java | 2 +
.../org/apache/logging/log4j/plugins/Node.java | 76 +-
.../org/apache/logging/log4j/plugins/Ordered.java | 6 +-
.../org/apache/logging/log4j/plugins/Plugin.java | 1 +
.../logging/log4j/plugins/PluginAliases.java | 1 -
.../logging/log4j/plugins/PluginAttribute.java | 36 +-
.../log4j/plugins/PluginBuilderAttribute.java | 10 +-
.../logging/log4j/plugins/PluginElement.java | 15 +-
.../logging/log4j/plugins/PluginFactory.java | 13 +-
.../apache/logging/log4j/plugins/PluginNode.java | 6 +-
.../apache/logging/log4j/plugins/PluginValue.java | 5 +-
.../logging/log4j/plugins/condition/Condition.java | 7 +-
.../log4j/plugins/condition/ConditionContext.java | 56 ++
.../log4j/plugins/condition/Conditional.java | 16 +-
...perty.java => ConditionalOnMissingBinding.java} | 14 +-
.../plugins/condition/ConditionalOnProperty.java | 2 +
...ndition.java => OnMissingBindingCondition.java} | 21 +-
.../plugins/condition/OnPropertyCondition.java | 47 +-
.../log4j/plugins/convert/TypeConverter.java | 2 +
.../plugins/convert/TypeConverterFactory.java | 9 +-
.../di/AmbiguousInjectConstructorException.java | 5 +
.../plugins/di/CircularDependencyException.java | 2 +
.../plugins/di/ConfigurableInstanceFactory.java | 183 ++++
.../org/apache/logging/log4j/plugins/di/DI.java | 54 +-
.../logging/log4j/plugins/di/DefaultInjector.java | 649 ---------------
.../log4j/plugins/di/DefaultInstanceFactory.java | 397 +++++++++
...ltScope.java => DuplicateBindingException.java} | 19 +-
.../apache/logging/log4j/plugins/di/Injector.java | 210 -----
.../logging/log4j/plugins/di/InjectorCallback.java | 49 --
.../logging/log4j/plugins/di/InstanceFactory.java | 184 +++++
.../org/apache/logging/log4j/plugins/di/Key.java | 149 +++-
.../org/apache/logging/log4j/plugins/di/Keys.java | 54 +-
...ption.java => NoQualifiedBindingException.java} | 38 +-
.../log4j/plugins/di/NotInjectableException.java | 6 +
.../log4j/plugins/di/ReflectionAccessor.java | 85 --
.../resolver/AbstractAttributeFactoryResolver.java | 83 ++
.../di/resolver/AbstractPluginFactoryResolver.java | 45 +
.../GenericFactoryResolversPostProcessor.java | 22 +-
.../di/resolver/OptionalFactoryResolver.java | 60 ++
...ginAnnotationFactoryResolversPostProcessor.java | 85 ++
.../resolver/PluginAttributeFactoryResolver.java | 73 ++
.../PluginBuilderAttributeFactoryResolver.java | 43 +
.../di/resolver/PluginElementFactoryResolver.java | 136 +++
.../di/resolver/PluginListFactoryResolver.java | 50 ++
.../PluginListSupplierFactoryResolver.java | 52 ++
.../di/resolver/PluginMapFactoryResolver.java | 54 ++
.../resolver/PluginMapSupplierFactoryResolver.java | 60 ++
.../resolver/PluginNamespaceFactoryResolver.java | 42 +
.../di/resolver/PluginOptionalFactoryResolver.java | 46 ++
.../PluginOptionalSupplierFactoryResolver.java | 49 ++
.../di/resolver/PluginSetFactoryResolver.java | 50 ++
.../resolver/PluginSetSupplierFactoryResolver.java | 52 ++
.../di/resolver/PluginStreamFactoryResolver.java | 46 ++
.../PluginStreamPluginTypeFactoryResolver.java | 62 ++
.../PluginStreamSupplierFactoryResolver.java | 50 ++
.../di/resolver/PluginTypeFactoryResolver.java | 49 ++
.../di/resolver/PluginValueFactoryResolver.java | 79 ++
.../logging/log4j/plugins/di/resolver/Plugins.java | 61 ++
.../di/resolver/SupplierFactoryResolver.java | 47 ++
.../{visit => di/resolver}/package-info.java | 13 +-
.../ConfigurableInstanceFactoryPostProcessor.java | 55 ++
.../plugins/di/{ => spi}/DependencyChain.java | 4 +-
.../plugins/di/{ => spi}/DependencyChains.java | 4 +-
.../log4j/plugins/di/spi/FactoryResolver.java | 49 ++
.../FactoryResolversPostProcessor.java} | 28 +-
.../log4j/plugins/di/{ => spi}/InjectionPoint.java | 28 +-
.../InstancePostProcessor.java} | 16 +-
.../log4j/plugins/di/spi/ReflectionAgent.java | 114 +++
.../spi/ReflectionException.java} | 15 +-
.../log4j/plugins/di/spi/ResolvableKey.java | 84 ++
.../logging/log4j/plugins/di/{ => spi}/Scope.java | 7 +-
.../log4j/plugins/di/{ => spi}/SingletonScope.java | 3 +-
.../di/spi/SingletonScopePostProcessor.java | 19 +-
.../log4j/plugins/di/spi/StringValueResolver.java | 43 +
.../plugins/{visit => di/spi}/package-info.java | 5 +-
.../log4j/plugins/internal/util/BeanUtils.java | 77 +-
.../log4j/plugins/internal/util/BindingMap.java | 137 +++
.../logging/log4j/plugins/model/PluginType.java | 17 +-
.../AnnotatedAnnotation.java} | 32 +-
.../logging/log4j/plugins/util/AnnotationUtil.java | 139 +++-
.../log4j/plugins/util/OrderedComparator.java | 18 +-
.../logging/log4j/plugins/util/TypeUtil.java | 15 +-
.../validation/validators/ValidPortValidator.java | 7 +-
.../logging/log4j/plugins/visit/NodeVisitor.java | 87 --
.../plugins/visit/PluginAttributeVisitor.java | 109 ---
.../visit/PluginBuilderAttributeVisitor.java | 78 --
.../log4j/plugins/visit/PluginElementVisitor.java | 131 ---
.../log4j/plugins/visit/PluginNodeVisitor.java | 53 --
.../log4j/plugins/visit/PluginValueVisitor.java | 77 --
...di.spi.ConfigurableInstanceFactoryPostProcessor | 4 +-
.../spring/boot/Log4j2SpringBootLoggingSystem.java | 4 +-
.../log4j/spring/boot/SpringLookupTest.java | 2 +-
src/site/asciidoc/manual/dependencyinjection.adoc | 29 +-
235 files changed, 5959 insertions(+), 4324 deletions(-)
copy log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/Ordered.java
=>
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/ConfigurationFactoryType.java
(67%)
copy
log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/{ContextSelectorCallback.java
=> ConfigurationFactoryTypeCallback.java} (57%)
create mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/ConfigurationProcessorTest.java
copy
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/KeysTest.java
=>
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/LoggerContextAwarePostProcessorTest.java
(50%)
copy
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/GammaBean.java
=>
log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/NullConfigurationTest.java
(71%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/SingletonScope.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationAwarePostProcessor.java
(52%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationProcessor.java
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/{async/BasicAsyncLoggerContextSelector.java
=> config/LoggerContextAwarePostProcessor.java} (50%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyAnnotationFactoryResolversPostProcessor.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginAttributeFactoryResolver.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginBuilderAttributeFactoryResolver.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginElementFactoryResolver.java
(65%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/SingletonScope.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginNodeFactoryResolver.java
(52%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultScope.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/LegacyPluginValueFactoryResolver.java
(66%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultScope.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginConfigurationFactoryResolver.java
(50%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/SingletonScope.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginLoggerContextFactoryResolver.java
(50%)
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visit/PluginAttributeVisitor.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visit/PluginBuilderAttributeVisitor.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visit/PluginConfigurationVisitor.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visit/PluginLoggerContextVisitor.java
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/{DefaultCallback.java
=> Log4jInstanceFactoryPostProcessor.java} (54%)
rename
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/{DefaultCallback.java
=> Log4jModuleReflectionPostProcessor.java} (52%)
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/SystemPropertyBundle.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/osgi/OsgiBundlePostProcessor.java
copy
log4j-core/src/main/resources/META-INF/services/{org.apache.logging.log4j.plugins.di.InjectorCallback
=>
org.apache.logging.log4j.plugins.di.spi.ConfigurableInstanceFactoryPostProcessor}
(76%)
rename
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic
=> di}/AlphaBean.java (94%)
copy
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic/BaseBean.java
=> di/AnotherSingletonBean.java} (83%)
copy
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic
=> di}/BaseBean.java (93%)
copy
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic
=> di}/BetaBean.java (94%)
create mode 100644
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/ConfigurablePlugin.java
copy
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic/BaseBean.java
=> di/CustomQualifier.java} (73%)
copy
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic/BaseBean.java
=> di/CustomScope.java} (74%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
=>
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/FirstCircularBean.java
(68%)
rename
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic
=> di}/GammaBean.java (94%)
copy
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic/BaseBean.java
=> di/PrototypeBean.java} (83%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
=>
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/PrototypeChildBean.java
(70%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
=>
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/PrototypeGrandchildBean.java
(68%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/AmbiguousInjectConstructorException.java
=>
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/di/SecondCircularBean.java
(69%)
rename
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/{generic/BaseBean.java
=> di/SingletonBean.java} (83%)
copy
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/{KeysTest.java
=> CircularDependencyExceptionTest.java} (56%)
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactoryTest.java
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/ConstructorInjectionTest.java
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/CustomScopeTest.java
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/FieldInjectionTest.java
delete mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/InjectorTest.java
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/InstanceFactoryTest.java
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/MethodInjectionTest.java
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/di/QualifierInjectionTest.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/ConditionContext.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/{ConditionalOnProperty.java
=> ConditionalOnMissingBinding.java} (74%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/{Condition.java
=> OnMissingBindingCondition.java} (58%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ConfigurableInstanceFactory.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultInjector.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultInstanceFactory.java
rename
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{DefaultScope.java
=> DuplicateBindingException.java} (74%)
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/Injector.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/InjectorCallback.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/InstanceFactory.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{NotInjectableException.java
=> NoQualifiedBindingException.java} (51%)
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/ReflectionAccessor.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/AbstractAttributeFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/AbstractPluginFactoryResolver.java
copy
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BetaBean.java
=>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/GenericFactoryResolversPostProcessor.java
(60%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/OptionalFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginAnnotationFactoryResolversPostProcessor.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginAttributeFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginBuilderAttributeFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginElementFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListSupplierFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapSupplierFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginNamespaceFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalSupplierFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetSupplierFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamPluginTypeFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamSupplierFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginTypeFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginValueFactoryResolver.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/Plugins.java
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/SupplierFactoryResolver.java
copy log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{visit =>
di/resolver}/package-info.java (51%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ConfigurableInstanceFactoryPostProcessor.java
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ =>
spi}/DependencyChain.java (94%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ =>
spi}/DependencyChains.java (97%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/FactoryResolver.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{SingletonScope.java
=> spi/FactoryResolversPostProcessor.java} (51%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ =>
spi}/InjectionPoint.java (77%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{AmbiguousInjectConstructorException.java
=> spi/InstancePostProcessor.java} (61%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ReflectionAgent.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{condition/Condition.java
=> di/spi/ReflectionException.java} (69%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ResolvableKey.java
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ =>
spi}/Scope.java (77%)
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/{ =>
spi}/SingletonScope.java (93%)
rename
log4j-plugins-test/src/main/java/org/apache/logging/log4j/plugins/test/validation/generic/BetaBean.java
=>
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/SingletonScopePostProcessor.java
(63%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/StringValueResolver.java
rename log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{visit =>
di/spi}/package-info.java (81%)
create mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/internal/util/BindingMap.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/{di/CircularDependencyException.java
=> util/AnnotatedAnnotation.java} (51%)
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/NodeVisitor.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginAttributeVisitor.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginBuilderAttributeVisitor.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginElementVisitor.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginNodeVisitor.java
delete mode 100644
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/visit/PluginValueVisitor.java
rename
log4j-core/src/main/resources/META-INF/services/org.apache.logging.log4j.plugins.di.InjectorCallback
=>
log4j-plugins/src/main/resources/META-INF/services/org.apache.logging.log4j.plugins.di.spi.ConfigurableInstanceFactoryPostProcessor
(76%)
