activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [08/52] [partial] activemq-artemis git commit: ARTEMIS-765 Improve Checkstyle
Date Fri, 30 Sep 2016 15:26:08 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
index d554102..bc3a363 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQStreamMessageTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -74,60 +74,51 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readByte();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readShort();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readInt();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readLong();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readFloat();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readDouble();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readBytes(new byte[1]);
             fail("Should have thrown exception");
+         } catch (MessageFormatException mfe) {
          }
-         catch (MessageFormatException mfe) {
-         }
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -152,39 +143,33 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readBoolean();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readFloat();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readDouble();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readBytes(new byte[1]);
             fail("Should have thrown exception");
+         } catch (MessageFormatException mfe) {
          }
-         catch (MessageFormatException mfe) {
-         }
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -207,46 +192,39 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readBoolean();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readByte();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readFloat();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readDouble();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readBytes(new byte[1]);
             fail("Should have thrown exception");
+         } catch (MessageFormatException mfe) {
          }
-         catch (MessageFormatException mfe) {
-         }
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -265,60 +243,51 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readBoolean();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readByte();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readShort();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readInt();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readLong();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readFloat();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readDouble();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readBytes(new byte[1]);
             fail("Should have thrown exception");
+         } catch (MessageFormatException mfe) {
          }
-         catch (MessageFormatException mfe) {
-         }
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -339,53 +308,45 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readBoolean();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readByte();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readShort();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readFloat();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readDouble();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readBytes(new byte[1]);
             fail("Should have thrown exception");
+         } catch (MessageFormatException mfe) {
          }
-         catch (MessageFormatException mfe) {
-         }
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -404,65 +365,56 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readBoolean();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readByte();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readShort();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readInt();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readFloat();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readDouble();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readBytes(new byte[1]);
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg = new ActiveMQStreamMessage();
          msg.writeObject(new Long("1"));
          // reset so it's readable now
          msg.reset();
          assertEquals(new Long("1"), msg.readObject());
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -483,53 +435,45 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readBoolean();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readByte();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readShort();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readInt();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readLong();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readBytes(new byte[1]);
             fail("Should have thrown exception");
+         } catch (MessageFormatException mfe) {
          }
-         catch (MessageFormatException mfe) {
-         }
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -548,60 +492,51 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readBoolean();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readByte();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readShort();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readInt();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readLong();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readFloat();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readBytes(new byte[1]);
             fail("Should have thrown exception");
+         } catch (MessageFormatException mfe) {
          }
-         catch (MessageFormatException mfe) {
-         }
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -650,8 +585,7 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException e) {
+         } catch (MessageFormatException e) {
          }
          msg.clearBody();
          msg.writeString("777");
