You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2020/03/14 17:45:05 UTC
[logging-log4j2] 02/05: Remove unused method and rename
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch mean-bean-machine
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 01847710fac4ff0a963c16ca8f1a50d614e8a524
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Mar 14 11:43:26 2020 -0500
Remove unused method and rename
Signed-off-by: Matt Sicker <bo...@gmail.com>
---
.../logging/log4j/plugins/defaults/bean/DefaultBeanManager.java | 4 ++--
.../logging/log4j/plugins/defaults/bean/FieldProducer.java | 2 +-
.../logging/log4j/plugins/defaults/bean/MethodProducer.java | 2 +-
.../logging/log4j/plugins/defaults/model/AbstractMetaMember.java | 9 ++-------
.../log4j/plugins/defaults/model/DefaultElementManager.java | 4 ++--
.../logging/log4j/plugins/defaults/model/DefaultMetaClass.java | 2 +-
.../log4j/plugins/defaults/model/DefaultMetaParameter.java | 4 ++--
.../org/apache/logging/log4j/plugins/spi/model/MetaElement.java | 2 +-
.../org/apache/logging/log4j/plugins/spi/model/MetaMember.java | 2 --
9 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/DefaultBeanManager.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/DefaultBeanManager.java
index d59a176..8163bbf 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/DefaultBeanManager.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/DefaultBeanManager.java
@@ -156,7 +156,7 @@ public class DefaultBeanManager implements BeanManager {
for (final MetaParameter<?> parameter : method.getParameters()) {
if (parameter.isAnnotationPresent(Disposes.class)) {
disposesMethods.add(new DisposesMethod<>(
- parameter.getBaseType(), elementManager.getQualifiers(parameter), bean, method));
+ parameter.getType(), elementManager.getQualifiers(parameter), bean, method));
}
}
}
@@ -251,7 +251,7 @@ public class DefaultBeanManager implements BeanManager {
if (rawType.equals(Bean.class)) {
final Bean<?> bean = point.getBean().orElseThrow(() -> new UnsatisfiedBeanException(point));
if (bean instanceof InjectionTargetBean<?>) {
- validateBeanInjectionPoint(point, bean.getDeclaringClass().getBaseType());
+ validateBeanInjectionPoint(point, bean.getDeclaringClass().getType());
} else if (bean instanceof ProducerBean<?, ?>) {
validateBeanInjectionPoint(point, ((ProducerBean<?, ?>) bean).getType());
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/FieldProducer.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/FieldProducer.java
index 9424eb2..8c21750 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/FieldProducer.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/FieldProducer.java
@@ -39,7 +39,7 @@ class FieldProducer<P, T> extends AbstractProducer<P, T> {
@Override
Type getType() {
- return field.getBaseType();
+ return field.getType();
}
@Override
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/MethodProducer.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/MethodProducer.java
index 1d13338..8b80a4a 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/MethodProducer.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/MethodProducer.java
@@ -44,7 +44,7 @@ class MethodProducer<P, T> extends AbstractProducer<P, T> {
@Override
Type getType() {
- return producerMethod.getBaseType();
+ return producerMethod.getType();
}
@Override
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/AbstractMetaMember.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/AbstractMetaMember.java
index f40d3fb..a6d976a 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/AbstractMetaMember.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/AbstractMetaMember.java
@@ -54,8 +54,8 @@ abstract class AbstractMetaMember<D, T> implements MetaMember<D, T> {
}
@Override
- public Type getBaseType() {
- return type.getBaseType();
+ public Type getType() {
+ return type.getType();
}
@Override
@@ -64,11 +64,6 @@ abstract class AbstractMetaMember<D, T> implements MetaMember<D, T> {
}
@Override
- public MetaClass<T> getType() {
- return type;
- }
-
- @Override
public MetaClass<D> getDeclaringClass() {
return declaringClass;
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultElementManager.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultElementManager.java
index ad83d4e..82b7369 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultElementManager.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultElementManager.java
@@ -120,7 +120,7 @@ public class DefaultElementManager implements ElementManager {
public <D, T> InjectionPoint<T> createFieldInjectionPoint(final MetaField<D, T> field, final Bean<D> owner) {
Objects.requireNonNull(field);
final Qualifiers qualifiers = getQualifiers(field);
- return new DefaultInjectionPoint<>(field.getBaseType(), qualifiers, owner, field, field);
+ return new DefaultInjectionPoint<>(field.getType(), qualifiers, owner, field, field);
}
@Override
@@ -130,7 +130,7 @@ public class DefaultElementManager implements ElementManager {
Objects.requireNonNull(executable);
Objects.requireNonNull(parameter);
final Qualifiers qualifiers = getQualifiers(parameter);
- return new DefaultInjectionPoint<>(parameter.getBaseType(), qualifiers, owner, executable, parameter);
+ return new DefaultInjectionPoint<>(parameter.getType(), qualifiers, owner, executable, parameter);
}
@Override
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultMetaClass.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultMetaClass.java
index 8f4d26e..80afe92 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultMetaClass.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultMetaClass.java
@@ -82,7 +82,7 @@ class DefaultMetaClass<T> implements MetaClass<T> {
}
@Override
- public Type getBaseType() {
+ public Type getType() {
return baseType;
}
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultMetaParameter.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultMetaParameter.java
index 2ea34d2..960e81f 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultMetaParameter.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultMetaParameter.java
@@ -50,8 +50,8 @@ class DefaultMetaParameter<T> implements MetaParameter<T> {
}
@Override
- public Type getBaseType() {
- return parameterClass.getBaseType();
+ public Type getType() {
+ return parameterClass.getType();
}
@Override
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/MetaElement.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/MetaElement.java
index 1dc9b01..3de8421 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/MetaElement.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/MetaElement.java
@@ -54,7 +54,7 @@ public interface MetaElement<T> {
return false;
}
- Type getBaseType();
+ Type getType();
Collection<Type> getTypeClosure();
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/MetaMember.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/MetaMember.java
index 21601fd..b718867 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/MetaMember.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/MetaMember.java
@@ -18,8 +18,6 @@
package org.apache.logging.log4j.plugins.spi.model;
public interface MetaMember<D, T> extends MetaElement<T> {
- MetaClass<T> getType();
-
MetaClass<D> getDeclaringClass();
boolean isStatic();