You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/07/08 15:09:03 UTC
[pulsar] branch master updated: Cleanup in the
pulsar-log4j-appender project (#4681)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 817549a Cleanup in the pulsar-log4j-appender project (#4681)
817549a is described below
commit 817549a03e724701373ebf4f6db38b58d77438e0
Author: vzhikserg <vz...@users.noreply.github.com>
AuthorDate: Mon Jul 8 17:08:56 2019 +0200
Cleanup in the pulsar-log4j-appender project (#4681)
---
.../org/apache/pulsar/log4j2/appender/PulsarManager.java | 4 ++--
.../apache/pulsar/log4j2/appender/PulsarAppenderTest.java | 15 +++++----------
.../appender/builder/ConfigurationAssemblerTest.java | 8 ++++----
.../log4j2/appender/builder/ConfigurationBuilderTest.java | 2 +-
.../appender/builder/CustomConfigurationFactory.java | 2 --
5 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/pulsar-log4j2-appender/src/main/java/org/apache/pulsar/log4j2/appender/PulsarManager.java b/pulsar-log4j2-appender/src/main/java/org/apache/pulsar/log4j2/appender/PulsarManager.java
index 851c78f..9051171 100644
--- a/pulsar-log4j2-appender/src/main/java/org/apache/pulsar/log4j2/appender/PulsarManager.java
+++ b/pulsar-log4j2-appender/src/main/java/org/apache/pulsar/log4j2/appender/PulsarManager.java
@@ -34,7 +34,7 @@ import org.apache.pulsar.client.api.TypedMessageBuilder;
public class PulsarManager extends AbstractManager {
- static Supplier<ClientBuilder> PULSAR_CLIENT_BUILDER = () -> PulsarClient.builder();
+ static Supplier<ClientBuilder> PULSAR_CLIENT_BUILDER = PulsarClient::builder;
private PulsarClient client;
private Producer<byte[]> producer;
@@ -126,7 +126,7 @@ public class PulsarManager extends AbstractManager {
}
producer = producerBuilder.create();
} catch (Exception t) {
- LOGGER.error("Failed to start pulsar manager {}", t);
+ LOGGER.error("Failed to start pulsar manager", t);
throw t;
}
}
diff --git a/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/PulsarAppenderTest.java b/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/PulsarAppenderTest.java
index 49273d6..71b94ae 100644
--- a/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/PulsarAppenderTest.java
+++ b/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/PulsarAppenderTest.java
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when;
import static org.testng.Assert.assertFalse;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -39,7 +38,6 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
@@ -55,9 +53,7 @@ import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.Producer;
import org.apache.pulsar.client.api.ProducerBuilder;
import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
-import org.apache.pulsar.client.api.TypedMessageBuilder;
import org.apache.pulsar.client.impl.ClientBuilderImpl;
import org.apache.pulsar.client.impl.TypedMessageBuilderImpl;
import org.testng.annotations.BeforeMethod;
@@ -66,7 +62,6 @@ import org.testng.annotations.Test;
public class PulsarAppenderTest {
private static final String LOG_MESSAGE = "Hello, world!";
- private static final String TOPIC_NAME = "pulsar-topic";
private static Log4jLogEvent createLogEvent() {
return Log4jLogEvent.newBuilder()
@@ -86,12 +81,12 @@ public class PulsarAppenderTest {
private class MockedMessageBuilder extends TypedMessageBuilderImpl<byte[]> {
- public MockedMessageBuilder() {
+ MockedMessageBuilder() {
super(null, Schema.BYTES);
}
@Override
- public MessageId send() throws PulsarClientException {
+ public MessageId send() {
synchronized (history) {
history.add(getMessage());
}
@@ -169,7 +164,7 @@ public class PulsarAppenderTest {
}
@Test
- public void testAsyncAppend() throws Exception {
+ public void testAsyncAppend() {
final Appender appender = ctx.getConfiguration().getAppender("AsyncPulsarAppender");
appender.append(createLogEvent());
final Message<byte[]> item;
@@ -183,7 +178,7 @@ public class PulsarAppenderTest {
}
@Test
- public void testAppendWithKey() throws Exception {
+ public void testAppendWithKey() {
final Appender appender = ctx.getConfiguration().getAppender("PulsarAppenderWithKey");
final LogEvent logEvent = createLogEvent();
appender.append(logEvent);
@@ -199,7 +194,7 @@ public class PulsarAppenderTest {
}
@Test
- public void testAppendWithKeyLookup() throws Exception {
+ public void testAppendWithKeyLookup() {
final Appender appender = ctx.getConfiguration().getAppender("PulsarAppenderWithKeyLookup");
final LogEvent logEvent = createLogEvent();
Date date = new Date();
diff --git a/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/ConfigurationAssemblerTest.java b/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/ConfigurationAssemblerTest.java
index a234741..c4c09f0 100644
--- a/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/ConfigurationAssemblerTest.java
+++ b/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/ConfigurationAssemblerTest.java
@@ -49,7 +49,7 @@ import org.testng.annotations.Test;
public class ConfigurationAssemblerTest {
@Test
- public void testBuildConfiguration() throws Exception {
+ public void testBuildConfiguration() {
try {
System.setProperty(Constants.LOG4J_CONTEXT_SELECTOR,
"org.apache.logging.log4j.core.async.AsyncLoggerContextSelector");
@@ -66,7 +66,7 @@ public class ConfigurationAssemblerTest {
}
@Test
- public void testCustomConfigurationFactory() throws Exception {
+ public void testCustomConfigurationFactory() {
try {
System.setProperty(ConfigurationFactory.CONFIGURATION_FACTORY_PROPERTY,
"org.apache.pulsar.log4j2.appender.builder.CustomConfigurationFactory");
@@ -88,12 +88,12 @@ public class ConfigurationAssemblerTest {
assertEquals("Incorrect State: " + config.getState(), config.getState(), LifeCycle.State.STARTED);
final Map<String, Appender> appenders = config.getAppenders();
assertNotNull(appenders);
- assertTrue("Incorrect number of Appenders: " + appenders.size(), appenders.size() == 2);
+ assertEquals("Incorrect number of Appenders: " + appenders.size(), appenders.size(), 2);
final PulsarAppender pulsarAppender = (PulsarAppender) appenders.get("Pulsar");
final GelfLayout gelfLayout = (GelfLayout) pulsarAppender.getLayout();
final Map<String, LoggerConfig> loggers = config.getLoggers();
assertNotNull(loggers);
- assertTrue("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size() == 2);
+ assertEquals("Incorrect number of LoggerConfigs: " + loggers.size(), loggers.size(), 2);
final LoggerConfig rootLoggerConfig = loggers.get("");
assertEquals(Level.ERROR, rootLoggerConfig.getLevel());
assertFalse(rootLoggerConfig.isIncludeLocation());
diff --git a/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/ConfigurationBuilderTest.java b/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/ConfigurationBuilderTest.java
index 7de8a3f..e9b6ed3 100644
--- a/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/ConfigurationBuilderTest.java
+++ b/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/ConfigurationBuilderTest.java
@@ -109,7 +109,7 @@ public class ConfigurationBuilderTest {
// TODO make test run properly on Windows
@Test
- public void testXmlConstructing() throws Exception {
+ public void testXmlConstructing() {
//assumeTrue(System.lineSeparator().length() == 1); // Only run test on platforms with single character line endings (such as Linux), not on Windows
final ConfigurationBuilder<BuiltConfiguration> builder = ConfigurationBuilderFactory.newConfigurationBuilder();
addTestFixtures("config name", builder);
diff --git a/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/CustomConfigurationFactory.java b/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/CustomConfigurationFactory.java
index 98b26d0..15052a6 100644
--- a/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/CustomConfigurationFactory.java
+++ b/pulsar-log4j2-appender/src/test/java/org/apache/pulsar/log4j2/appender/builder/CustomConfigurationFactory.java
@@ -34,8 +34,6 @@ import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
* Normally this would be a plugin. However, we don't want it used for everything so it will be defined
* via a system property.
*/
-//@Plugin(name = "CustomConfigurationFactory", category = ConfigurationFactory.CATEGORY)
-//@Order(50)
public class CustomConfigurationFactory extends ConfigurationFactory {
static Configuration addTestFixtures(final String name, final ConfigurationBuilder<BuiltConfiguration> builder) {