Let LogstashAccessEncoder/Layout throw an exception when trying to se…

…tProviders() on them Related to issue logfellow#859
jpjcorreia · Sep 25, 2022 · 4dbcdfa · 4dbcdfa
1 parent 7d5e69a
commit 4dbcdfa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java b/src/main/java/net/logstash/logback/encoder/LogstashAccessEncoder.java
@@ -18,6 +18,7 @@
 import net.logstash.logback.LogstashAccessFormatter;
 import net.logstash.logback.composite.AbstractCompositeJsonFormatter;
 import net.logstash.logback.composite.JsonProvider;
+import net.logstash.logback.composite.JsonProviders;
 import net.logstash.logback.composite.accessevent.HeaderFilter;
 import net.logstash.logback.composite.accessevent.IncludeExcludeHeaderFilter;
 import net.logstash.logback.fieldnames.LogstashAccessFieldNames;
@@ -134,4 +135,8 @@ public void setWriteVersionAsInteger(boolean writeVersionAsInteger) {
         getFormatter().setWriteVersionAsInteger(writeVersionAsInteger);
     }
 
+    @Override
+    public void setProviders(JsonProviders<IAccessEvent> jsonProviders) {
+        throw new IllegalArgumentException("Using the <providers> configuration property is not allowed. Use <provider> instead to registerd additional " + JsonProvider.class.getSimpleName() + ".");
+    }
 }
diff --git a/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java b/src/main/java/net/logstash/logback/layout/LogstashAccessLayout.java
@@ -18,6 +18,7 @@
 import net.logstash.logback.LogstashAccessFormatter;
 import net.logstash.logback.composite.AbstractCompositeJsonFormatter;
 import net.logstash.logback.composite.JsonProvider;
+import net.logstash.logback.composite.JsonProviders;
 import net.logstash.logback.composite.accessevent.HeaderFilter;
 import net.logstash.logback.composite.accessevent.IncludeExcludeHeaderFilter;
 import net.logstash.logback.fieldnames.LogstashAccessFieldNames;
@@ -134,4 +135,8 @@ public void setWriteVersionAsInteger(boolean writeVersionAsInteger) {
         getFormatter().setWriteVersionAsInteger(writeVersionAsInteger);
     }
 
+    @Override
+    public void setProviders(JsonProviders<IAccessEvent> jsonProviders) {
+        throw new IllegalArgumentException("Using the <providers> configuration property is not allowed. Use <provider> instead to registerd additional " + JsonProvider.class.getSimpleName() + ".");
+    }
 }