This is an automated email from the ASF dual-hosted git repository. mattsicker pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 8ebb0d9e45d31fc5ec69d43ff571baf9dfdbd16a Author: Matt Sicker <[email protected]> AuthorDate: Tue Jan 2 17:12:51 2024 -0600 Rename remaining ResolvableKey properties This ensures the class's members have a consistent record naming scheme. --- .../logging/log4j/plugins/di/DefaultInstanceFactory.java | 6 +++--- .../plugins/di/resolver/PluginListFactoryResolver.java | 4 ++-- .../di/resolver/PluginListSupplierFactoryResolver.java | 4 ++-- .../plugins/di/resolver/PluginMapFactoryResolver.java | 4 ++-- .../di/resolver/PluginMapSupplierFactoryResolver.java | 4 ++-- .../plugins/di/resolver/PluginOptionalFactoryResolver.java | 4 ++-- .../di/resolver/PluginOptionalSupplierFactoryResolver.java | 4 ++-- .../plugins/di/resolver/PluginSetFactoryResolver.java | 4 ++-- .../di/resolver/PluginSetSupplierFactoryResolver.java | 4 ++-- .../plugins/di/resolver/PluginStreamFactoryResolver.java | 4 ++-- .../di/resolver/PluginStreamPluginTypeFactoryResolver.java | 4 ++-- .../di/resolver/PluginStreamSupplierFactoryResolver.java | 4 ++-- .../plugins/di/resolver/PluginTypeFactoryResolver.java | 4 ++-- .../apache/logging/log4j/plugins/di/spi/ResolvableKey.java | 14 ++++---------- 14 files changed, 31 insertions(+), 37 deletions(-) diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultInstanceFactory.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultInstanceFactory.java index da9834f1c4..c025f36e6c 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultInstanceFactory.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/DefaultInstanceFactory.java @@ -150,8 +150,8 @@ public class DefaultInstanceFactory implements ConfigurableInstanceFactory { } protected <T> @Nullable T getInjectableInstance(final ResolvableKey<T> resolvableKey) { - final Class<T> rawType = resolvableKey.getRawType(); - validate(rawType, resolvableKey.getName(), rawType); + final Class<T> rawType = resolvableKey.rawType(); + validate(rawType, resolvableKey.name(), rawType); final Executable factory = BeanUtils.getInjectableFactory(resolvableKey); final Key<T> key = resolvableKey.key(); final DependencyChain updatedChain = resolvableKey.dependencyChain().withDependency(key); @@ -385,7 +385,7 @@ public class DefaultInstanceFactory implements ConfigurableInstanceFactory { if (value != null) { agent.setFieldValue(field, instance, value); } - validate(field, resolvableKey.getName(), agent.getFieldValue(field, instance)); + validate(field, resolvableKey.name(), agent.getFieldValue(field, instance)); } finally { currentInjectionPoint.remove(); } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListFactoryResolver.java index ca6ab4c3aa..37de63e5d5 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListFactoryResolver.java @@ -39,8 +39,8 @@ public class PluginListFactoryResolver<T> extends AbstractPluginFactoryResolver< @Override public Supplier<List<? extends T>> getFactory( final ResolvableKey<List<? extends T>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType containerType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType containerType = (ParameterizedType) resolvableKey.type(); final Type componentType = containerType.getActualTypeArguments()[0]; return () -> Plugins.<T>streamPluginInstancesMatching(instanceFactory, namespace, componentType) .collect(Collectors.toCollection(ArrayList::new)); diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListSupplierFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListSupplierFactoryResolver.java index 5e9995b4b3..3208ecdca6 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListSupplierFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginListSupplierFactoryResolver.java @@ -41,8 +41,8 @@ public class PluginListSupplierFactoryResolver<T> public Supplier<List<? extends Supplier<? extends T>>> getFactory( final ResolvableKey<List<? extends Supplier<? extends T>>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType containerType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType containerType = (ParameterizedType) resolvableKey.type(); final ParameterizedType supplierType = (ParameterizedType) containerType.getActualTypeArguments()[0]; final Type componentType = supplierType.getActualTypeArguments()[0]; return () -> Plugins.<T>streamPluginFactoriesMatching(instanceFactory, namespace, componentType) diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapFactoryResolver.java index 8c20cc758d..aa9b227cd4 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapFactoryResolver.java @@ -39,8 +39,8 @@ public class PluginMapFactoryResolver<T> extends AbstractPluginFactoryResolver<M @Override public Supplier<Map<String, ? extends T>> getFactory( final ResolvableKey<Map<String, ? extends T>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType mapType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType mapType = (ParameterizedType) resolvableKey.type(); final Type componentType = mapType.getActualTypeArguments()[1]; return () -> Plugins.<T>streamPluginTypesMatching(instanceFactory, namespace, componentType) .collect(Collectors.toMap( diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapSupplierFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapSupplierFactoryResolver.java index 8cc2150f7a..3f83eff658 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapSupplierFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginMapSupplierFactoryResolver.java @@ -43,8 +43,8 @@ public class PluginMapSupplierFactoryResolver<T> public Supplier<Map<String, ? extends Supplier<? extends T>>> getFactory( final ResolvableKey<Map<String, ? extends Supplier<? extends T>>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType mapType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType mapType = (ParameterizedType) resolvableKey.type(); final Type componentType = mapType.getActualTypeArguments()[1]; final ParameterizedType parameterizedType = (ParameterizedType) componentType; final Type[] typeArguments = parameterizedType.getActualTypeArguments(); diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalFactoryResolver.java index 831ab174c6..ed9626b25a 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalFactoryResolver.java @@ -35,8 +35,8 @@ public class PluginOptionalFactoryResolver<T> extends AbstractPluginFactoryResol @Override public Supplier<Optional<? extends T>> getFactory( final ResolvableKey<Optional<? extends T>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType containerType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType containerType = (ParameterizedType) resolvableKey.type(); final Type componentType = containerType.getActualTypeArguments()[0]; return () -> Plugins.<T>streamPluginInstancesMatching(instanceFactory, namespace, componentType) .findFirst(); diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalSupplierFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalSupplierFactoryResolver.java index 0ecee02c44..aa47eb8763 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalSupplierFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginOptionalSupplierFactoryResolver.java @@ -39,8 +39,8 @@ public class PluginOptionalSupplierFactoryResolver<T> public Supplier<Optional<? extends Supplier<? extends T>>> getFactory( final ResolvableKey<Optional<? extends Supplier<? extends T>>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType containerType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType containerType = (ParameterizedType) resolvableKey.type(); final ParameterizedType supplierType = (ParameterizedType) containerType.getActualTypeArguments()[0]; final Type componentType = supplierType.getActualTypeArguments()[0]; return () -> Plugins.<T>streamPluginFactoriesMatching(instanceFactory, namespace, componentType) diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetFactoryResolver.java index 12601adeae..9fde414b4f 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetFactoryResolver.java @@ -39,8 +39,8 @@ public class PluginSetFactoryResolver<T> extends AbstractPluginFactoryResolver<S @Override public Supplier<Set<? extends T>> getFactory( final ResolvableKey<Set<? extends T>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType containerType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType containerType = (ParameterizedType) resolvableKey.type(); final Type componentType = containerType.getActualTypeArguments()[0]; return () -> Plugins.<T>streamPluginInstancesMatching(instanceFactory, namespace, componentType) .collect(Collectors.toCollection(LinkedHashSet::new)); diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetSupplierFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetSupplierFactoryResolver.java index 7425735314..a8b6db4ff4 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetSupplierFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginSetSupplierFactoryResolver.java @@ -41,8 +41,8 @@ public class PluginSetSupplierFactoryResolver<T> public Supplier<Set<? extends Supplier<? extends T>>> getFactory( final ResolvableKey<Set<? extends Supplier<? extends T>>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType containerType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType containerType = (ParameterizedType) resolvableKey.type(); final ParameterizedType supplierType = (ParameterizedType) containerType.getActualTypeArguments()[0]; final Type componentType = supplierType.getActualTypeArguments()[0]; return () -> Plugins.<T>streamPluginFactoriesMatching(instanceFactory, namespace, componentType) diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamFactoryResolver.java index 9485921d83..b68ea1b8ac 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamFactoryResolver.java @@ -36,8 +36,8 @@ public class PluginStreamFactoryResolver<T> extends AbstractPluginFactoryResolve @Override public Supplier<Stream<? extends T>> getFactory( final ResolvableKey<Stream<? extends T>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType containerType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType containerType = (ParameterizedType) resolvableKey.type(); final Type componentType = containerType.getActualTypeArguments()[0]; return () -> Plugins.streamPluginInstancesMatching(instanceFactory, namespace, componentType); } diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamPluginTypeFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamPluginTypeFactoryResolver.java index 5292a16b6e..5be86e628e 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamPluginTypeFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamPluginTypeFactoryResolver.java @@ -51,8 +51,8 @@ public class PluginStreamPluginTypeFactoryResolver<T> public Supplier<Stream<? extends PluginType<? extends T>>> getFactory( final ResolvableKey<Stream<? extends PluginType<? extends T>>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType streamType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType streamType = (ParameterizedType) resolvableKey.type(); final ParameterizedType supplierType = (ParameterizedType) streamType.getActualTypeArguments()[0]; final ParameterizedType pluginType = (ParameterizedType) supplierType.getActualTypeArguments()[0]; final Type componentType = pluginType.getActualTypeArguments()[0]; diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamSupplierFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamSupplierFactoryResolver.java index 0f0e8668ee..c62d1859e4 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamSupplierFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginStreamSupplierFactoryResolver.java @@ -39,8 +39,8 @@ public class PluginStreamSupplierFactoryResolver<T> public Supplier<Stream<? extends Supplier<? extends T>>> getFactory( final ResolvableKey<Stream<? extends Supplier<? extends T>>> resolvableKey, final InstanceFactory instanceFactory) { - final String namespace = resolvableKey.getNamespace(); - final ParameterizedType containerType = (ParameterizedType) resolvableKey.getType(); + final String namespace = resolvableKey.namespace(); + final ParameterizedType containerType = (ParameterizedType) resolvableKey.type(); final ParameterizedType supplierType = (ParameterizedType) containerType.getActualTypeArguments()[0]; final Type[] typeArguments = supplierType.getActualTypeArguments(); final Type componentType = typeArguments[0]; diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginTypeFactoryResolver.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginTypeFactoryResolver.java index 76a017386f..fbe210e1c2 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginTypeFactoryResolver.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/resolver/PluginTypeFactoryResolver.java @@ -38,8 +38,8 @@ public class PluginTypeFactoryResolver<T> extends AbstractPluginFactoryResolver< @Override public Supplier<PluginType<T>> getFactory( final ResolvableKey<PluginType<T>> resolvableKey, final InstanceFactory instanceFactory) { - final ParameterizedType type = (ParameterizedType) resolvableKey.getType(); - final String namespace = resolvableKey.getNamespace(); + final ParameterizedType type = (ParameterizedType) resolvableKey.type(); + final String namespace = resolvableKey.namespace(); final Type requestedType = type.getActualTypeArguments()[0]; return () -> Plugins.<T>streamPluginTypesMatching(instanceFactory, namespace, requestedType) .findFirst() diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ResolvableKey.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ResolvableKey.java index f4d6847c64..453b54cd69 100644 --- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ResolvableKey.java +++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/ResolvableKey.java @@ -16,35 +16,29 @@ */ package org.apache.logging.log4j.plugins.di.spi; -import java.lang.annotation.Annotation; import java.lang.reflect.Type; import java.util.Collection; import java.util.List; -import org.apache.logging.log4j.lang.Nullable; import org.apache.logging.log4j.plugins.di.Key; public record ResolvableKey<T>(Key<T> key, Collection<String> aliases, DependencyChain dependencyChain) { - public Type getType() { + public Type type() { return key.getType(); } - public Class<T> getRawType() { + public Class<T> rawType() { return key.getRawType(); } - public String getName() { + public String name() { return key.getName(); } - public String getNamespace() { + public String namespace() { return key.getNamespace(); } - public @Nullable Class<? extends Annotation> getQualifierType() { - return key.getQualifierType(); - } - public static <T> ResolvableKey<T> of(final Key<T> key) { return new ResolvableKey<>(key, List.of(), DependencyChain.empty()); }
