[logging-log4j2] 01/08: Remove unneeded methods

[ma...@apache.org]

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 5031dd676fe28794740ae2478218b0512269c2cd
Author: Matt Sicker <bo...@gmail.com>
AuthorDate: Sat Mar 28 12:20:23 2020 -0500

    Remove unneeded methods
    
    Signed-off-by: Matt Sicker <bo...@gmail.com>
---
 .../logging/log4j/plugins/defaults/model/DefaultQualifiers.java  | 6 ++++--
 .../org/apache/logging/log4j/plugins/spi/model/Qualifiers.java   | 9 ---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultQualifiers.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultQualifiers.java
index 9104b6b..f3676e6 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultQualifiers.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/defaults/model/DefaultQualifiers.java
@@ -26,6 +26,7 @@ import org.apache.logging.log4j.util.StringBuilders;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -56,12 +57,13 @@ class DefaultQualifiers implements Qualifiers {
     public boolean equals(final Object o) {
         // these should intentionally be substitutable by never using the subclass types directly
         // i.e., we'd like to allow equality with annotation-processor-generated qualifiers later
-        return this == o || o instanceof Qualifiers && this.equalTo((Qualifiers) o);
+        return this == o ||
+                (o instanceof Qualifiers && getQualifierEntries().equals(((Qualifiers) o).getQualifierEntries()));
     }
 
     @Override
     public int hashCode() {
-        return hash();
+        return Objects.hashCode(getQualifierEntries());
     }
 
     @Override
diff --git a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/Qualifiers.java b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/Qualifiers.java
index 648d460..c276180 100644
--- a/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/Qualifiers.java
+++ b/log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/spi/model/Qualifiers.java
@@ -19,19 +19,10 @@ package org.apache.logging.log4j.plugins.spi.model;
 
 import java.lang.annotation.Annotation;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
 public interface Qualifiers {
     boolean hasDefaultQualifier();
 
     Set<Map.Entry<Class<? extends Annotation>, Map<String, Object>>> getQualifierEntries();
-
-    default boolean equalTo(final Qualifiers other) {
-        return Objects.equals(getQualifierEntries(), other.getQualifierEntries());
-    }
-
-    default int hash() {
-        return Objects.hashCode(getQualifierEntries());
-    }
 }