You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/06/26 04:17:27 UTC
logging-log4j2 git commit: Tab police.
Repository: logging-log4j2
Updated Branches:
refs/heads/master bcd60cc6d -> e20cc1347
Tab police.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e20cc134
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e20cc134
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e20cc134
Branch: refs/heads/master
Commit: e20cc13470feea83fb1ad468daf8fc24ab335b1b
Parents: bcd60cc
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Jun 25 21:17:25 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Jun 25 21:17:25 2017 -0700
----------------------------------------------------------------------
.../mom/activemq/AbstractJmsAppenderIT.java | 216 +++++++++----------
1 file changed, 108 insertions(+), 108 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e20cc134/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java
----------------------------------------------------------------------
diff --git a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java
index 135f568..d065921 100644
--- a/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java
+++ b/log4j-core-its/src/test/java/org/apache/logging/log4j/core/appender/mom/activemq/AbstractJmsAppenderIT.java
@@ -54,85 +54,85 @@ import org.junit.Test;
*/
public abstract class AbstractJmsAppenderIT {
- static class JmsQueueConsumer implements MessageListener {
-
- private final CountDownLatch countDownLatch;
- private final Collection<Object> events;
- private final Class<? extends Message> messageClass;
- private final int messageCount;
-
- JmsQueueConsumer(final int messageCount, final Class<? extends Message> messageClass) {
- this.messageCount = messageCount;
- this.messageClass = messageClass;
- this.countDownLatch = new CountDownLatch(messageCount);
- this.events = new ArrayList<>(messageCount);
- }
-
- public void awaitAndAssertAllMessagesConsumed() throws InterruptedException {
- countDownLatch.await(5, TimeUnit.SECONDS);
- assertEquals(messageCount, events.size());
- }
-
- @Override
- public void onMessage(final Message message) {
- try {
- try {
- final Object event;
- Assert.assertTrue(String.format("Expected type '%s' to be an instance of %s", message.getClass(),
- messageClass), messageClass.isAssignableFrom(message.getClass()));
- if (message instanceof ObjectMessage) {
- event = ((ObjectMessage) message).getObject();
- } else if (message instanceof javax.jms.MapMessage) {
- event = message;
- } else {
- Assert.fail("Unexpected Message type: " + message);
- event = null;
- }
- events.add(event);
- } finally {
- countDownLatch.countDown();
- }
- } catch (final JMSException e) {
- e.printStackTrace();
- }
- }
- }
-
- static final String KEY_SERIALIZABLE_PACKAGES = "org.apache.activemq.SERIALIZABLE_PACKAGES";
-
- private final JmsClientTestConfigRule jmsTestConfigRule;
-
- public AbstractJmsAppenderIT(final JmsClientTestConfigRule jmsTestConfigRule) {
- this.jmsTestConfigRule = jmsTestConfigRule;
- }
-
- protected JmsAppender getJmsAppender() {
- return getJmsTestConfig().getJmsAppender();
- }
-
- protected JmsManager getJmsManager() {
- return getJmsTestConfig().getJmsManager();
- }
-
- private JmsClientTestConfig getJmsTestConfig() {
- return jmsTestConfigRule.getJmsClientTestConfig();
- }
-
- @Test
- public void testLogMapMessageToQueue() throws Exception {
- getJmsTestConfig().createAppender(MessageLayout.createLayout());
- final int messageCount = 100;
- final MessageConsumer messageConsumer = getJmsManager().createMessageConsumer();
- try {
- final JmsQueueConsumer consumer = new JmsQueueConsumer(messageCount, javax.jms.MapMessage.class);
- messageConsumer.setMessageListener(consumer);
- final String messageText = "Hello, World!";
- final String loggerName = this.getClass().getName();
- for (int i = 0; i < messageCount; i++) {
- final Map<String, String> map = new HashMap<>();
- map.put("messageText", messageText);
- map.put("threadName", Thread.currentThread().getName());
- // @formatter:off
+ static class JmsQueueConsumer implements MessageListener {
+
+ private final CountDownLatch countDownLatch;
+ private final Collection<Object> events;
+ private final Class<? extends Message> messageClass;
+ private final int messageCount;
+
+ JmsQueueConsumer(final int messageCount, final Class<? extends Message> messageClass) {
+ this.messageCount = messageCount;
+ this.messageClass = messageClass;
+ this.countDownLatch = new CountDownLatch(messageCount);
+ this.events = new ArrayList<>(messageCount);
+ }
+
+ public void awaitAndAssertAllMessagesConsumed() throws InterruptedException {
+ countDownLatch.await(5, TimeUnit.SECONDS);
+ assertEquals(messageCount, events.size());
+ }
+
+ @Override
+ public void onMessage(final Message message) {
+ try {
+ try {
+ final Object event;
+ Assert.assertTrue(String.format("Expected type '%s' to be an instance of %s", message.getClass(),
+ messageClass), messageClass.isAssignableFrom(message.getClass()));
+ if (message instanceof ObjectMessage) {
+ event = ((ObjectMessage) message).getObject();
+ } else if (message instanceof javax.jms.MapMessage) {
+ event = message;
+ } else {
+ Assert.fail("Unexpected Message type: " + message);
+ event = null;
+ }
+ events.add(event);
+ } finally {
+ countDownLatch.countDown();
+ }
+ } catch (final JMSException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ static final String KEY_SERIALIZABLE_PACKAGES = "org.apache.activemq.SERIALIZABLE_PACKAGES";
+
+ private final JmsClientTestConfigRule jmsTestConfigRule;
+
+ public AbstractJmsAppenderIT(final JmsClientTestConfigRule jmsTestConfigRule) {
+ this.jmsTestConfigRule = jmsTestConfigRule;
+ }
+
+ protected JmsAppender getJmsAppender() {
+ return getJmsTestConfig().getJmsAppender();
+ }
+
+ protected JmsManager getJmsManager() {
+ return getJmsTestConfig().getJmsManager();
+ }
+
+ private JmsClientTestConfig getJmsTestConfig() {
+ return jmsTestConfigRule.getJmsClientTestConfig();
+ }
+
+ @Test
+ public void testLogMapMessageToQueue() throws Exception {
+ getJmsTestConfig().createAppender(MessageLayout.createLayout());
+ final int messageCount = 100;
+ final MessageConsumer messageConsumer = getJmsManager().createMessageConsumer();
+ try {
+ final JmsQueueConsumer consumer = new JmsQueueConsumer(messageCount, javax.jms.MapMessage.class);
+ messageConsumer.setMessageListener(consumer);
+ final String messageText = "Hello, World!";
+ final String loggerName = this.getClass().getName();
+ for (int i = 0; i < messageCount; i++) {
+ final Map<String, String> map = new HashMap<>();
+ map.put("messageText", messageText);
+ map.put("threadName", Thread.currentThread().getName());
+ // @formatter:off
final LogEvent event = Log4jLogEvent.newBuilder()
.setLoggerName(loggerName)
.setLoggerFqcn(loggerName)
@@ -141,27 +141,27 @@ public abstract class AbstractJmsAppenderIT {
.setTimeMillis(System.currentTimeMillis())
.build();
// @formatter:on
- getJmsAppender().append(event);
- }
- consumer.awaitAndAssertAllMessagesConsumed();
- } finally {
- messageConsumer.close();
- }
- }
-
- @Test
- public void testLogObjectMessageToQueue() throws Exception {
- getJmsTestConfig().createAppender(SerializedLayout.createLayout());
- final int messageCount = 100;
- final MessageConsumer messageConsumer = getJmsManager().createMessageConsumer();
- try {
- final JmsQueueConsumer consumer = new JmsQueueConsumer(messageCount, ObjectMessage.class);
- messageConsumer.setMessageListener(consumer);
- final String messageText = "Hello, World!";
- final String loggerName = this.getClass().getName();
- for (int i = 0; i < messageCount; i++) {
- // @formatter:off
- final LogEvent event = Log4jLogEvent.newBuilder()
+ getJmsAppender().append(event);
+ }
+ consumer.awaitAndAssertAllMessagesConsumed();
+ } finally {
+ messageConsumer.close();
+ }
+ }
+
+ @Test
+ public void testLogObjectMessageToQueue() throws Exception {
+ getJmsTestConfig().createAppender(SerializedLayout.createLayout());
+ final int messageCount = 100;
+ final MessageConsumer messageConsumer = getJmsManager().createMessageConsumer();
+ try {
+ final JmsQueueConsumer consumer = new JmsQueueConsumer(messageCount, ObjectMessage.class);
+ messageConsumer.setMessageListener(consumer);
+ final String messageText = "Hello, World!";
+ final String loggerName = this.getClass().getName();
+ for (int i = 0; i < messageCount; i++) {
+ // @formatter:off
+ final LogEvent event = Log4jLogEvent.newBuilder()
.setLoggerName(loggerName)
.setLoggerFqcn(loggerName)
.setLevel(Level.INFO)
@@ -169,12 +169,12 @@ public abstract class AbstractJmsAppenderIT {
.setThreadName(Thread.currentThread().getName())
.setTimeMillis(System.currentTimeMillis())
.build();
- // @formatter:on
- getJmsAppender().append(event);
- }
- consumer.awaitAndAssertAllMessagesConsumed();
- } finally {
- messageConsumer.close();
- }
- }
+ // @formatter:on
+ getJmsAppender().append(event);
+ }
+ consumer.awaitAndAssertAllMessagesConsumed();
+ } finally {
+ messageConsumer.close();
+ }
+ }
}