Replace tabs with spaces (Kafka classes)

apache · Oct 16, 2022 · 7b074ed · 7b074ed
1 parent a875db9
commit 7b074ed
Show file tree

Hide file tree

Showing 5 changed files with 530 additions and 476 deletions.
diff --git a/.../java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java b/.../java/org/apache/logging/log4j/core/appender/mom/kafka/KafkaAppenderCloseTimeoutTest.java
@@ -17,9 +17,14 @@
 
 package org.apache.logging.log4j.core.appender.mom.kafka;
 
+import java.time.Duration;
+import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.kafka.clients.producer.MockProducer;
+import org.apache.kafka.clients.producer.Producer;
+import org.apache.kafka.common.serialization.ByteArraySerializer;
+import org.apache.kafka.common.serialization.Serializer;
 import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.test.categories.Appenders;
 import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
@@ -32,20 +37,34 @@
 @Category(Appenders.Kafka.class)
 public class KafkaAppenderCloseTimeoutTest {
 
-    private static final MockProducer<byte[], byte[]> kafka = new MockProducer<byte[], byte[]>(true, null, null) {
+    private static final Serializer<byte[]> SERIALIZER = new ByteArraySerializer();
+
+    private static final MockProducer<byte[], byte[]> kafka = new MockProducer<byte[], byte[]>(true, SERIALIZER,
+            SERIALIZER) {
         @Override
         public void close() {
             try {
                 Thread.sleep(3000);
-            } catch (final InterruptedException ignore) {
+            } catch (InterruptedException ignore) {
+                // NOP
             }
         }
 
-        @Override
-        public void close(final long timeout, final TimeUnit timeUnit) {
+        // @Override in version 3.3.1
+        public void close(Duration timeout) {
+            try {
+                Thread.sleep(timeout.toMillis());
+            } catch (InterruptedException ignore) {
+                // NOP
+            }
+        }
+
+        // @Override in version 1.1.1
+        public void close(long timeout, TimeUnit timeUnit) {
             try {
                 Thread.sleep(timeUnit.toMillis(timeout));
-            } catch (final InterruptedException ignore) {
+            } catch (InterruptedException ignore) {
+                // NOP
             }
         }
     };
@@ -68,4 +87,4 @@ public void testClose() throws Exception {
         final Appender appender = ctx.getRequiredAppender("KafkaAppender");
         appender.stop();
     }
-}
+}