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/22 17:40:03 UTC

[logging-log4j2] 03/06: Removed unused methods

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 b228c68f4a41e5a6ef2c6184d34b4b7a31139049
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sun Mar 22 12:01:38 2020 -0500

    Removed unused methods
    
    Signed-off-by: Matt Sicker <bo...@gmail.com>
---
 .../logging/log4j/plugins/defaults/bean/AbstractBean.java      | 10 ----------
 .../apache/logging/log4j/plugins/defaults/bean/SystemBean.java | 10 ----------
 .../logging/log4j/plugins/defaults/model/DefaultVariable.java  | 10 ----------
 .../org/apache/logging/log4j/plugins/spi/model/Variable.java   |  4 ----
 4 files changed, 34 deletions(-)

diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/AbstractBean.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/AbstractBean.java
index 5987ff3..1798af1 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/AbstractBean.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/AbstractBean.java
@@ -57,21 +57,11 @@ abstract class AbstractBean<T> implements Bean<T> {
     }
 
     @Override
-    public Variable withQualifiers(final Qualifiers qualifiers) {
-        return variable.withQualifiers(qualifiers);
-    }
-
-    @Override
     public Class<? extends Annotation> getScopeType() {
         return variable.getScopeType();
     }
 
     @Override
-    public Variable withScopeType(final Class<? extends Annotation> scopeType) {
-        return variable.withScopeType(scopeType);
-    }
-
-    @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/SystemBean.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/SystemBean.java
index ed7810e..00771f8 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/SystemBean.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/bean/SystemBean.java
@@ -52,21 +52,11 @@ abstract class SystemBean<T> implements Bean<T> {
     }
 
     @Override
-    public Variable withQualifiers(final Qualifiers qualifiers) {
-        return variable.withQualifiers(qualifiers);
-    }
-
-    @Override
     public Class<? extends Annotation> getScopeType() {
         return variable.getScopeType();
     }
 
     @Override
-    public Variable withScopeType(final Class<? extends Annotation> scopeType) {
-        return variable.withScopeType(scopeType);
-    }
-
-    @Override
     public Collection<InjectionPoint> getInjectionPoints() {
         return Collections.emptySet();
     }
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultVariable.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultVariable.java
index cdf7928..8fd2160 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultVariable.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultVariable.java
@@ -54,21 +54,11 @@ public class DefaultVariable implements Variable {
     }
 
     @Override
-    public Variable withQualifiers(final Qualifiers qualifiers) {
-        return new DefaultVariable(getTypes(), qualifiers, getScopeType());
-    }
-
-    @Override
     public Class<? extends Annotation> getScopeType() {
         return scopeType;
     }
 
     @Override
-    public Variable withScopeType(final Class<? extends Annotation> scopeType) {
-        return new DefaultVariable(getTypes(), getQualifiers(), scopeType);
-    }
-
-    @Override
     public boolean equals(final Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/Variable.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/Variable.java
index 0d9c035..2396158 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/Variable.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/Variable.java
@@ -40,12 +40,8 @@ public interface Variable {
 
     Qualifiers getQualifiers();
 
-    Variable withQualifiers(final Qualifiers qualifiers);
-
     Class<? extends Annotation> getScopeType();
 
-    Variable withScopeType(final Class<? extends Annotation> scopeType);
-
     default boolean isDependentScoped() {
         return getScopeType() == Dependent.class;
     }