@@ -659,12 +593,10 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readBytes(new byte[3]);
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException e) {
+         } catch (MessageFormatException e) {
          }
 
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -684,8 +616,7 @@ public class ActiveMQStreamMessageTest extends TestCase {
          msg.reset();
          assertEquals(bigString, msg.readString());
 
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -709,53 +640,45 @@ public class ActiveMQStreamMessageTest extends TestCase {
          try {
             msg.readByte();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readShort();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readInt();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readLong();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readFloat();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readChar();
             fail("Should have thrown exception");
-         }
-         catch (MessageFormatException mfe) {
+         } catch (MessageFormatException mfe) {
          }
          msg.reset();
          try {
             msg.readString();
             fail("Should have thrown exception");
+         } catch (MessageFormatException mfe) {
          }
-         catch (MessageFormatException mfe) {
-         }
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -822,8 +745,7 @@ public class ActiveMQStreamMessageTest extends TestCase {
          msg.reset();
          assertTrue(((Boolean) msg.readObject()).booleanValue());
 
-      }
-      catch (JMSException jmsEx) {
+      } catch (JMSException jmsEx) {
          jmsEx.printStackTrace();
          assertTrue(false);
       }
@@ -838,10 +760,8 @@ public class ActiveMQStreamMessageTest extends TestCase {
          streamMessage.writeObject(new Long(2));
          streamMessage.readObject();
          fail("should throw exception");
-      }
-      catch (MessageNotReadableException mnwe) {
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotReadableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
          fail("should be writeable");
       }
    }
@@ -851,8 +771,7 @@ public class ActiveMQStreamMessageTest extends TestCase {
       try {
          streamMessage.writeDouble(24.5);
          streamMessage.writeLong(311);
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
          fail("should be writeable");
       }
       streamMessage.reset();
@@ -860,15 +779,13 @@ public class ActiveMQStreamMessageTest extends TestCase {
          assertTrue(streamMessage.isReadOnlyBody());
          assertEquals(streamMessage.readDouble(), 24.5, 0);
          assertEquals(streamMessage.readLong(), 311);
-      }
-      catch (MessageNotReadableException mnre) {
+      } catch (MessageNotReadableException mnre) {
          fail("should be readable");
       }
       try {
          streamMessage.writeInt(33);
          fail("should throw exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
    }
 
@@ -887,8 +804,7 @@ public class ActiveMQStreamMessageTest extends TestCase {
          message.writeObject("stringobj");
          message.writeShort((short) 1);
          message.writeString("string");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
          fail("Should be writeable");
       }
       message.reset();
@@ -907,81 +823,68 @@ public class ActiveMQStreamMessageTest extends TestCase {
          message.readString();
          message.readShort();
          message.readString();
-      }
-      catch (MessageNotReadableException mnwe) {
+      } catch (MessageNotReadableException mnwe) {
          fail("Should be readable");
       }
       try {
          message.writeBoolean(true);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeByte((byte) 1);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeBytes(new byte[1]);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeBytes(new byte[3], 0, 2);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeChar('a');
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeDouble(1.5);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeFloat((float) 1.5);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeInt(1);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeLong(1);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeObject("stringobj");
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeShort((short) 1);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
       try {
          message.writeString("string");
          fail("Should have thrown exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
    }
 
@@ -1001,81 +904,68 @@ public class ActiveMQStreamMessageTest extends TestCase {
          message.writeObject("stringobj");
          message.writeShort((short) 1);
          message.writeString("string");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
          fail("Should be writeable");
       }
       try {
          message.readBoolean();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException mnwe) {
+      } catch (MessageNotReadableException mnwe) {
       }
       try {
          message.readByte();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readBytes(new byte[1]);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readBytes(new byte[2]);
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readChar();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readDouble();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readFloat();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readInt();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readLong();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readString();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readShort();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
       try {
          message.readString();
          fail("Should have thrown exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
       }
    }
 
@@ -1092,8 +982,7 @@ public class ActiveMQStreamMessageTest extends TestCase {
          message.writeObject(new Long(2L));
          message.writeObject(new Float(2.0f));
          message.writeObject(new Double(2.0d));
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
          fail(e.getMessage());
       }
       try {
@@ -1101,11 +990,9 @@ public class ActiveMQStreamMessageTest extends TestCase {
          message.clearBody();
          message.writeObject(new Object());
          fail("should throw an exception");
-      }
-      catch (MessageFormatException e) {
+      } catch (MessageFormatException e) {
 
-      }
-      catch (Exception e) {
+      } catch (Exception e) {
          fail(e.getMessage());
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
index cfbba33..fbb6bae 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/ActiveMQTextMessageTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,17 +16,15 @@
  */
 package org.apache.activemq.command;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-
 import javax.jms.JMSException;
 import javax.jms.MessageNotReadableException;
 import javax.jms.MessageNotWriteableException;
+import java.io.DataOutputStream;
+import java.io.IOException;
 
 import junit.framework.TestCase;
 
 import junit.textui.TestRunner;
-
 import org.apache.activemq.util.ByteArrayOutputStream;
 import org.apache.activemq.util.ByteSequence;
 import org.apache.activemq.util.MarshallingSupport;
@@ -59,8 +57,7 @@ public class ActiveMQTextMessageTest extends TestCase {
       try {
          msg.setText(str);
          assertEquals(msg.getText(), str);
-      }
-      catch (JMSException e) {
+      } catch (JMSException e) {
          e.printStackTrace();
       }
    }
@@ -87,11 +84,9 @@ public class ActiveMQTextMessageTest extends TestCase {
       try {
          textMessage.setText("String");
          textMessage.getText();
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
          fail("should be writeable");
-      }
-      catch (MessageNotReadableException mnre) {
+      } catch (MessageNotReadableException mnre) {
          fail("should be readable");
       }
    }
@@ -102,15 +97,13 @@ public class ActiveMQTextMessageTest extends TestCase {
       textMessage.setReadOnlyBody(true);
       try {
          textMessage.getText();
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
          fail("should be readable");
       }
       try {
          textMessage.setText("test");
          fail("should throw exception");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
    }
 
@@ -120,8 +113,7 @@ public class ActiveMQTextMessageTest extends TestCase {
       try {
          textMessage.setText("test");
          textMessage.getText();
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
          fail("should be readable");
       }
       textMessage.setReadOnlyBody(true);
@@ -129,11 +121,9 @@ public class ActiveMQTextMessageTest extends TestCase {
          textMessage.getText();
          textMessage.setText("test");
          fail("should throw exception");
-      }
-      catch (MessageNotReadableException e) {
+      } catch (MessageNotReadableException e) {
          fail("should be readable");
-      }
-      catch (MessageNotWriteableException mnwe) {
+      } catch (MessageNotWriteableException mnwe) {
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
index 6cdee06..ea16d5d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/DataStructureTestSupport.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -99,8 +99,7 @@ public abstract class DataStructureTestSupport extends CombinationTestSupport {
             if (!ok) {
                throw new AssertionFailedError("Arrays not equal");
             }
-         }
-         else {
+         } else {
             Object expectArray[] = (Object[]) expect;
             Object wasArray[] = (Object[]) was;
             if (expectArray.length != wasArray.length) {
@@ -111,8 +110,7 @@ public abstract class DataStructureTestSupport extends CombinationTestSupport {
             }
 
          }
-      }
-      else if (expect instanceof Command) {
+      } else if (expect instanceof Command) {
          assertEquals(expect.getClass(), was.getClass());
          Method[] methods = expect.getClass().getMethods();
          for (int i = 0; i < methods.length; i++) {
@@ -123,28 +121,22 @@ public abstract class DataStructureTestSupport extends CombinationTestSupport {
                try {
                   if (method.getName().startsWith("get")) {
                      expect.getClass().getMethod(method.getName().replaceFirst("get", "set"), new Class[]{method.getReturnType()});
-                  }
-                  else {
+                  } else {
                      expect.getClass().getMethod(method.getName().replaceFirst("is", "set"), new Class[]{method.getReturnType()});
                   }
-               }
-               catch (Throwable ignore) {
+               } catch (Throwable ignore) {
                   continue;
                }
 
                try {
                   assertEquals(method.invoke(expect, (Object) null), method.invoke(was, (Object) null));
-               }
-               catch (IllegalArgumentException e) {
-               }
-               catch (IllegalAccessException e) {
-               }
-               catch (InvocationTargetException e) {
+               } catch (IllegalArgumentException e) {
+               } catch (IllegalAccessException e) {
+               } catch (InvocationTargetException e) {
                }
             }
          }
-      }
-      else {
+      } else {
          TestCase.assertEquals(expect, was);
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageCompressionTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageCompressionTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageCompressionTest.java
index 01dbe6c..d80b743 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageCompressionTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageCompressionTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,9 +16,6 @@
  */
 package org.apache.activemq.command;
 
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-
 import javax.jms.BytesMessage;
 import javax.jms.JMSException;
 import javax.jms.MapMessage;
@@ -27,6 +24,8 @@ import javax.jms.MessageProducer;
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
 import javax.jms.StreamMessage;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import junit.framework.TestCase;
 
@@ -113,7 +112,7 @@ public class MessageCompressionTest extends TestCase {
       boolean booleanVal = mapMessage.getBoolean("boolean-type");
       assertTrue(booleanVal);
       byte byteVal = mapMessage.getByte("byte-type");
-      assertEquals((byte)10, byteVal);
+      assertEquals((byte) 10, byteVal);
       byte[] bytesVal = mapMessage.getBytes("bytes-type");
       byte[] originVal = TEXT.getBytes();
       assertEquals(originVal.length, bytesVal.length);
@@ -160,7 +159,7 @@ public class MessageCompressionTest extends TestCase {
       boolean booleanVal = streamMessage.readBoolean();
       assertTrue(booleanVal);
       byte byteVal = streamMessage.readByte();
-      assertEquals((byte)10, byteVal);
+      assertEquals((byte) 10, byteVal);
       byte[] originVal = TEXT.getBytes();
       byte[] bytesVal = new byte[originVal.length];
       streamMessage.readBytes(bytesVal);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageSendTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageSendTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageSendTest.java
index a436754..22c7b1e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageSendTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageSendTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageTest.java
index b849849..0a4d226 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/command/MessageTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java
index f7744d3..c1e674e 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerPropertiesTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
index 8d658e7..883b1a9 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,11 +16,10 @@
  */
 package org.apache.activemq.config;
 
-import java.io.File;
-import java.util.Hashtable;
-
 import javax.naming.Context;
 import javax.naming.InitialContext;
+import java.io.File;
+import java.util.Hashtable;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java
index b93babc..1509e04 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigTest.java
index f0640b6..fd2adef 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,22 +16,16 @@
  */
 package org.apache.activemq.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.util.List;
-
 import javax.jms.JMSException;
 import javax.jms.MessageConsumer;
 import javax.jms.Session;
 import javax.jms.Topic;
 import javax.sql.DataSource;
+import java.io.File;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.util.List;
 
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
@@ -64,6 +58,11 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class ConfigTest {
 
    protected static final String JOURNAL_ROOT = "target/test-data/";
@@ -117,8 +116,7 @@ public class ConfigTest {
          assertTrue(broker.getSystemUsage().getStoreUsage().getStore() instanceof JournalPersistenceAdapter);
 
          LOG.info("Success");
-      }
-      finally {
+      } finally {
          if (broker != null) {
             broker.stop();
          }
@@ -282,8 +280,7 @@ public class ConfigTest {
 
          LOG.info("Success");
 
-      }
-      finally {
+      } finally {
          if (broker != null) {
             broker.stop();
          }
@@ -309,8 +306,7 @@ public class ConfigTest {
          assertTrue("Should have created a journal directory at " + journalFile.getAbsolutePath(), journalFile.exists());
 
          LOG.info("Success");
-      }
-      finally {
+      } finally {
          if (broker != null) {
             broker.stop();
          }
@@ -341,8 +337,7 @@ public class ConfigTest {
          assertTrue("Should have not created a journal directory at " + journalFile.getAbsolutePath(), !journalFile.exists());
 
          LOG.info("Success");
-      }
-      finally {
+      } finally {
          if (broker != null) {
             broker.stop();
          }
@@ -381,8 +376,7 @@ public class ConfigTest {
          try {
             session.createProducer(topic);
             fail("Should have got an exception on exceeding MAX_PRODUCERS");
-         }
-         catch (JMSException expected) {
+         } catch (JMSException expected) {
          }
 
          try {
@@ -391,13 +385,11 @@ public class ConfigTest {
                assertNotNull(consumer);
             }
             fail("Should have caught an exception");
-         }
-         catch (JMSException e) {
+         } catch (JMSException e) {
          }
 
          LOG.info("Success");
-      }
-      finally {
+      } finally {
          broker.stop();
       }
    }
@@ -409,8 +401,7 @@ public class ConfigTest {
       broker = createBroker(new FileSystemResource(CONF_ROOT + "memory-example.xml"));
       try {
          assertEquals("Broker Config Error (brokerName)", "brokerMemoryConfigTest", broker.getBrokerName());
-      }
-      finally {
+      } finally {
          if (broker != null) {
             broker.stop();
          }
@@ -419,8 +410,7 @@ public class ConfigTest {
       broker = createBroker("org/apache/activemq/config/config.xml");
       try {
          assertEquals("Broker Config Error (brokerName)", "brokerXmlConfigHelper", broker.getBrokerName());
-      }
-      finally {
+      } finally {
          if (broker != null) {
             broker.stop();
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigUsingDestinationOptions.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigUsingDestinationOptions.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigUsingDestinationOptions.java
index b85e6bc..8637c53 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigUsingDestinationOptions.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/ConfigUsingDestinationOptions.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -58,8 +58,7 @@ public class ConfigUsingDestinationOptions extends TestCase {
       try {
          cons = (ActiveMQMessageConsumer) sess.createConsumer(queue, "test||1");
          fail("Selector should be invalid" + cons);
-      }
-      catch (InvalidSelectorException e) {
+      } catch (InvalidSelectorException e) {
 
       }
 
@@ -67,8 +66,7 @@ public class ConfigUsingDestinationOptions extends TestCase {
       try {
          cons = (ActiveMQMessageConsumer) sess.createConsumer(queue);
          fail("Selector should be invalid" + cons);
-      }
-      catch (InvalidSelectorException e) {
+      } catch (InvalidSelectorException e) {
 
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/JDBCConfigTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/JDBCConfigTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/JDBCConfigTest.java
index 3b7b83c..5078697 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/JDBCConfigTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/config/JDBCConfigTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,9 +16,6 @@
  */
 package org.apache.activemq.config;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 
 import org.apache.activemq.broker.BrokerService;
@@ -34,6 +31,9 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 public class JDBCConfigTest {
 
    protected static final String JOURNAL_ROOT = "target/test-data/";
@@ -65,8 +65,7 @@ public class JDBCConfigTest {
          assertTrue("Should have created a DefaultWireFormat", ((JDBCPersistenceAdapter) adapter).getWireFormat() instanceof ObjectStreamWireFormat);
 
          LOG.info("Success");
-      }
-      finally {
+      } finally {
          if (broker != null) {
             broker.stop();
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java
index 317fd55..52b523f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3410Test.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -116,8 +116,7 @@ public class AMQ3410Test extends TestCase {
 
       try {
          command.execute(tokens);
-      }
-      catch (Throwable cause) {
+      } catch (Throwable cause) {
          while (null != cause) {
             if (cause instanceof java.lang.ClassNotFoundException)
                return;
@@ -143,8 +142,7 @@ public class AMQ3410Test extends TestCase {
 
       try {
          command.execute(tokens);
-      }
-      catch (Throwable e) {
+      } catch (Throwable e) {
          Throwable cause = e;
          while (null != cause) {
             if (cause instanceof java.lang.NoSuchMethodException)
@@ -172,8 +170,7 @@ public class AMQ3410Test extends TestCase {
 
       try {
          command.execute(tokens);
-      }
-      catch (Throwable cause) {
+      } catch (Throwable cause) {
          while (null != cause) {
             if (cause instanceof java.lang.NoSuchMethodException)
                return;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java
index 9ca9d18..4d16507 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/AMQ3411Test.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -152,8 +152,7 @@ public class AMQ3411Test extends TestCase {
 
       try {
          command.execute(tokens);
-      }
-      catch (Throwable e) {
+      } catch (Throwable e) {
          Throwable cause = e;
          while (null != cause) {
             if (cause instanceof java.lang.ClassNotFoundException)
@@ -183,8 +182,7 @@ public class AMQ3411Test extends TestCase {
 
       try {
          command.execute(tokens);
-      }
-      catch (Throwable e) {
+      } catch (Throwable e) {
          Throwable cause = e;
          while (null != cause) {
             if (cause instanceof java.lang.ClassCastException)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/DummyConnectionFactory.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/DummyConnectionFactory.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/DummyConnectionFactory.java
index 7af0fac..0219436 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/DummyConnectionFactory.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/DummyConnectionFactory.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +16,10 @@
  */
 package org.apache.activemq.console.command;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
-
 import java.net.URI;
 
+import org.apache.activemq.ActiveMQConnectionFactory;
+
 public class DummyConnectionFactory extends ActiveMQConnectionFactory {
 
    public DummyConnectionFactory() {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/InvalidConnectionFactory.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/InvalidConnectionFactory.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/InvalidConnectionFactory.java
index fa57684..3e5d212 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/InvalidConnectionFactory.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/InvalidConnectionFactory.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/LowercasingPasswordFactory.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/LowercasingPasswordFactory.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/LowercasingPasswordFactory.java
index f8e4795..7219be2 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/LowercasingPasswordFactory.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/LowercasingPasswordFactory.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java
index b238452..f41f614 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/console/command/PurgeCommandTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,13 +16,6 @@
  */
 package org.apache.activemq.console.command;
 
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.List;
-
 import javax.jms.JMSException;
 import javax.jms.MessageConsumer;
 import javax.jms.MessageProducer;
@@ -37,6 +30,12 @@ import javax.management.MBeanServerConnection;
 import javax.management.MBeanServerInvocationHandler;
 import javax.management.ObjectInstance;
 import javax.management.ObjectName;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
 
 import junit.framework.TestCase;
 
@@ -219,8 +218,7 @@ public class PurgeCommandTest extends TestCase {
 
          validateCounts(0, MESSAGE_COUNT, MESSAGE_COUNT);
 
-      }
-      finally {
+      } finally {
          purgeAllMessages();
       }
    }
@@ -245,8 +243,7 @@ public class PurgeCommandTest extends TestCase {
          purgeCommand.execute(tokens);
 
          validateCounts(0, MESSAGE_COUNT, MESSAGE_COUNT);
-      }
-      finally {
+      } finally {
          purgeAllMessages();
       }
    }
@@ -283,8 +280,7 @@ public class PurgeCommandTest extends TestCase {
          assertEquals("Expected allCount to be " + MESSAGE_COUNT + " was " + allCount, MESSAGE_COUNT, allCount);
          LOG.info("withCount = " + withCount + "\n allCount = " +
                      allCount + "\n  = " + "\n");
-      }
-      finally {
+      } finally {
          purgeAllMessages();
       }
    }
@@ -299,8 +295,7 @@ public class PurgeCommandTest extends TestCase {
                LOG.info("String matches.");
             else
                LOG.info("string does not match.");
-         }
-         catch (Exception ex) {
+         } catch (Exception ex) {
             LOG.error(ex.getMessage());
          }
 
@@ -334,8 +329,7 @@ public class PurgeCommandTest extends TestCase {
          assertEquals("Expected allCount to be " + MESSAGE_COUNT + " was " + allCount, MESSAGE_COUNT, allCount);
          LOG.info("withCount = " + withCount + "\n allCount = " +
                      allCount + "\n  = " + "\n");
-      }
-      finally {
+      } finally {
          purgeAllMessages();
       }
    }
@@ -372,8 +366,7 @@ public class PurgeCommandTest extends TestCase {
          assertEquals("Expected allCount to be 0 but was " + allCount, 0, allCount);
          LOG.info("withCount = " + withCount + "\n allCount = " +
                      allCount + "\n  = " + "\n");
-      }
-      finally {
+      } finally {
          purgeAllMessages();
       }
    }
@@ -388,8 +381,7 @@ public class PurgeCommandTest extends TestCase {
                LOG.info("String matches.");
             else
                LOG.info("string does not match.");
-         }
-         catch (Exception ex) {
+         } catch (Exception ex) {
             LOG.error(ex.getMessage());
          }
 
@@ -427,8 +419,7 @@ public class PurgeCommandTest extends TestCase {
             LOG.info("withCount = " + withCount + "\n allCount = " +
                     allCount + "\n  = " + "\n");
             */
-      }
-      finally {
+      } finally {
          purgeAllMessages();
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/DefaultQueueSender.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/DefaultQueueSender.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/DefaultQueueSender.java
index bef0550..ec67b7f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/DefaultQueueSender.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/DefaultQueueSender.java
@@ -6,13 +6,21 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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.
+ *
+ * The SimpleQueueSender class consists only of a main method,
+ * which sends several messages to a queue.
+ *
+ * Run this program in conjunction with SimpleQueueReceiver.
+ * Specify a queue name on the command line when you run the
+ * program.  By default, the program sends one message.  Specify
+ * a number after the queue name to send that number of messages.
  */
 
 /**
@@ -89,16 +97,13 @@ public final class DefaultQueueSender {
 
          Message message = session.createTextMessage(text);
          producer.send(message);
-      }
-      catch (JMSException e) {
+      } catch (JMSException e) {
          LOG.info("Exception occurred: " + e.toString());
-      }
-      finally {
+      } finally {
          if (connection != null) {
             try {
                connection.close();
-            }
-            catch (JMSException e) {
+            } catch (JMSException e) {
             }
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleConsumer.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleConsumer.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleConsumer.java
index ee8899b..7e9145f 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleConsumer.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleConsumer.java
@@ -6,13 +6,19 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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.
+ *
+ * The SimpleQueueReceiver class consists only of a main method,
+ * which fetches one or more messages from a queue using
+ * synchronous message delivery.  Run this program in conjunction
+ * with SimpleQueueSender.  Specify a queue name on the command
+ * line when you run the program.
  */
 
 /**
@@ -74,8 +80,7 @@ public final class SimpleConsumer {
          */
       try {
          jndiContext = new InitialContext();
-      }
-      catch (NamingException e) {
+      } catch (NamingException e) {
          LOG.info("Could not create JNDI API " + "context: " + e.toString());
          System.exit(1);
       }
@@ -86,8 +91,7 @@ public final class SimpleConsumer {
       try {
          connectionFactory = (ConnectionFactory) jndiContext.lookup("ConnectionFactory");
          destination = (Destination) jndiContext.lookup(destinationName);
-      }
-      catch (NamingException e) {
+      } catch (NamingException e) {
          LOG.info("JNDI API lookup failed: " + e.toString());
          System.exit(1);
       }
@@ -110,22 +114,18 @@ public final class SimpleConsumer {
                if (m instanceof TextMessage) {
                   TextMessage message = (TextMessage) m;
                   LOG.info("Reading message: " + message.getText());
-               }
-               else {
+               } else {
                   break;
                }
             }
          }
-      }
-      catch (JMSException e) {
+      } catch (JMSException e) {
          LOG.info("Exception occurred: " + e);
-      }
-      finally {
+      } finally {
          if (connection != null) {
             try {
                connection.close();
-            }
-            catch (JMSException e) {
+            } catch (JMSException e) {
             }
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleProducer.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleProducer.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleProducer.java
index 6e5fb4c..9ab1acf 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleProducer.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleProducer.java
@@ -6,13 +6,21 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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.
+ *
+ * The SimpleQueueSender class consists only of a main method,
+ * which sends several messages to a queue.
+ *
+ * Run this program in conjunction with SimpleQueueReceiver.
+ * Specify a queue name on the command line when you run the
+ * program.  By default, the program sends one message.  Specify
+ * a number after the queue name to send that number of messages.
  */
 
 /**
@@ -75,8 +83,7 @@ public final class SimpleProducer {
       LOG.info("Destination name is " + destinationName);
       if (args.length == 2) {
          numMsgs = (new Integer(args[1])).intValue();
-      }
-      else {
+      } else {
          numMsgs = 1;
       }
 
@@ -85,8 +92,7 @@ public final class SimpleProducer {
          */
       try {
          jndiContext = new InitialContext();
-      }
-      catch (NamingException e) {
+      } catch (NamingException e) {
          LOG.info("Could not create JNDI API context: " + e.toString());
          System.exit(1);
       }
@@ -97,8 +103,7 @@ public final class SimpleProducer {
       try {
          connectionFactory = (ConnectionFactory) jndiContext.lookup("ConnectionFactory");
          destination = (Destination) jndiContext.lookup(destinationName);
-      }
-      catch (NamingException e) {
+      } catch (NamingException e) {
          LOG.info("JNDI API lookup failed: " + e);
          System.exit(1);
       }
@@ -124,16 +129,13 @@ public final class SimpleProducer {
              * Send a non-text control message indicating end of messages.
              */
          producer.send(session.createMessage());
-      }
-      catch (JMSException e) {
+      } catch (JMSException e) {
          LOG.info("Exception occurred: " + e);
-      }
-      finally {
+      } finally {
          if (connection != null) {
             try {
                connection.close();
-            }
-            catch (JMSException e) {
+            } catch (JMSException e) {
             }
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java
index 73ee6b1..14f3ed5 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueReceiver.java
@@ -6,13 +6,19 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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.
+ *
+ * The SimpleQueueReceiver class consists only of a main method,
+ * which fetches one or more messages from a queue using
+ * synchronous message delivery.  Run this program in conjunction
+ * with SimpleQueueSender.  Specify a queue name on the command
+ * line when you run the program.
  */
 
 /**
@@ -77,8 +83,7 @@ public final class SimpleQueueReceiver {
          */
       try {
          jndiContext = new InitialContext();
-      }
-      catch (NamingException e) {
+      } catch (NamingException e) {
          LOG.info("Could not create JNDI API " + "context: " + e.toString());
          System.exit(1);
       }
@@ -89,8 +94,7 @@ public final class SimpleQueueReceiver {
       try {
          queueConnectionFactory = (QueueConnectionFactory) jndiContext.lookup("QueueConnectionFactory");
          queue = (Queue) jndiContext.lookup(queueName);
-      }
-      catch (NamingException e) {
+      } catch (NamingException e) {
          LOG.info("JNDI API lookup failed: " + e.toString());
          System.exit(1);
       }
@@ -113,22 +117,18 @@ public final class SimpleQueueReceiver {
                if (m instanceof TextMessage) {
                   message = (TextMessage) m;
                   LOG.info("Reading message: " + message.getText());
-               }
-               else {
+               } else {
                   break;
                }
             }
          }
-      }
-      catch (JMSException e) {
+      } catch (JMSException e) {
          LOG.info("Exception occurred: " + e.toString());
-      }
-      finally {
+      } finally {
          if (queueConnection != null) {
             try {
                queueConnection.close();
-            }
-            catch (JMSException e) {
+            } catch (JMSException e) {
             }
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java
index 59490ef..35d2ee3 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/demo/SimpleQueueSender.java
@@ -6,13 +6,21 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * 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.
+ *
+ * The SimpleQueueSender class consists only of a main method,
+ * which sends several messages to a queue.
+ *
+ * Run this program in conjunction with SimpleQueueReceiver.
+ * Specify a queue name on the command line when you run the
+ * program.  By default, the program sends one message.  Specify
+ * a number after the queue name to send that number of messages.
  */
 
 /**
@@ -75,8 +83,7 @@ public final class SimpleQueueSender {
       LOG.info("Queue name is " + queueName);
       if (args.length == 2) {
          numMsgs = (new Integer(args[1])).intValue();
-      }
-      else {
+      } else {
          numMsgs = 1;
       }
 
@@ -85,8 +92,7 @@ public final class SimpleQueueSender {
          */
       try {
          jndiContext = new InitialContext();
-      }
-      catch (NamingException e) {
+      } catch (NamingException e) {
          LOG.info("Could not create JNDI API context: " + e.toString());
          System.exit(1);
       }
@@ -97,8 +103,7 @@ public final class SimpleQueueSender {
       try {
          queueConnectionFactory = (QueueConnectionFactory) jndiContext.lookup("QueueConnectionFactory");
          queue = (Queue) jndiContext.lookup(queueName);
-      }
-      catch (NamingException e) {
+      } catch (NamingException e) {
          LOG.info("JNDI API lookup failed: " + e);
          System.exit(1);
       }
@@ -124,16 +129,13 @@ public final class SimpleQueueSender {
              * Send a non-text control message indicating end of messages.
              */
          queueSender.send(queueSession.createMessage());
-      }
-      catch (JMSException e) {
+      } catch (JMSException e) {
          LOG.info("Exception occurred: " + e.toString());
-      }
-      finally {
+      } finally {
          if (queueConnection != null) {
             try {
                queueConnection.close();
-            }
-            catch (JMSException e) {
+            } catch (JMSException e) {
             }
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java
index c189971..98126f6 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationFilterTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,11 +16,11 @@
  */
 package org.apache.activemq.filter;
 
+import junit.framework.TestCase;
+
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
 
-import junit.framework.TestCase;
-
 public class DestinationFilterTest extends TestCase {
 
    public void testPrefixFilter() throws Exception {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java
index 480a854..0da8c0d 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapMemoryTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,8 +41,7 @@ public class DestinationMapMemoryTest extends TestCase {
             ActiveMQDestination d1 = createDestination(name);
             DestinationMap map = new DestinationMap();
             map.put(d1, d1);
-         }
-         catch (Throwable e) {
+         } catch (Throwable e) {
             fail("Destination name too long: " + name + " : " + e);
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java
index 2a2d2fc..8d64e8b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTempDestinationTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -42,4 +42,4 @@ public class DestinationMapTempDestinationTest extends TestCase {
          assertTrue(set.isEmpty());
       }
    }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
index 2930fdf..4b80ac1 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationMapTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -23,12 +23,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import junit.framework.TestCase;
+
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;
 
-import junit.framework.TestCase;
-
 public class DestinationMapTest extends TestCase {
 
    protected DestinationMap map = new DestinationMap();
@@ -412,11 +412,9 @@ public class DestinationMapTest extends TestCase {
       List expectedList = null;
       if (expected == null) {
          expectedList = Collections.EMPTY_LIST;
-      }
-      else if (expected instanceof List) {
+      } else if (expected instanceof List) {
          expectedList = (List) expected;
-      }
-      else {
+      } else {
          expectedList = new ArrayList();
          expectedList.add(expected);
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java
index f3972a7..2484585 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DestinationPathTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicy.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicy.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicy.java
index e3cf9e8..9cfff27 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicy.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicy.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyEntry.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyEntry.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyEntry.java
index 547d2c9..ea8a871 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyEntry.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyEntry.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java
----------------------------------------------------------------------
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java
index 0b94174..14d1a02 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/filter/DummyPolicyTest.java
@@ -6,7 +6,7 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,


Mime
View raw message