Move #addContext() into the common JsonProviders class

ContextJsonProvider can be used for both ILoggingEvent and IAccessEvent. The `LoggingEventJsonProviders#addContext` and `AccessEventJsonProviders#addContext` methods should be moved into the common `JsonProviders` base class. Related to issue #658.
logfellow · Sep 23, 2021 · 898f203 · 898f203
1 parent 76465c9
commit 898f203
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/main/java/net/logstash/logback/composite/JsonProviders.java b/src/main/java/net/logstash/logback/composite/JsonProviders.java
@@ -97,4 +97,8 @@ public void setJsonFactory(JsonFactory jsonFactory) {
     public List<JsonProvider<Event>> getProviders() {
         return Collections.unmodifiableList(jsonProviders);
     }
+
+    public void addContext(ContextJsonProvider<Event> provider) {
+        addProvider(provider);
+    }
 }
diff --git a/src/main/java/net/logstash/logback/composite/accessevent/AccessEventJsonProviders.java b/src/main/java/net/logstash/logback/composite/accessevent/AccessEventJsonProviders.java
@@ -15,7 +15,6 @@
  */
 package net.logstash.logback.composite.accessevent;
 
-import net.logstash.logback.composite.ContextJsonProvider;
 import net.logstash.logback.composite.GlobalCustomFieldsJsonProvider;
 import net.logstash.logback.composite.JsonProviders;
 import net.logstash.logback.composite.LogstashVersionJsonProvider;
@@ -79,9 +78,6 @@ public void addRequestHeaders(RequestHeadersJsonProvider provider) {
     public void addResponseHeaders(ResponseHeadersJsonProvider provider) {
         addProvider(provider);
     }
-    public void addContext(ContextJsonProvider<IAccessEvent> provider) {
-        addProvider(provider);
-    }
     public void addPattern(AccessEventPatternJsonProvider provider) {
         addProvider(provider);
     }

diff --git a/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventJsonProviders.java b/src/main/java/net/logstash/logback/composite/loggingevent/LoggingEventJsonProviders.java
@@ -15,7 +15,6 @@
  */
 package net.logstash.logback.composite.loggingevent;
 
-import net.logstash.logback.composite.ContextJsonProvider;
 import net.logstash.logback.composite.GlobalCustomFieldsJsonProvider;
 import net.logstash.logback.composite.JsonProviders;
 import net.logstash.logback.composite.LogstashVersionJsonProvider;
@@ -73,9 +72,6 @@ public void addRootStackTraceElement(RootStackTraceElementJsonProvider provider)
     public void addStackHash(StackHashJsonProvider provider) {
         addProvider(provider);
     }
-    public void addContext(ContextJsonProvider<ILoggingEvent> provider) {
-        addProvider(provider);
-    }
     public void addContextName(ContextNameJsonProvider provider) {
         addProvider(provider);
     }