Reformat code globally second time
diff --git a/src/main/java/org/apache/rocketmq/logappender/common/ProducerInstance.java b/src/main/java/org/apache/rocketmq/logappender/common/ProducerInstance.java
index 53521d4..d2adac5 100644
--- a/src/main/java/org/apache/rocketmq/logappender/common/ProducerInstance.java
+++ b/src/main/java/org/apache/rocketmq/logappender/common/ProducerInstance.java
@@ -52,7 +52,6 @@
return nameServerAddress + "_" + group;
}
-
public MQProducer getInstance(String nameServerAddress, String group) throws MQClientException {
if (StringUtils.isBlank(group)) {
group = DEFAULT_GROUP;
@@ -75,7 +74,6 @@
return defaultMQProducer;
}
-
public void removeAndClose(String nameServerAddress, String group) {
if (group == null) {
group = DEFAULT_GROUP;
diff --git a/src/main/java/org/apache/rocketmq/logappender/log4j/RocketmqLog4jAppender.java b/src/main/java/org/apache/rocketmq/logappender/log4j/RocketmqLog4jAppender.java
index 3fd8d4c..646e924 100644
--- a/src/main/java/org/apache/rocketmq/logappender/log4j/RocketmqLog4jAppender.java
+++ b/src/main/java/org/apache/rocketmq/logappender/log4j/RocketmqLog4jAppender.java
@@ -59,7 +59,6 @@
public RocketmqLog4jAppender() {
}
-
public void activateOptions() {
LogLog.debug("Getting initial context.");
if (!checkEntryConditions()) {
@@ -72,11 +71,8 @@
}
}
-
/**
* Info,error,warn,callback method implementation
- *
- * @param event
*/
public void append(LoggingEvent event) {
if (null == producer) {
@@ -95,7 +91,7 @@
} catch (Exception e) {
String msg = new String(data);
errorHandler.error("Could not send message in RocketmqLog4jAppender [" + name + "].Message is :" + msg, e,
- ErrorCode.GENERIC_FAILURE);
+ ErrorCode.GENERIC_FAILURE);
}
}
@@ -145,7 +141,6 @@
return topic;
}
-
public void setTopic(String topic) {
this.topic = topic;
}
diff --git a/src/main/java/org/apache/rocketmq/logappender/log4j2/RocketmqLog4j2Appender.java b/src/main/java/org/apache/rocketmq/logappender/log4j2/RocketmqLog4j2Appender.java
index 5a6362e..9543f1c 100644
--- a/src/main/java/org/apache/rocketmq/logappender/log4j2/RocketmqLog4j2Appender.java
+++ b/src/main/java/org/apache/rocketmq/logappender/log4j2/RocketmqLog4j2Appender.java
@@ -70,10 +70,9 @@
*/
private String topic;
-
protected RocketmqLog4j2Appender(String name, Filter filter, Layout<? extends Serializable> layout,
- boolean ignoreExceptions, String nameServerAddress, String producerGroup,
- String topic, String tag) {
+ boolean ignoreExceptions, String nameServerAddress, String producerGroup,
+ String topic, String tag) {
super(name, filter, layout, ignoreExceptions);
this.producer = producer;
this.topic = topic;
@@ -86,15 +85,13 @@
ErrorHandler handler = this.getHandler();
if (handler != null) {
handler.error("Starting RocketmqLog4j2Appender [" + this.getName()
- + "] nameServerAddress:" + nameServerAddress + " group:" + producerGroup + " " + e.getMessage());
+ + "] nameServerAddress:" + nameServerAddress + " group:" + producerGroup + " " + e.getMessage());
}
}
}
/**
* Info,error,warn,callback method implementation
- *
- * @param event
*/
public void append(LogEvent event) {
if (null == producer) {
@@ -119,10 +116,6 @@
/**
* When system exit,this method will be called to close resources
- *
- * @param timeout
- * @param timeUnit
- * @return
*/
public boolean stop(long timeout, TimeUnit timeUnit) {
this.setStopping();
@@ -132,7 +125,7 @@
ErrorHandler handler = this.getHandler();
if (handler != null) {
handler.error("Closeing RocketmqLog4j2Appender [" + this.getName()
- + "] nameServerAddress:" + nameServerAddress + " group:" + producerGroup + " " + e.getMessage());
+ + "] nameServerAddress:" + nameServerAddress + " group:" + producerGroup + " " + e.getMessage());
}
}
@@ -227,7 +220,7 @@
public RocketmqLog4j2Appender build() {
return new RocketmqLog4j2Appender(name, filter, layout, ignoreExceptions,
- nameServerAddress, producerGroup, topic, tag);
+ nameServerAddress, producerGroup, topic, tag);
}
}
}
diff --git a/src/main/java/org/apache/rocketmq/logappender/logback/RocketmqLogbackAppender.java b/src/main/java/org/apache/rocketmq/logappender/logback/RocketmqLogbackAppender.java
index 50ba564..4018cd4 100644
--- a/src/main/java/org/apache/rocketmq/logappender/logback/RocketmqLogbackAppender.java
+++ b/src/main/java/org/apache/rocketmq/logappender/logback/RocketmqLogbackAppender.java
@@ -62,8 +62,6 @@
/**
* Info,error,warn,callback method implementation
- *
- * @param event
*/
@Override
protected void append(ILoggingEvent event) {
@@ -100,7 +98,7 @@
producer = ProducerInstance.getProducerInstance().getInstance(nameServerAddress, producerGroup);
} catch (Exception e) {
addError("Starting RocketmqLogbackAppender [" + this.getName()
- + "] nameServerAddress:" + nameServerAddress + " group:" + producerGroup + " " + e.getMessage());
+ + "] nameServerAddress:" + nameServerAddress + " group:" + producerGroup + " " + e.getMessage());
}
if (producer != null) {
super.start();
@@ -122,7 +120,7 @@
ProducerInstance.getProducerInstance().removeAndClose(this.nameServerAddress, this.producerGroup);
} catch (Exception e) {
addError("Closeing RocketmqLogbackAppender [" + this.getName()
- + "] nameServerAddress:" + nameServerAddress + " group:" + producerGroup + " " + e.getMessage());
+ + "] nameServerAddress:" + nameServerAddress + " group:" + producerGroup + " " + e.getMessage());
}
// Help garbage collection
@@ -144,7 +142,6 @@
}
}
-
public Layout getLayout() {
return this.layout;
}
@@ -160,7 +157,6 @@
return tag;
}
-
public void setTag(String tag) {
this.tag = tag;
}
diff --git a/src/test/java/org/apache/rocketmq/logappender/AbstractTestCase.java b/src/test/java/org/apache/rocketmq/logappender/AbstractTestCase.java
index 9faebb9..38904c0 100644
--- a/src/test/java/org/apache/rocketmq/logappender/AbstractTestCase.java
+++ b/src/test/java/org/apache/rocketmq/logappender/AbstractTestCase.java
@@ -30,7 +30,6 @@
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger;
-
/**
* Basic test rocketmq broker and name server init
*/
diff --git a/src/test/java/org/apache/rocketmq/logappender/Log4jTest.java b/src/test/java/org/apache/rocketmq/logappender/Log4jTest.java
index 6306ec5..c139283 100644
--- a/src/test/java/org/apache/rocketmq/logappender/Log4jTest.java
+++ b/src/test/java/org/apache/rocketmq/logappender/Log4jTest.java
@@ -22,8 +22,7 @@
import org.junit.Before;
import org.junit.Test;
-
-public abstract class Log4jTest extends AbstractTestCase{
+public abstract class Log4jTest extends AbstractTestCase {
@Before
public abstract void init();
@@ -37,8 +36,8 @@
for (int i = 0; i < 10; i++) {
logger.info("log4j " + this.getType() + " simple test message " + i);
}
- int received = consumeMessages(10, "log4j",10);
- Assert.assertTrue(received>5);
+ int received = consumeMessages(10, "log4j", 10);
+ Assert.assertTrue(received > 5);
}
}
diff --git a/src/test/java/org/apache/rocketmq/logappender/LogbackTest.java b/src/test/java/org/apache/rocketmq/logappender/LogbackTest.java
index 4f9d3e5..d7ec184 100644
--- a/src/test/java/org/apache/rocketmq/logappender/LogbackTest.java
+++ b/src/test/java/org/apache/rocketmq/logappender/LogbackTest.java
@@ -29,7 +29,7 @@
import java.io.File;
-public class LogbackTest extends AbstractTestCase{
+public class LogbackTest extends AbstractTestCase {
@Before
public void init() throws JoranException {
@@ -41,7 +41,6 @@
StatusPrinter.printInCaseOfErrorsOrWarnings(lc);
}
-
@Test
public void testLogback() throws InterruptedException, MQClientException {
clear();
@@ -49,7 +48,7 @@
for (int i = 0; i < 10; i++) {
logger.info("logback test message " + i);
}
- int received = consumeMessages(10, "logback",10);
- Assert.assertTrue(received>=5);
+ int received = consumeMessages(10, "logback", 10);
+ Assert.assertTrue(received >= 5);
}
}
diff --git a/src/test/java/org/apache/rocketmq/logappender/log4j2Test.java b/src/test/java/org/apache/rocketmq/logappender/log4j2Test.java
index 4089644..6f6af60 100644
--- a/src/test/java/org/apache/rocketmq/logappender/log4j2Test.java
+++ b/src/test/java/org/apache/rocketmq/logappender/log4j2Test.java
@@ -24,14 +24,13 @@
import org.junit.Before;
import org.junit.Test;
-public class log4j2Test extends AbstractTestCase{
+public class log4j2Test extends AbstractTestCase {
@Before
public void init() {
Configurator.initialize("log4j2", "src/test/resources/log4j2-example.xml");
}
-
@Test
public void testLog4j2() throws InterruptedException, MQClientException {
clear();
@@ -39,7 +38,7 @@
for (int i = 0; i < 10; i++) {
logger.info("log4j2 log message " + i);
}
- int received = consumeMessages(10, "log4j2",10);
- Assert.assertTrue(received>5);
+ int received = consumeMessages(10, "log4j2", 10);
+ Assert.assertTrue(received > 5);
}
}
diff --git a/src/test/resources/log4j-example.properties b/src/test/resources/log4j-example.properties
index 7fdebbb..63b2a98 100644
--- a/src/test/resources/log4j-example.properties
+++ b/src/test/resources/log4j-example.properties
@@ -12,23 +12,18 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
log4j.rootLogger=INFO,stdout
-
log4j.logger.testLogger=INFO,mq
-
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.Target=System.out
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %-4r [%t] (%F:%L) %-5p - %m%n
-
log4j.appender.store=org.apache.log4j.DailyRollingFileAppender
log4j.appender.store.File=${user.home}/logs/rocketmqlogs/appender.log
log4j.appender.store.Append=true
-log4j.appender.store.DatePattern ='_'yyyy-MM-dd'.log'
+log4j.appender.store.DatePattern='_'yyyy-MM-dd'.log'
log4j.appender.store.layout=org.apache.log4j.PatternLayout
log4j.appender.store.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-4r [%t] (%F:%L) %-5p - %m%n
-
log4j.appender.mq=org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender
log4j.appender.mq.Tag=log
log4j.appender.mq.Topic=TopicTest
diff --git a/src/test/resources/log4j-example.xml b/src/test/resources/log4j-example.xml
index b0dc776..6bddde9 100644
--- a/src/test/resources/log4j-example.xml
+++ b/src/test/resources/log4j-example.xml
@@ -19,37 +19,37 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="consoleAppender" class="org.apache.log4j.ConsoleAppender">
- <param name="Encoding" value="UTF-8" />
- <param name="Target" value="System.out" />
+ <param name="Encoding" value="UTF-8"/>
+ <param name="Target" value="System.out"/>
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss},%d %-4r [%t] (%F:%L) %-5p - %m%n" />
+ <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss},%d %-4r [%t] (%F:%L) %-5p - %m%n"/>
</layout>
</appender>
<appender name="mqAppender1" class="org.apache.rocketmq.logappender.log4j.RocketmqLog4jAppender">
- <param name="Tag" value="log1" />
- <param name="Topic" value="TopicTest" />
- <param name="ProducerGroup" value="loggerAppender" />
+ <param name="Tag" value="log1"/>
+ <param name="Topic" value="TopicTest"/>
+ <param name="ProducerGroup" value="loggerAppender"/>
<param name="NameServerAddress" value="127.0.0.1:9876"/>
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss}-%p %t %c - %m%n" />
+ <param name="ConversionPattern" value="%d{yyyy-MM-dd HH:mm:ss}-%p %t %c - %m%n"/>
</layout>
</appender>
<logger name="testLogger" additivity="false">
- <level value="INFO" />
- <appender-ref ref="mqAppender1" />
- <appender-ref ref="consoleAppender" />
+ <level value="INFO"/>
+ <appender-ref ref="mqAppender1"/>
+ <appender-ref ref="consoleAppender"/>
</logger>
<logger name="consoleLogger" additivity="false">
- <level value="INFO" />
- <appender-ref ref="consoleAppender" />
+ <level value="INFO"/>
+ <appender-ref ref="consoleAppender"/>
</logger>
<root>
- <level value="INFO" />
+ <level value="INFO"/>
<appender-ref ref="consoleAppender"/>
</root>
diff --git a/src/test/resources/log4j2-example.xml b/src/test/resources/log4j2-example.xml
index 3ee8a01..c310855 100644
--- a/src/test/resources/log4j2-example.xml
+++ b/src/test/resources/log4j2-example.xml
@@ -17,25 +17,25 @@
-->
<Configuration status="warn" name="Rocketmq">
-<Appenders>
- <RocketMQ name="rocketmqAppender" producerGroup="loggerAppender" nameServerAddress="127.0.0.1:9876"
- topic="TopicTest" tag="log">
- <PatternLayout pattern="%d [%p] hahahah %c %m%n"/>
- </RocketMQ>
+ <Appenders>
+ <RocketMQ name="rocketmqAppender" producerGroup="loggerAppender" nameServerAddress="127.0.0.1:9876"
+ topic="TopicTest" tag="log">
+ <PatternLayout pattern="%d [%p] hahahah %c %m%n"/>
+ </RocketMQ>
- <Console name="Console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
- </Console>
-</Appenders>
-<Loggers>
+ <Console name="Console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
- <Logger name="rocketmqLogger" level="info">
- <AppenderRef ref="rocketmqAppender"/>
- </Logger>
+ <Logger name="rocketmqLogger" level="info">
+ <AppenderRef ref="rocketmqAppender"/>
+ </Logger>
- <Root level="debug">
- <AppenderRef ref="Console"/>
- <AppenderRef ref="rocketmqAppender"/>
- </Root>
-</Loggers>
+ <Root level="debug">
+ <AppenderRef ref="Console"/>
+ <AppenderRef ref="rocketmqAppender"/>
+ </Root>
+ </Loggers>
</Configuration>
\ No newline at end of file
