Minor fixes (#1966)

apache · Nov 20, 2023 · eff464e · eff464e
1 parent c1bf017
commit eff464e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/categories/Appenders.java
@@ -27,6 +27,5 @@ interface CouchDb {}
     interface Jpa {}
     interface Kafka {}
     interface MongoDb {}
-    interface Smtp {}
     interface ZeroMq {}
 }
diff --git a/log4j-core-test/src/main/resources/Log4j-config.xsd b/log4j-core-test/src/main/resources/Log4j-config.xsd
@@ -650,7 +650,6 @@
          <element name="Kafka" type="tns:KafkaAppenderType" minOccurs="0" />
          <element name="Rewrite" type="tns:RewriteAppenderType" minOccurs="0" />
          <element name="Routing" type="tns:RoutingAppenderType" minOccurs="0" />
-         <element name="SMTP" type="tns:SMTPAppenderType" minOccurs="0" />
          <element name="File" type="tns:FileAppenderType" minOccurs="0" />
          <element name="MemoryMappedFile" type="tns:MemoryMappedFileAppenderType" minOccurs="0" />
          <element name="RandomAccessFile" type="tns:RandomAccessFileAppenderType" minOccurs="0" />
@@ -918,14 +917,6 @@
       </complexContent>
    </complexType>
 
-   <complexType name="SMTPAppenderType">
-      <complexContent>
-         <extension base="tns:AbstractAppenderType">
-            <anyAttribute processContents="lax" />
-         </extension>
-      </complexContent>
-   </complexType>
-
    <complexType name="AbstractFileAppenderType" abstract="true">
       <complexContent>
          <extension base="tns:AbstractAppenderType">

diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java
@@ -60,6 +60,13 @@ public interface Layout extends Encoder<LogEvent> {
      */
     byte[] toByteArray(LogEvent event);
 
+    /**
+     * Returns the character set used for encoding log events.
+     */
+    default Charset getCharset() {
+        return StandardCharsets.UTF_8;
+    }
+
     /**
      * Serializes the log event into a String.
      *

diff --git a/log4j-core/src/main/resources/Log4j-config.xsd b/log4j-core/src/main/resources/Log4j-config.xsd
@@ -650,7 +650,6 @@
          <element name="Kafka" type="tns:KafkaAppenderType" minOccurs="0" />
          <element name="Rewrite" type="tns:RewriteAppenderType" minOccurs="0" />
          <element name="Routing" type="tns:RoutingAppenderType" minOccurs="0" />
-         <element name="SMTP" type="tns:SMTPAppenderType" minOccurs="0" />
          <element name="File" type="tns:FileAppenderType" minOccurs="0" />
          <element name="MemoryMappedFile" type="tns:MemoryMappedFileAppenderType" minOccurs="0" />
          <element name="RandomAccessFile" type="tns:RandomAccessFileAppenderType" minOccurs="0" />
@@ -918,14 +917,6 @@
       </complexContent>
    </complexType>
 
-   <complexType name="SMTPAppenderType">
-      <complexContent>
-         <extension base="tns:AbstractAppenderType">
-            <anyAttribute processContents="lax" />
-         </extension>
-      </complexContent>
-   </complexType>
-
    <complexType name="AbstractFileAppenderType" abstract="true">
       <complexContent>
          <extension base="tns:AbstractAppenderType">