activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [21/53] [abbrv] [partial] activemq-artemis git commit: automatic checkstyle change
Date Mon, 10 Aug 2015 15:13:20 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java
index 1f8463f..aaeb578 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/CompressionUtilTest.java
@@ -31,12 +31,10 @@ import org.apache.activemq.artemis.utils.DeflaterReader;
 import org.apache.activemq.artemis.utils.InflaterReader;
 import org.apache.activemq.artemis.utils.InflaterWriter;
 
-public class CompressionUtilTest extends Assert
-{
+public class CompressionUtilTest extends Assert {
 
    @Test
-   public void testDeflaterReader() throws Exception
-   {
+   public void testDeflaterReader() throws Exception {
       String inputString = "blahblahblah??blahblahblahblahblah??blablahblah??blablahblah??bla";
       byte[] input = inputString.getBytes(StandardCharsets.UTF_8);
 
@@ -48,8 +46,7 @@ public class CompressionUtilTest extends Assert
       ArrayList<Integer> zipHolder = new ArrayList<Integer>();
       int b = reader.read();
 
-      while (b != -1)
-      {
+      while (b != -1) {
          zipHolder.add(b);
          b = reader.read();
       }
@@ -57,8 +54,7 @@ public class CompressionUtilTest extends Assert
       assertEquals(input.length, counter.get());
 
       byte[] allCompressed = new byte[zipHolder.size()];
-      for (int i = 0; i < allCompressed.length; i++)
-      {
+      for (int i = 0; i < allCompressed.length; i++) {
          allCompressed[i] = (byte) zipHolder.get(i).intValue();
       }
 
@@ -73,8 +69,7 @@ public class CompressionUtilTest extends Assert
    }
 
    @Test
-   public void testDeflaterReader2() throws Exception
-   {
+   public void testDeflaterReader2() throws Exception {
       String inputString = "blahblahblah??blahblahblahblahblah??blablahblah??blablahblah??bla";
       byte[] input = inputString.getBytes(StandardCharsets.UTF_8);
 
@@ -87,11 +82,9 @@ public class CompressionUtilTest extends Assert
       ArrayList<Integer> zipHolder = new ArrayList<Integer>();
 
       int n = reader.read(buffer);
-      while (n != -1)
-      {
-         for (int i = 0; i < n; i++)
-         {
-            zipHolder.add((int)buffer[i]);
+      while (n != -1) {
+         for (int i = 0; i < n; i++) {
+            zipHolder.add((int) buffer[i]);
          }
          n = reader.read(buffer);
       }
@@ -99,8 +92,7 @@ public class CompressionUtilTest extends Assert
       assertEquals(input.length, counter.get());
 
       byte[] allCompressed = new byte[zipHolder.size()];
-      for (int i = 0; i < allCompressed.length; i++)
-      {
+      for (int i = 0; i < allCompressed.length; i++) {
          allCompressed[i] = (byte) zipHolder.get(i).intValue();
       }
 
@@ -115,8 +107,7 @@ public class CompressionUtilTest extends Assert
    }
 
    @Test
-   public void testInflaterReader() throws Exception
-   {
+   public void testInflaterReader() throws Exception {
       String inputString = "blahblahblah??blahblahblahblahblah??blablahblah??blablahblah??bla";
       byte[] input = inputString.getBytes(StandardCharsets.UTF_8);
       byte[] output = new byte[30];
@@ -134,16 +125,14 @@ public class CompressionUtilTest extends Assert
       ArrayList<Integer> holder = new ArrayList<Integer>();
       int read = inflater.read();
 
-      while (read != -1)
-      {
+      while (read != -1) {
          holder.add(read);
          read = inflater.read();
       }
 
       byte[] result = new byte[holder.size()];
 
-      for (int i = 0; i < result.length; i++)
-      {
+      for (int i = 0; i < result.length; i++) {
          result[i] = holder.get(i).byteValue();
       }
 
@@ -154,8 +143,7 @@ public class CompressionUtilTest extends Assert
    }
 
    @Test
-   public void testInflaterWriter() throws Exception
-   {
+   public void testInflaterWriter() throws Exception {
       String inputString = "blahblahblah??blahblahblahblahblah??blablahblah??blablahblah??bla";
       byte[] input = inputString.getBytes(StandardCharsets.UTF_8);
       byte[] output = new byte[30];
@@ -175,8 +163,7 @@ public class CompressionUtilTest extends Assert
       byte[] zipBuffer = new byte[12];
 
       int n = byteInput.read(zipBuffer);
-      while (n > 0)
-      {
+      while (n > 0) {
          writer.write(zipBuffer, 0, n);
          n = byteInput.read(zipBuffer);
       }
@@ -189,10 +176,8 @@ public class CompressionUtilTest extends Assert
       assertEquals(inputString, outStr);
    }
 
-   private void compareByteArray(byte[] first, byte[] second, int length)
-   {
-      for (int i = 0; i < length; i++)
-      {
+   private void compareByteArray(byte[] first, byte[] second, int length) {
+      for (int i = 0; i < length; i++) {
          assertEquals(first[i], second[i]);
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java
index 002428b..8a2e40b 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/ConcurrentHashSetTest.java
@@ -25,8 +25,7 @@ import org.junit.Test;
 
 import java.util.Iterator;
 
-public class ConcurrentHashSetTest extends Assert
-{
+public class ConcurrentHashSetTest extends Assert {
    // Constants -----------------------------------------------------
 
    // Attributes ----------------------------------------------------
@@ -42,22 +41,19 @@ public class ConcurrentHashSetTest extends Assert
    // Public --------------------------------------------------------
 
    @Test
-   public void testAdd() throws Exception
-   {
+   public void testAdd() throws Exception {
       Assert.assertTrue(set.add(element));
       Assert.assertFalse(set.add(element));
    }
 
    @Test
-   public void testAddIfAbsent() throws Exception
-   {
+   public void testAddIfAbsent() throws Exception {
       Assert.assertTrue(set.addIfAbsent(element));
       Assert.assertFalse(set.addIfAbsent(element));
    }
 
    @Test
-   public void testRemove() throws Exception
-   {
+   public void testRemove() throws Exception {
       Assert.assertTrue(set.add(element));
 
       Assert.assertTrue(set.remove(element));
@@ -65,8 +61,7 @@ public class ConcurrentHashSetTest extends Assert
    }
 
    @Test
-   public void testContains() throws Exception
-   {
+   public void testContains() throws Exception {
       Assert.assertFalse(set.contains(element));
 
       Assert.assertTrue(set.add(element));
@@ -77,8 +72,7 @@ public class ConcurrentHashSetTest extends Assert
    }
 
    @Test
-   public void testSize() throws Exception
-   {
+   public void testSize() throws Exception {
       Assert.assertEquals(0, set.size());
 
       Assert.assertTrue(set.add(element));
@@ -89,8 +83,7 @@ public class ConcurrentHashSetTest extends Assert
    }
 
    @Test
-   public void testClear() throws Exception
-   {
+   public void testClear() throws Exception {
       Assert.assertTrue(set.add(element));
 
       Assert.assertTrue(set.contains(element));
@@ -99,8 +92,7 @@ public class ConcurrentHashSetTest extends Assert
    }
 
    @Test
-   public void testIsEmpty() throws Exception
-   {
+   public void testIsEmpty() throws Exception {
       Assert.assertTrue(set.isEmpty());
 
       Assert.assertTrue(set.add(element));
@@ -111,13 +103,11 @@ public class ConcurrentHashSetTest extends Assert
    }
 
    @Test
-   public void testIterator() throws Exception
-   {
+   public void testIterator() throws Exception {
       set.add(element);
 
       Iterator<String> iterator = set.iterator();
-      while (iterator.hasNext())
-      {
+      while (iterator.hasNext()) {
          String e = iterator.next();
          Assert.assertEquals(element, e);
       }
@@ -126,8 +116,7 @@ public class ConcurrentHashSetTest extends Assert
    // TestCase overrides --------------------------------------------
 
    @Before
-   public void setUp() throws Exception
-   {
+   public void setUp() throws Exception {
       set = new ConcurrentHashSet<String>();
       element = RandomUtil.randomString();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
index f21d1b1..923a9f3 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
@@ -24,8 +24,7 @@ import org.junit.Test;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-public class TimeAndCounterIDGeneratorTest extends Assert
-{
+public class TimeAndCounterIDGeneratorTest extends Assert {
 
    // Constants -----------------------------------------------------
 
@@ -38,15 +37,13 @@ public class TimeAndCounterIDGeneratorTest extends Assert
    // Public --------------------------------------------------------
 
    @Test
-   public void testCalculation()
-   {
+   public void testCalculation() {
       TimeAndCounterIDGenerator seq = new TimeAndCounterIDGenerator();
       long max = 11000;
 
       long lastNr = 0;
 
-      for (long i = 0; i < max; i++)
-      {
+      for (long i = 0; i < max; i++) {
          long seqNr = seq.generateID();
 
          Assert.assertTrue("The sequence generator should aways generate crescent numbers", seqNr > lastNr);
@@ -57,8 +54,7 @@ public class TimeAndCounterIDGeneratorTest extends Assert
    }
 
    @Test
-   public void testCalculationRefresh()
-   {
+   public void testCalculationRefresh() {
       TimeAndCounterIDGenerator seq = new TimeAndCounterIDGenerator();
 
       long id1 = seq.generateID();
@@ -76,8 +72,7 @@ public class TimeAndCounterIDGeneratorTest extends Assert
    }
 
    @Test
-   public void testCalculationOnMultiThread() throws Throwable
-   {
+   public void testCalculationOnMultiThread() throws Throwable {
       final ConcurrentHashSet<Long> hashSet = new ConcurrentHashSet<Long>();
 
       final TimeAndCounterIDGenerator seq = new TimeAndCounterIDGenerator();
@@ -92,33 +87,29 @@ public class TimeAndCounterIDGeneratorTest extends Assert
 
       final CountDownLatch latchStart = new CountDownLatch(1);
 
-      class T1 extends Thread
-      {
+      class T1 extends Thread {
+
          Throwable e;
 
          @Override
-         public void run()
-         {
-            try
-            {
+         public void run() {
+            try {
                latchAlign.countDown();
                assertTrue("Latch has got to return within a minute", latchStart.await(1, TimeUnit.MINUTES));
 
                long lastValue = 0L;
-               for (int i = 0; i < NUMBER_OF_IDS; i++)
-               {
+               for (int i = 0; i < NUMBER_OF_IDS; i++) {
                   long value = seq.generateID();
                   Assert.assertTrue(TimeAndCounterIDGeneratorTest.hex(value) + " should be greater than " +
-                                    TimeAndCounterIDGeneratorTest.hex(lastValue) +
-                                    " on seq " +
-                                    seq.toString(), value > lastValue);
+                                       TimeAndCounterIDGeneratorTest.hex(lastValue) +
+                                       " on seq " +
+                                       seq.toString(), value > lastValue);
                   lastValue = value;
 
                   hashSet.add(value);
                }
             }
-            catch (Throwable e)
-            {
+            catch (Throwable e) {
                this.e = e;
             }
          }
@@ -127,8 +118,7 @@ public class TimeAndCounterIDGeneratorTest extends Assert
 
       T1[] arrays = new T1[NUMBER_OF_THREADS];
 
-      for (int i = 0; i < arrays.length; i++)
-      {
+      for (int i = 0; i < arrays.length; i++) {
          arrays[i] = new T1();
          arrays[i].start();
       }
@@ -137,11 +127,9 @@ public class TimeAndCounterIDGeneratorTest extends Assert
 
       latchStart.countDown();
 
-      for (T1 t : arrays)
-      {
+      for (T1 t : arrays) {
          t.join();
-         if (t.e != null)
-         {
+         if (t.e != null) {
             throw t.e;
          }
       }
@@ -153,8 +141,7 @@ public class TimeAndCounterIDGeneratorTest extends Assert
    }
 
    @Test
-   public void testWrapID() throws Throwable
-   {
+   public void testWrapID() throws Throwable {
       TimeAndCounterIDGenerator seq = new TimeAndCounterIDGenerator();
 
       System.out.println("Current Time = " + TimeAndCounterIDGeneratorTest.hex(System.currentTimeMillis()) + " " + seq);
@@ -163,14 +150,12 @@ public class TimeAndCounterIDGeneratorTest extends Assert
 
       seq.setInternalID(TimeAndCounterIDGenerator.ID_MASK); // 1 ID about to explode
 
-      try
-      {
+      try {
          // This is simulating a situation where we generated more than 268 million messages on the same time interval
          seq.generateID();
          Assert.fail("It was supposed to throw an exception, as the counter was set to explode on this test");
       }
-      catch (Exception e)
-      {
+      catch (Exception e) {
       }
 
       seq = new TimeAndCounterIDGenerator();
@@ -185,12 +170,10 @@ public class TimeAndCounterIDGeneratorTest extends Assert
       seq.generateID();
 
       Assert.assertTrue(TimeAndCounterIDGeneratorTest.hex(timeMark) + " < " +
-                                 TimeAndCounterIDGeneratorTest.hex(seq.getInternalTimeMark()),
-                        timeMark < seq.getInternalTimeMark());
+                           TimeAndCounterIDGeneratorTest.hex(seq.getInternalTimeMark()), timeMark < seq.getInternalTimeMark());
    }
 
-   private static String hex(final long value)
-   {
+   private static String hex(final long value) {
       return String.format("%1$X", value);
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java
index 955b498..56ec47f 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesConversionTest.java
@@ -24,8 +24,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class TypedPropertiesConversionTest
-{
+public class TypedPropertiesConversionTest {
 
    // Constants -----------------------------------------------------
 
@@ -44,15 +43,13 @@ public class TypedPropertiesConversionTest
    // Public --------------------------------------------------------
 
    @Before
-   public void setUp() throws Exception
-   {
+   public void setUp() throws Exception {
       key = RandomUtil.randomSimpleString();
       props = new TypedProperties();
    }
 
    @Test
-   public void testBooleanProperty() throws Exception
-   {
+   public void testBooleanProperty() throws Exception {
       Boolean val = RandomUtil.randomBoolean();
       props.putBooleanProperty(key, val);
 
@@ -62,51 +59,43 @@ public class TypedPropertiesConversionTest
       props.putSimpleStringProperty(key, new SimpleString(Boolean.toString(val)));
       Assert.assertEquals(val, props.getBooleanProperty(key));
 
-      try
-      {
+      try {
          props.putByteProperty(key, RandomUtil.randomByte());
          props.getBooleanProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
       Assert.assertFalse(props.getBooleanProperty(unknownKey));
    }
 
    @Test
-   public void testCharProperty() throws Exception
-   {
+   public void testCharProperty() throws Exception {
       Character val = RandomUtil.randomChar();
       props.putCharProperty(key, val);
 
       Assert.assertEquals(val, props.getCharProperty(key));
       Assert.assertEquals(new SimpleString(Character.toString(val)), props.getSimpleStringProperty(key));
 
-      try
-      {
+      try {
          props.putByteProperty(key, RandomUtil.randomByte());
          props.getCharProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
-      try
-      {
+      try {
          props.getCharProperty(unknownKey);
          Assert.fail();
       }
-      catch (NullPointerException e)
-      {
+      catch (NullPointerException e) {
       }
    }
 
    @Test
-   public void testByteProperty() throws Exception
-   {
+   public void testByteProperty() throws Exception {
       Byte val = RandomUtil.randomByte();
       props.putByteProperty(key, val);
 
@@ -116,29 +105,24 @@ public class TypedPropertiesConversionTest
       props.putSimpleStringProperty(key, new SimpleString(Byte.toString(val)));
       Assert.assertEquals(val, props.getByteProperty(key));
 
-      try
-      {
+      try {
          props.putBooleanProperty(key, RandomUtil.randomBoolean());
          props.getByteProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
-      try
-      {
+      try {
          props.getByteProperty(unknownKey);
          Assert.fail();
       }
-      catch (NumberFormatException e)
-      {
+      catch (NumberFormatException e) {
       }
    }
 
    @Test
-   public void testIntProperty() throws Exception
-   {
+   public void testIntProperty() throws Exception {
       Integer val = RandomUtil.randomInt();
       props.putIntProperty(key, val);
 
@@ -152,29 +136,24 @@ public class TypedPropertiesConversionTest
       props.putByteProperty(key, byteVal);
       Assert.assertEquals(Integer.valueOf(byteVal), props.getIntProperty(key));
 
-      try
-      {
+      try {
          props.putBooleanProperty(key, RandomUtil.randomBoolean());
          props.getIntProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
-      try
-      {
+      try {
          props.getIntProperty(unknownKey);
          Assert.fail();
       }
-      catch (NumberFormatException e)
-      {
+      catch (NumberFormatException e) {
       }
    }
 
    @Test
-   public void testLongProperty() throws Exception
-   {
+   public void testLongProperty() throws Exception {
       Long val = RandomUtil.randomLong();
       props.putLongProperty(key, val);
 
@@ -196,29 +175,24 @@ public class TypedPropertiesConversionTest
       props.putIntProperty(key, intVal);
       Assert.assertEquals(Long.valueOf(intVal), props.getLongProperty(key));
 
-      try
-      {
+      try {
          props.putBooleanProperty(key, RandomUtil.randomBoolean());
          props.getLongProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
-      try
-      {
+      try {
          props.getLongProperty(unknownKey);
          Assert.fail();
       }
-      catch (NumberFormatException e)
-      {
+      catch (NumberFormatException e) {
       }
    }
 
    @Test
-   public void testDoubleProperty() throws Exception
-   {
+   public void testDoubleProperty() throws Exception {
       Double val = RandomUtil.randomDouble();
       props.putDoubleProperty(key, val);
 
@@ -228,29 +202,24 @@ public class TypedPropertiesConversionTest
       props.putSimpleStringProperty(key, new SimpleString(Double.toString(val)));
       Assert.assertEquals(val, props.getDoubleProperty(key));
 
-      try
-      {
+      try {
          props.putBooleanProperty(key, RandomUtil.randomBoolean());
          props.getDoubleProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
-      try
-      {
+      try {
          props.getDoubleProperty(unknownKey);
          Assert.fail();
       }
-      catch (Exception e)
-      {
+      catch (Exception e) {
       }
    }
 
    @Test
-   public void testFloatProperty() throws Exception
-   {
+   public void testFloatProperty() throws Exception {
       Float val = RandomUtil.randomFloat();
       props.putFloatProperty(key, val);
 
@@ -261,29 +230,24 @@ public class TypedPropertiesConversionTest
       props.putSimpleStringProperty(key, new SimpleString(Float.toString(val)));
       Assert.assertEquals(val, props.getFloatProperty(key));
 
-      try
-      {
+      try {
          props.putBooleanProperty(key, RandomUtil.randomBoolean());
          props.getFloatProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
-      try
-      {
+      try {
          props.getFloatProperty(unknownKey);
          Assert.fail();
       }
-      catch (Exception e)
-      {
+      catch (Exception e) {
       }
    }
 
    @Test
-   public void testShortProperty() throws Exception
-   {
+   public void testShortProperty() throws Exception {
       Short val = RandomUtil.randomShort();
       props.putShortProperty(key, val);
 
@@ -298,50 +262,42 @@ public class TypedPropertiesConversionTest
       props.putByteProperty(key, byteVal);
       Assert.assertEquals(Short.valueOf(byteVal), props.getShortProperty(key));
 
-      try
-      {
+      try {
          props.putBooleanProperty(key, RandomUtil.randomBoolean());
          props.getShortProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
-      try
-      {
+      try {
          props.getShortProperty(unknownKey);
          Assert.fail();
       }
-      catch (NumberFormatException e)
-      {
+      catch (NumberFormatException e) {
       }
    }
 
    @Test
-   public void testSimpleStringProperty() throws Exception
-   {
+   public void testSimpleStringProperty() throws Exception {
       SimpleString strVal = RandomUtil.randomSimpleString();
       props.putSimpleStringProperty(key, strVal);
       Assert.assertEquals(strVal, props.getSimpleStringProperty(key));
    }
 
    @Test
-   public void testBytesProperty() throws Exception
-   {
+   public void testBytesProperty() throws Exception {
       byte[] val = RandomUtil.randomBytes();
       props.putBytesProperty(key, val);
 
       Assert.assertArrayEquals(val, props.getBytesProperty(key));
 
-      try
-      {
+      try {
          props.putBooleanProperty(key, RandomUtil.randomBoolean());
          props.getBytesProperty(key);
          Assert.fail();
       }
-      catch (ActiveMQPropertyConversionException e)
-      {
+      catch (ActiveMQPropertyConversionException e) {
       }
 
       Assert.assertNull(props.getBytesProperty(unknownKey));

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesTest.java
index 9f184fa..894399b 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TypedPropertiesTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.activemq.artemis.util;
+
 import java.util.Iterator;
 
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
@@ -26,29 +27,24 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-public class TypedPropertiesTest
-{
+public class TypedPropertiesTest {
 
-   private static void assertEqualsTypeProperties(final TypedProperties expected, final TypedProperties actual)
-   {
+   private static void assertEqualsTypeProperties(final TypedProperties expected, final TypedProperties actual) {
       Assert.assertNotNull(expected);
       Assert.assertNotNull(actual);
       Assert.assertEquals(expected.getEncodeSize(), actual.getEncodeSize());
       Assert.assertEquals(expected.getPropertyNames(), actual.getPropertyNames());
       Iterator<SimpleString> iterator = actual.getPropertyNames().iterator();
-      while (iterator.hasNext())
-      {
+      while (iterator.hasNext()) {
          SimpleString key = iterator.next();
          Object expectedValue = expected.getProperty(key);
          Object actualValue = actual.getProperty(key);
-         if (expectedValue instanceof byte[] && actualValue instanceof byte[])
-         {
-            byte[] expectedBytes = (byte[])expectedValue;
-            byte[] actualBytes = (byte[])actualValue;
+         if (expectedValue instanceof byte[] && actualValue instanceof byte[]) {
+            byte[] expectedBytes = (byte[]) expectedValue;
+            byte[] actualBytes = (byte[]) actualValue;
             Assert.assertArrayEquals(expectedBytes, actualBytes);
          }
-         else
-         {
+         else {
             Assert.assertEquals(expectedValue, actualValue);
          }
       }
@@ -63,8 +59,7 @@ public class TypedPropertiesTest
    private SimpleString key;
 
    @Test
-   public void testCopyContructor() throws Exception
-   {
+   public void testCopyContructor() throws Exception {
       props.putSimpleStringProperty(key, RandomUtil.randomSimpleString());
 
       TypedProperties copy = new TypedProperties(props);
@@ -77,8 +72,7 @@ public class TypedPropertiesTest
    }
 
    @Test
-   public void testRemove() throws Exception
-   {
+   public void testRemove() throws Exception {
       props.putSimpleStringProperty(key, RandomUtil.randomSimpleString());
 
       Assert.assertTrue(props.containsProperty(key));
@@ -91,8 +85,7 @@ public class TypedPropertiesTest
    }
 
    @Test
-   public void testClear() throws Exception
-   {
+   public void testClear() throws Exception {
       props.putSimpleStringProperty(key, RandomUtil.randomSimpleString());
 
       Assert.assertTrue(props.containsProperty(key));
@@ -105,52 +98,46 @@ public class TypedPropertiesTest
    }
 
    @Test
-   public void testKey() throws Exception
-   {
+   public void testKey() throws Exception {
       props.putBooleanProperty(key, true);
-      boolean bool = (Boolean)props.getProperty(key);
+      boolean bool = (Boolean) props.getProperty(key);
       Assert.assertEquals(true, bool);
 
       props.putCharProperty(key, 'a');
-      char c = (Character)props.getProperty(key);
+      char c = (Character) props.getProperty(key);
       Assert.assertEquals('a', c);
    }
 
    @Test
-   public void testGetPropertyOnEmptyProperties() throws Exception
-   {
+   public void testGetPropertyOnEmptyProperties() throws Exception {
       Assert.assertFalse(props.containsProperty(key));
       Assert.assertNull(props.getProperty(key));
    }
 
    @Test
-   public void testRemovePropertyOnEmptyProperties() throws Exception
-   {
+   public void testRemovePropertyOnEmptyProperties() throws Exception {
       Assert.assertFalse(props.containsProperty(key));
       Assert.assertNull(props.removeProperty(key));
    }
 
    @Test
-   public void testNullProperty() throws Exception
-   {
+   public void testNullProperty() throws Exception {
       props.putSimpleStringProperty(key, null);
       Assert.assertTrue(props.containsProperty(key));
       Assert.assertNull(props.getProperty(key));
    }
 
    @Test
-   public void testBytesPropertyWithNull() throws Exception
-   {
+   public void testBytesPropertyWithNull() throws Exception {
       props.putBytesProperty(key, null);
 
       Assert.assertTrue(props.containsProperty(key));
-      byte[] bb = (byte[])props.getProperty(key);
+      byte[] bb = (byte[]) props.getProperty(key);
       Assert.assertNull(bb);
    }
 
    @Test
-   public void testTypedProperties() throws Exception
-   {
+   public void testTypedProperties() throws Exception {
       SimpleString longKey = RandomUtil.randomSimpleString();
       long longValue = RandomUtil.randomLong();
       SimpleString simpleStringKey = RandomUtil.randomSimpleString();
@@ -168,8 +155,7 @@ public class TypedPropertiesTest
    }
 
    @Test
-   public void testEmptyTypedProperties() throws Exception
-   {
+   public void testEmptyTypedProperties() throws Exception {
       Assert.assertEquals(0, props.getPropertyNames().size());
 
       props.putTypedProperties(new TypedProperties());
@@ -178,8 +164,7 @@ public class TypedPropertiesTest
    }
 
    @Test
-   public void testNullTypedProperties() throws Exception
-   {
+   public void testNullTypedProperties() throws Exception {
       Assert.assertEquals(0, props.getPropertyNames().size());
 
       props.putTypedProperties(null);
@@ -188,8 +173,7 @@ public class TypedPropertiesTest
    }
 
    @Test
-   public void testEncodeDecode() throws Exception
-   {
+   public void testEncodeDecode() throws Exception {
       props.putByteProperty(RandomUtil.randomSimpleString(), RandomUtil.randomByte());
       props.putBytesProperty(RandomUtil.randomSimpleString(), RandomUtil.randomBytes());
       props.putBytesProperty(RandomUtil.randomSimpleString(), null);
@@ -225,8 +209,7 @@ public class TypedPropertiesTest
    }
 
    @Test
-   public void testEncodeDecodeEmpty() throws Exception
-   {
+   public void testEncodeDecodeEmpty() throws Exception {
       TypedProperties emptyProps = new TypedProperties();
 
       ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(1024);
@@ -241,8 +224,7 @@ public class TypedPropertiesTest
    }
 
    @Before
-   public void setUp() throws Exception
-   {
+   public void setUp() throws Exception {
       props = new TypedProperties();
       key = RandomUtil.randomSimpleString();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
index 9985374..f2feeac 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
@@ -26,15 +26,13 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-public class XMLUtilTest extends SilentTestCase
-{
+public class XMLUtilTest extends SilentTestCase {
    // Constructors --------------------------------------------------
 
    // Public --------------------------------------------------------
 
    @Test
-   public void testGetTextContext_1() throws Exception
-   {
+   public void testGetTextContext_1() throws Exception {
       String document = "<blah>foo</blah>";
 
       Element e = XMLUtil.stringToElement(document);
@@ -43,8 +41,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testGetTextContext_2() throws Exception
-   {
+   public void testGetTextContext_2() throws Exception {
       String document = "<blah someattribute=\"somevalue\">foo</blah>";
 
       Element e = XMLUtil.stringToElement(document);
@@ -53,8 +50,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testGetTextContext_3() throws Exception
-   {
+   public void testGetTextContext_3() throws Exception {
       String document = "<blah someattribute=\"somevalue\"><a/></blah>";
 
       Element e = XMLUtil.stringToElement(document);
@@ -67,8 +63,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testGetTextContext_4() throws Exception
-   {
+   public void testGetTextContext_4() throws Exception {
       String document = "<blah someattribute=\"somevalue\"><a></a></blah>";
 
       Element e = XMLUtil.stringToElement(document);
@@ -81,8 +76,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testGetTextContext_5() throws Exception
-   {
+   public void testGetTextContext_5() throws Exception {
       String document = "<blah someattribute=\"somevalue\"><a><b/></a></blah>";
 
       Element e = XMLUtil.stringToElement(document);
@@ -96,11 +90,9 @@ public class XMLUtilTest extends SilentTestCase
 
       // try to find <b>
       boolean found = false;
-      for (int i = 0; i < nl.getLength(); i++)
-      {
+      for (int i = 0; i < nl.getLength(); i++) {
          Node n = nl.item(i);
-         if ("b".equals(n.getNodeName()))
-         {
+         if ("b".equals(n.getNodeName())) {
             found = true;
          }
       }
@@ -108,8 +100,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testEquivalent_1() throws Exception
-   {
+   public void testEquivalent_1() throws Exception {
       String s = "<a/>";
       String s2 = "<a/>";
 
@@ -117,8 +108,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testEquivalent_2() throws Exception
-   {
+   public void testEquivalent_2() throws Exception {
       String s = "<a></a>";
       String s2 = "<a/>";
 
@@ -126,85 +116,68 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testEquivalent_3() throws Exception
-   {
+   public void testEquivalent_3() throws Exception {
       String s = "<a attr1=\"val1\" attr2=\"val2\"/>";
       String s2 = "<a attr2=\"val2\"/>";
 
-      try
-      {
-         XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
-                 XMLUtil.stringToElement(s2));
+      try {
+         XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2));
          Assert.fail("this should throw exception");
       }
-      catch (IllegalArgumentException e)
-      {
+      catch (IllegalArgumentException e) {
          // expected
       }
    }
 
    @Test
-   public void testEquivalent_4() throws Exception
-   {
+   public void testEquivalent_4() throws Exception {
       String s = "<a attr1=\"val1\" attr2=\"val2\"/>";
       String s2 = "<a attr2=\"val2\" attr1=\"val1\"/>";
 
-      XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
-              XMLUtil.stringToElement(s2));
+      XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2));
    }
 
    @Test
-   public void testEquivalent_5() throws Exception
-   {
+   public void testEquivalent_5() throws Exception {
       String s = "<a><b/></a>";
       String s2 = "<a><b/></a>";
 
-      XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
-              XMLUtil.stringToElement(s2));
+      XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2));
    }
 
    @Test
-   public void testEquivalent_6() throws Exception
-   {
+   public void testEquivalent_6() throws Exception {
       String s = "<enclosing><a attr1=\"val1\" attr2=\"val2\"/></enclosing>";
       String s2 = "<enclosing><a attr2=\"val2\" attr1=\"val1\"/></enclosing>";
 
-      XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
-              XMLUtil.stringToElement(s2));
+      XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2));
    }
 
    @Test
-   public void testEquivalent_7() throws Exception
-   {
+   public void testEquivalent_7() throws Exception {
       String s = "<a><b/><c/></a>";
       String s2 = "<a><c/><b/></a>";
 
-      try
-      {
-         XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
-                 XMLUtil.stringToElement(s2));
+      try {
+         XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2));
          Assert.fail("this should throw exception");
       }
-      catch (IllegalArgumentException e)
-      {
+      catch (IllegalArgumentException e) {
          // OK
          e.printStackTrace();
       }
    }
 
    @Test
-   public void testEquivalent_8() throws Exception
-   {
+   public void testEquivalent_8() throws Exception {
       String s = "<a><!-- some comment --><b/><!--some other comment --><c/><!-- blah --></a>";
       String s2 = "<a><b/><!--blah blah--><c/></a>";
 
-      XMLUtil.assertEquivalent(XMLUtil.stringToElement(s),
-              XMLUtil.stringToElement(s2));
+      XMLUtil.assertEquivalent(XMLUtil.stringToElement(s), XMLUtil.stringToElement(s2));
    }
 
    @Test
-   public void testElementToString_1() throws Exception
-   {
+   public void testElementToString_1() throws Exception {
       String s = "<a b=\"something\">somethingelse</a>";
       Element e = XMLUtil.stringToElement(s);
       String tostring = XMLUtil.elementToString(e);
@@ -213,8 +186,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testElementToString_2() throws Exception
-   {
+   public void testElementToString_2() throws Exception {
       String s = "<a b=\"something\"></a>";
       Element e = XMLUtil.stringToElement(s);
       String tostring = XMLUtil.elementToString(e);
@@ -223,8 +195,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testElementToString_3() throws Exception
-   {
+   public void testElementToString_3() throws Exception {
       String s = "<a b=\"something\"/>";
       Element e = XMLUtil.stringToElement(s);
       String tostring = XMLUtil.elementToString(e);
@@ -233,8 +204,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testElementToString_4() throws Exception
-   {
+   public void testElementToString_4() throws Exception {
       String s = "<a><![CDATA[somedata]]></a>";
       Element e = XMLUtil.stringToElement(s);
       String tostring = XMLUtil.elementToString(e);
@@ -243,22 +213,9 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testReplaceSystemProperties()
-   {
-      String before = "<configuration>\n" + "   <test name=\"${sysprop1}\">content1</test>\n"
-                      + "   <test name=\"test2\">content2</test>\n"
-                      + "   <test name=\"test3\">content3</test>\n"
-                      + "   <test name=\"test4\">${sysprop2}</test>\n"
-                      + "   <test name=\"test5\">content5</test>\n"
-                      + "   <test name=\"test6\">content6</test>\n"
-                      + "</configuration>";
-      String after = "<configuration>\n" + "   <test name=\"test1\">content1</test>\n"
-                     + "   <test name=\"test2\">content2</test>\n"
-                     + "   <test name=\"test3\">content3</test>\n"
-                     + "   <test name=\"test4\">content4</test>\n"
-                     + "   <test name=\"test5\">content5</test>\n"
-                     + "   <test name=\"test6\">content6</test>\n"
-                     + "</configuration>";
+   public void testReplaceSystemProperties() {
+      String before = "<configuration>\n" + "   <test name=\"${sysprop1}\">content1</test>\n" + "   <test name=\"test2\">content2</test>\n" + "   <test name=\"test3\">content3</test>\n" + "   <test name=\"test4\">${sysprop2}</test>\n" + "   <test name=\"test5\">content5</test>\n" + "   <test name=\"test6\">content6</test>\n" + "</configuration>";
+      String after = "<configuration>\n" + "   <test name=\"test1\">content1</test>\n" + "   <test name=\"test2\">content2</test>\n" + "   <test name=\"test3\">content3</test>\n" + "   <test name=\"test4\">content4</test>\n" + "   <test name=\"test5\">content5</test>\n" + "   <test name=\"test6\">content6</test>\n" + "</configuration>";
       System.setProperty("sysprop1", "test1");
       System.setProperty("sysprop2", "content4");
       String replaced = XMLUtil.replaceSystemProps(before);
@@ -266,8 +223,7 @@ public class XMLUtilTest extends SilentTestCase
    }
 
    @Test
-   public void testStripCDATA() throws Exception
-   {
+   public void testStripCDATA() throws Exception {
       String xml = "<![CDATA[somedata]]>";
       String stripped = XMLUtil.stripCDATA(xml);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/AppDTO.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/AppDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/AppDTO.java
index 4e9541a..5609509 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/AppDTO.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/AppDTO.java
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.artemis.dto;
 
-
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
@@ -24,8 +23,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "app")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class AppDTO
-{
+public class AppDTO {
+
    @XmlAttribute
    public String url;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BasicSecurityDTO.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BasicSecurityDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BasicSecurityDTO.java
index 2e9d391..cc1ede1 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BasicSecurityDTO.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BasicSecurityDTO.java
@@ -23,8 +23,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "basic-security")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class BasicSecurityDTO extends SecurityDTO
-{
+public class BasicSecurityDTO extends SecurityDTO {
+
    @XmlAttribute(required = true)
    public String users;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BrokerDTO.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BrokerDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BrokerDTO.java
index a912f52..0b0bb30 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BrokerDTO.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/BrokerDTO.java
@@ -25,8 +25,8 @@ import java.util.List;
 
 @XmlRootElement(name = "broker")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class BrokerDTO
-{
+public class BrokerDTO {
+
    @XmlElementRef
    public SecurityDTO security;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ComponentDTO.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ComponentDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ComponentDTO.java
index d12fae5..dee281d 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ComponentDTO.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ComponentDTO.java
@@ -23,8 +23,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement(name = "component")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ComponentDTO
-{
+public class ComponentDTO {
+
    @XmlAttribute
    public String componentClassName;
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/SecurityDTO.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/SecurityDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/SecurityDTO.java
index 80e58d4..23d2680 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/SecurityDTO.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/SecurityDTO.java
@@ -22,6 +22,6 @@ import javax.xml.bind.annotation.XmlType;
 
 @XmlType(name = "security")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SecurityDTO
-{
+public class SecurityDTO {
+
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ServerDTO.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ServerDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ServerDTO.java
index 6110bcd..d09bef1 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ServerDTO.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/ServerDTO.java
@@ -25,47 +25,36 @@ import java.net.URI;
 
 @XmlRootElement(name = "server")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ServerDTO
-{
+public class ServerDTO {
 
    @XmlAttribute
    public String configuration;
 
-
    private File configurationFile;
 
    private URI configurationURI;
 
-
-   public URI getConfigurationURI() throws Exception
-   {
-      if (configurationURI == null)
-      {
+   public URI getConfigurationURI() throws Exception {
+      if (configurationURI == null) {
          configurationURI = new URI(fixupFileURI(configuration));
       }
 
       return configurationURI;
    }
 
-   public File getConfigurationFile() throws Exception
-   {
-      if (configurationFile == null)
-      {
+   public File getConfigurationFile() throws Exception {
+      if (configurationFile == null) {
          configurationFile = new File(new URI(fixupFileURI(configuration)).getSchemeSpecificPart());
       }
       return configurationFile;
    }
 
-   private static String fixupFileURI(String value)
-   {
-      if (value != null && value.startsWith("file:"))
-      {
+   private static String fixupFileURI(String value) {
+      if (value != null && value.startsWith("file:")) {
          value = value.substring("file:".length());
          value = new File(value).toURI().toString();
       }
       return value;
    }
 
-
-
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java
index cf2e9a9..036e7ec 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/WebServerDTO.java
@@ -25,8 +25,8 @@ import java.util.List;
 
 @XmlRootElement(name = "web")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class WebServerDTO extends ComponentDTO
-{
+public class WebServerDTO extends ComponentDTO {
+
    @XmlAttribute
    public String bind;
 
@@ -36,8 +36,7 @@ public class WebServerDTO extends ComponentDTO
    @XmlElementRef
    public List<AppDTO> apps;
 
-   public WebServerDTO()
-   {
+   public WebServerDTO() {
       componentClassName = "org.apache.activemq.artemis.component.WebServerComponent";
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java
index ffc6492..c49dbe5 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/XmlUtil.java
@@ -32,48 +32,39 @@ import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class XmlUtil
-{
+public class XmlUtil {
 
    /**
     * Changes ${property} with values from a properties object
     */
-   static class PropertiesFilter extends StreamReaderDelegate
-   {
+   static class PropertiesFilter extends StreamReaderDelegate {
 
       static final Pattern pattern = Pattern.compile("\\$\\{([^\\}]+)\\}");
       private final Properties props;
 
-      public PropertiesFilter(XMLStreamReader parent, Properties props)
-      {
+      public PropertiesFilter(XMLStreamReader parent, Properties props) {
          super(parent);
          this.props = props;
       }
 
       @Override
-      public String getAttributeValue(int index)
-      {
+      public String getAttributeValue(int index) {
          return filter(super.getAttributeValue(index));
       }
 
-      public String filter(String str)
-      {
+      public String filter(String str) {
          int start = 0;
-         while (true)
-         {
+         while (true) {
             Matcher matcher = pattern.matcher(str);
-            if (!matcher.find(start))
-            {
+            if (!matcher.find(start)) {
                break;
             }
             String group = matcher.group(1);
             String property = props.getProperty(group);
-            if (property != null)
-            {
+            if (property != null) {
                str = matcher.replaceFirst(Matcher.quoteReplacement(property));
             }
-            else
-            {
+            else {
                start = matcher.end();
             }
          }
@@ -84,8 +75,7 @@ public class XmlUtil
 
    private static final XMLInputFactory factory = XMLInputFactory.newInstance();
 
-   public static <T> T decode(Class<T> clazz, File configuration) throws Exception
-   {
+   public static <T> T decode(Class<T> clazz, File configuration) throws Exception {
       JAXBContext jaxbContext = JAXBContext.newInstance("org.apache.activemq.artemis.dto");
 
       Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
@@ -100,8 +90,7 @@ public class XmlUtil
       //TODO - support properties files
       Properties props = System.getProperties();
 
-      if (props != null)
-      {
+      if (props != null) {
          reader = new PropertiesFilter(reader, props);
       }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
----------------------------------------------------------------------
diff --git a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
index 8f98eec..d9f22f5 100644
--- a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
+++ b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
@@ -18,6 +18,5 @@
  * The JAXB POJOs for the XML configuration of ActiveMQ Artemis broker
  */
 @javax.xml.bind.annotation.XmlSchema(
-        namespace = "http://activemq.org/schema",
-        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.apache.activemq.artemis.dto;
+   namespace = "http://activemq.org/schema",
+   elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.activemq.artemis.dto;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
index d1f932d..1cf038c 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
@@ -34,15 +34,14 @@ import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
 /**
  * A utility class for creating ActiveMQ Artemis client-side JMS managed resources.
  */
-public class ActiveMQJMSClient
-{
+public class ActiveMQJMSClient {
+
    /**
     * Creates an ActiveMQConnectionFactory;
     *
     * @return the ActiveMQConnectionFactory
     */
-   public static ActiveMQConnectionFactory createConnectionFactory(final String url, String name) throws Exception
-   {
+   public static ActiveMQConnectionFactory createConnectionFactory(final String url, String name) throws Exception {
       ConnectionFactoryParser parser = new ConnectionFactoryParser();
       return parser.newObject(parser.expandURI(url), name);
    }
@@ -58,35 +57,30 @@ public class ActiveMQJMSClient
     * updated whenever the cluster topology changes. If the topology includes backup servers that
     * information is also propagated to the client so that it can know which server to failover onto
     * in case of live server failure.
+    *
     * @param groupConfiguration
     * @param jmsFactoryType
     * @return the ActiveMQConnectionFactory
     */
-   public static ActiveMQConnectionFactory createConnectionFactoryWithHA(final DiscoveryGroupConfiguration groupConfiguration, JMSFactoryType jmsFactoryType)
-   {
+   public static ActiveMQConnectionFactory createConnectionFactoryWithHA(final DiscoveryGroupConfiguration groupConfiguration,
+                                                                         JMSFactoryType jmsFactoryType) {
       ActiveMQConnectionFactory factory = null;
-      if (jmsFactoryType.equals(JMSFactoryType.CF))
-      {
+      if (jmsFactoryType.equals(JMSFactoryType.CF)) {
          factory = new ActiveMQJMSConnectionFactory(true, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_CF)) {
          factory = new ActiveMQQueueConnectionFactory(true, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_CF)) {
          factory = new ActiveMQTopicConnectionFactory(true, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.XA_CF)) {
          factory = new ActiveMQXAConnectionFactory(true, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_XA_CF)) {
          factory = new ActiveMQXAQueueConnectionFactory(true, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF)) {
          factory = new ActiveMQXATopicConnectionFactory(true, groupConfiguration);
       }
 
@@ -102,31 +96,25 @@ public class ActiveMQJMSClient
     * @param jmsFactoryType
     * @return the ActiveMQConnectionFactory
     */
-   public static ActiveMQConnectionFactory createConnectionFactoryWithoutHA(final DiscoveryGroupConfiguration groupConfiguration, JMSFactoryType jmsFactoryType)
-   {
+   public static ActiveMQConnectionFactory createConnectionFactoryWithoutHA(final DiscoveryGroupConfiguration groupConfiguration,
+                                                                            JMSFactoryType jmsFactoryType) {
       ActiveMQConnectionFactory factory = null;
-      if (jmsFactoryType.equals(JMSFactoryType.CF))
-      {
+      if (jmsFactoryType.equals(JMSFactoryType.CF)) {
          factory = new ActiveMQJMSConnectionFactory(false, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_CF)) {
          factory = new ActiveMQQueueConnectionFactory(false, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_CF)) {
          factory = new ActiveMQTopicConnectionFactory(false, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.XA_CF)) {
          factory = new ActiveMQXAConnectionFactory(false, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_XA_CF)) {
          factory = new ActiveMQXAQueueConnectionFactory(false, groupConfiguration);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF)) {
          factory = new ActiveMQXATopicConnectionFactory(false, groupConfiguration);
       }
 
@@ -142,37 +130,32 @@ public class ActiveMQJMSClient
     * downloaded and automatically updated whenever the cluster topology changes. If the topology
     * includes backup servers that information is also propagated to the client so that it can know
     * which server to failover onto in case of live server failure.
+    *
     * @param jmsFactoryType
     * @param initialServers The initial set of servers used to make a connection to the cluster.
-    *           Each one is tried in turn until a successful connection is made. Once a connection
-    *           is made, the cluster topology is downloaded and the rest of the list is ignored.
+    *                       Each one is tried in turn until a successful connection is made. Once a connection
+    *                       is made, the cluster topology is downloaded and the rest of the list is ignored.
     * @return the ActiveMQConnectionFactory
     */
-   public static ActiveMQConnectionFactory createConnectionFactoryWithHA(JMSFactoryType jmsFactoryType, final TransportConfiguration... initialServers)
-   {
+   public static ActiveMQConnectionFactory createConnectionFactoryWithHA(JMSFactoryType jmsFactoryType,
+                                                                         final TransportConfiguration... initialServers) {
       ActiveMQConnectionFactory factory = null;
-      if (jmsFactoryType.equals(JMSFactoryType.CF))
-      {
+      if (jmsFactoryType.equals(JMSFactoryType.CF)) {
          factory = new ActiveMQJMSConnectionFactory(true, initialServers);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_CF)) {
          factory = new ActiveMQQueueConnectionFactory(true, initialServers);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_CF)) {
          factory = new ActiveMQTopicConnectionFactory(true, initialServers);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.XA_CF)) {
          factory = new ActiveMQXAConnectionFactory(true, initialServers);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_XA_CF)) {
          factory = new ActiveMQXAQueueConnectionFactory(true, initialServers);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF)) {
          factory = new ActiveMQXATopicConnectionFactory(true, initialServers);
       }
 
@@ -185,35 +168,30 @@ public class ActiveMQJMSClient
     * <p>
     * The ActiveMQConnectionFactory is not updated automatically as the cluster topology changes, and
     * no HA backup information is propagated to the client
+    *
     * @param jmsFactoryType
     * @param transportConfigurations
     * @return the ActiveMQConnectionFactory
     */
-   public static ActiveMQConnectionFactory createConnectionFactoryWithoutHA(JMSFactoryType jmsFactoryType, final TransportConfiguration... transportConfigurations)
-   {
+   public static ActiveMQConnectionFactory createConnectionFactoryWithoutHA(JMSFactoryType jmsFactoryType,
+                                                                            final TransportConfiguration... transportConfigurations) {
       ActiveMQConnectionFactory factory = null;
-      if (jmsFactoryType.equals(JMSFactoryType.CF))
-      {
+      if (jmsFactoryType.equals(JMSFactoryType.CF)) {
          factory = new ActiveMQJMSConnectionFactory(false, transportConfigurations);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_CF)) {
          factory = new ActiveMQQueueConnectionFactory(false, transportConfigurations);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_CF)) {
          factory = new ActiveMQTopicConnectionFactory(false, transportConfigurations);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.XA_CF)) {
          factory = new ActiveMQXAConnectionFactory(false, transportConfigurations);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.QUEUE_XA_CF)) {
          factory = new ActiveMQXAQueueConnectionFactory(false, transportConfigurations);
       }
-      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF))
-      {
+      else if (jmsFactoryType.equals(JMSFactoryType.TOPIC_XA_CF)) {
          factory = new ActiveMQXATopicConnectionFactory(false, transportConfigurations);
       }
 
@@ -226,8 +204,7 @@ public class ActiveMQJMSClient
     * @param name the name of the topic
     * @return The Topic
     */
-   public static Topic createTopic(final String name)
-   {
+   public static Topic createTopic(final String name) {
       return ActiveMQDestination.createTopic(name);
    }
 
@@ -237,13 +214,11 @@ public class ActiveMQJMSClient
     * @param name the name of the queue
     * @return The Queue
     */
-   public static Queue createQueue(final String name)
-   {
+   public static Queue createQueue(final String name) {
       return ActiveMQDestination.createQueue(name);
    }
 
-   private ActiveMQJMSClient()
-   {
+   private ActiveMQJMSClient() {
       // Utility class
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
index f15bc95..966a5c4 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
@@ -19,8 +19,8 @@ package org.apache.activemq.artemis.api.jms;
 /**
  * Constants for ActiveMQ Artemis for property keys used for ActiveMQ Artemis specific extensions to JMS.
  */
-public class ActiveMQJMSConstants
-{
+public class ActiveMQJMSConstants {
+
    public static final String JMS_ACTIVEMQ_INPUT_STREAM = "JMS_AMQ_InputStream";
 
    public static final String JMS_ACTIVEMQ_OUTPUT_STREAM = "JMS_AMQ_OutputStream";
@@ -33,6 +33,5 @@ public class ActiveMQJMSConstants
 
    public static final int INDIVIDUAL_ACKNOWLEDGE = 101;
 
-   public static final String JMS_ACTIVEMQ_ENABLE_BYTE_ARRAY_JMS_CORRELATION_ID_PROPERTY_NAME =
-      "amq.jms.support-bytes-id";
+   public static final String JMS_ACTIVEMQ_ENABLE_BYTE_ARRAY_JMS_CORRELATION_ID_PROPERTY_NAME = "amq.jms.support-bytes-id";
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java
index 43aea2b..67d3f57 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/JMSFactoryType.java
@@ -17,15 +17,12 @@
 package org.apache.activemq.artemis.api.jms;
 
 // XXX no javadocs
-public enum JMSFactoryType
-{
+public enum JMSFactoryType {
    CF, QUEUE_CF, TOPIC_CF, XA_CF, QUEUE_XA_CF, TOPIC_XA_CF;
 
-   public int intValue()
-   {
+   public int intValue() {
       int val = 0;
-      switch (this)
-      {
+      switch (this) {
          case CF:
             val = 0;
             break;
@@ -48,11 +45,9 @@ public enum JMSFactoryType
       return val;
    }
 
-   public static JMSFactoryType valueOf(int val)
-   {
+   public static JMSFactoryType valueOf(int val) {
       JMSFactoryType type;
-      switch (val)
-      {
+      switch (val) {
          case 0:
             type = CF;
             break;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
index f222c29..52722f3 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
@@ -29,8 +29,8 @@ import org.apache.activemq.artemis.api.core.management.Parameter;
  * @see org.apache.activemq.artemis.api.core.client.ServerLocator
  * @see org.apache.activemq.artemis.api.core.client.ClientSessionFactory
  */
-public interface ConnectionFactoryControl
-{
+public interface ConnectionFactoryControl {
+
    /**
     * Returns the configuration name of this connection factory.
     */
@@ -198,7 +198,6 @@ public interface ConnectionFactoryControl
     */
    void setPreAcknowledge(boolean preAcknowledge);
 
-
    /**
     * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getConnectionTTL()
     */
@@ -281,7 +280,6 @@ public interface ConnectionFactoryControl
     */
    void setFailoverOnInitialConnection(boolean failoverOnInitialConnection);
 
-
    /**
     * @see org.apache.activemq.artemis.api.core.client.ServerLocator#getProducerWindowSize()
     */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
index 94b329e..678fb21 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
@@ -24,8 +24,7 @@ import org.apache.activemq.artemis.api.core.management.Parameter;
 /**
  * A DestinationControl is used to manage a JMS Destination.
  */
-public interface DestinationControl
-{
+public interface DestinationControl {
    // Attributes ----------------------------------------------------
 
    /**

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java
index 4d35f65..e184c01 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConnectionInfo.java
@@ -19,8 +19,7 @@ package org.apache.activemq.artemis.api.jms.management;
 import org.apache.activemq.artemis.utils.json.JSONArray;
 import org.apache.activemq.artemis.utils.json.JSONObject;
 
-public class JMSConnectionInfo
-{
+public class JMSConnectionInfo {
 
    private final String connectionID;
 
@@ -32,24 +31,17 @@ public class JMSConnectionInfo
 
    private final String username;
 
-
    // Static --------------------------------------------------------
 
-   public static JMSConnectionInfo[] from(final String jsonString) throws Exception
-   {
+   public static JMSConnectionInfo[] from(final String jsonString) throws Exception {
       JSONArray array = new JSONArray(jsonString);
       JMSConnectionInfo[] infos = new JMSConnectionInfo[array.length()];
-      for (int i = 0; i < array.length(); i++)
-      {
+      for (int i = 0; i < array.length(); i++) {
          JSONObject obj = array.getJSONObject(i);
          String cid = obj.isNull("clientID") ? null : obj.getString("clientID");
          String uname = obj.isNull("principal") ? null : obj.getString("principal");
 
-         JMSConnectionInfo info = new JMSConnectionInfo(obj.getString("connectionID"),
-                                                        obj.getString("clientAddress"),
-                                                        obj.getLong("creationTime"),
-                                                        cid,
-                                                        uname);
+         JMSConnectionInfo info = new JMSConnectionInfo(obj.getString("connectionID"), obj.getString("clientAddress"), obj.getLong("creationTime"), cid, uname);
          infos[i] = info;
       }
       return infos;
@@ -61,8 +53,7 @@ public class JMSConnectionInfo
                              final String clientAddress,
                              final long creationTime,
                              final String clientID,
-                             final String username)
-   {
+                             final String username) {
       this.connectionID = connectionID;
       this.clientAddress = clientAddress;
       this.creationTime = creationTime;
@@ -72,28 +63,23 @@ public class JMSConnectionInfo
 
    // Public --------------------------------------------------------
 
-   public String getConnectionID()
-   {
+   public String getConnectionID() {
       return connectionID;
    }
 
-   public String getClientAddress()
-   {
+   public String getClientAddress() {
       return clientAddress;
    }
 
-   public long getCreationTime()
-   {
+   public long getCreationTime() {
       return creationTime;
    }
 
-   public String getClientID()
-   {
+   public String getClientID() {
       return clientID;
    }
 
-   public String getUsername()
-   {
+   public String getUsername() {
       return username;
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java
index c92ea82..7f4be56 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSConsumerInfo.java
@@ -23,8 +23,8 @@ import org.apache.activemq.artemis.utils.json.JSONObject;
  * Helper class to create Java Objects from the
  * JSON serialization returned by {@link JMSServerControl#listConsumersAsJSON(String)} and related methods.
  */
-public class JMSConsumerInfo
-{
+public class JMSConsumerInfo {
+
    private final String consumerID;
 
    private final String connectionID;
@@ -47,21 +47,12 @@ public class JMSConsumerInfo
     * Returns an array of SubscriptionInfo corresponding to the JSON serialization returned
     * by {@link TopicControl#listAllSubscriptionsAsJSON()} and related methods.
     */
-   public static JMSConsumerInfo[] from(final String jsonString) throws Exception
-   {
+   public static JMSConsumerInfo[] from(final String jsonString) throws Exception {
       JSONArray array = new JSONArray(jsonString);
       JMSConsumerInfo[] infos = new JMSConsumerInfo[array.length()];
-      for (int i = 0; i < array.length(); i++)
-      {
+      for (int i = 0; i < array.length(); i++) {
          JSONObject sub = array.getJSONObject(i);
-         JMSConsumerInfo info = new JMSConsumerInfo(sub.getString("consumerID"),
-                                                    sub.getString("connectionID"),
-                                                    sub.getString("destinationName"),
-                                                    sub.getString("destinationType"),
-                                                    sub.getBoolean("browseOnly"),
-                                                    sub.getLong("creationTime"),
-                                                    sub.getBoolean("durable"),
-                                                    sub.optString("filter", null));
+         JMSConsumerInfo info = new JMSConsumerInfo(sub.getString("consumerID"), sub.getString("connectionID"), sub.getString("destinationName"), sub.getString("destinationType"), sub.getBoolean("browseOnly"), sub.getLong("creationTime"), sub.getBoolean("durable"), sub.optString("filter", null));
          infos[i] = info;
       }
 
@@ -72,13 +63,12 @@ public class JMSConsumerInfo
 
    private JMSConsumerInfo(final String consumerID,
                            final String connectionID,
-                            final String destinationName,
-                            final String destinationType,
-                            final boolean browseOnly,
-                            final long creationTime,
-                            final boolean durable,
-                            final String filter)
-   {
+                           final String destinationName,
+                           final String destinationType,
+                           final boolean browseOnly,
+                           final long creationTime,
+                           final boolean durable,
+                           final String filter) {
       this.consumerID = consumerID;
       this.connectionID = connectionID;
       this.destinationName = destinationName;
@@ -91,46 +81,38 @@ public class JMSConsumerInfo
 
    // Public --------------------------------------------------------
 
-   public String getConsumerID()
-   {
+   public String getConsumerID() {
       return consumerID;
    }
 
-   public String getConnectionID()
-   {
+   public String getConnectionID() {
       return connectionID;
    }
 
-   public String getDestinationName()
-   {
+   public String getDestinationName() {
       return destinationName;
    }
 
-   public String getDestinationType()
-   {
+   public String getDestinationType() {
       return destinationType;
    }
 
-   public boolean isBrowseOnly()
-   {
+   public boolean isBrowseOnly() {
       return browseOnly;
    }
 
-   public long getCreationTime()
-   {
+   public long getCreationTime() {
       return creationTime;
    }
 
    /**
     * @return the durable
     */
-   public boolean isDurable()
-   {
+   public boolean isDurable() {
       return durable;
    }
 
-   public String getFilter()
-   {
+   public String getFilter() {
       return filter;
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
index c7504bb..33b902b 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
@@ -25,62 +25,52 @@ import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
 /**
  * Helper class to use JMS messages to manage ActiveMQ Artemis server resources.
  */
-public class JMSManagementHelper
-{
-   private static org.apache.activemq.artemis.api.core.Message getCoreMessage(final Message jmsMessage)
-   {
-      if (jmsMessage instanceof ActiveMQMessage == false)
-      {
-         throw new IllegalArgumentException("Cannot send a foreign message as a management message " + jmsMessage.getClass()
-                                                                                                                   .getName());
+public class JMSManagementHelper {
+
+   private static org.apache.activemq.artemis.api.core.Message getCoreMessage(final Message jmsMessage) {
+      if (jmsMessage instanceof ActiveMQMessage == false) {
+         throw new IllegalArgumentException("Cannot send a foreign message as a management message " + jmsMessage.getClass().getName());
       }
 
-      return ((ActiveMQMessage)jmsMessage).getCoreMessage();
+      return ((ActiveMQMessage) jmsMessage).getCoreMessage();
    }
 
    /**
     * Stores a resource attribute in a JMS message to retrieve the value from the server resource.
     *
-    * @param message JMS message
+    * @param message      JMS message
     * @param resourceName the name of the resource
-    * @param attribute the name of the attribute
+    * @param attribute    the name of the attribute
     * @throws JMSException if an exception occurs while putting the information in the message
-    *
     * @see org.apache.activemq.artemis.api.core.management.ResourceNames
     */
-   public static void putAttribute(final Message message, final String resourceName, final String attribute) throws JMSException
-   {
+   public static void putAttribute(final Message message,
+                                   final String resourceName,
+                                   final String attribute) throws JMSException {
       ManagementHelper.putAttribute(JMSManagementHelper.getCoreMessage(message), resourceName, attribute);
    }
 
    /**
     * Stores an operation invocation in a JMS message to invoke the corresponding operation the value from the server resource.
     *
-    * @param message JMS message
-    * @param resourceName the name of the resource
+    * @param message       JMS message
+    * @param resourceName  the name of the resource
     * @param operationName the name of the operation to invoke on the resource
     * @throws JMSException if an exception occurs while putting the information in the message
-    *
     * @see org.apache.activemq.artemis.api.core.management.ResourceNames
     */
    public static void putOperationInvocation(final Message message,
                                              final String resourceName,
-                                             final String operationName) throws JMSException
-   {
-      try
-      {
-         ManagementHelper.putOperationInvocation(JMSManagementHelper.getCoreMessage(message),
-                                                 resourceName,
-                                                 operationName);
+                                             final String operationName) throws JMSException {
+      try {
+         ManagementHelper.putOperationInvocation(JMSManagementHelper.getCoreMessage(message), resourceName, operationName);
       }
-      catch (Exception e)
-      {
+      catch (Exception e) {
          throw JMSManagementHelper.convertFromException(e);
       }
    }
 
-   private static JMSException convertFromException(final Exception e)
-   {
+   private static JMSException convertFromException(final Exception e) {
       JMSException jmse = new JMSException(e.getMessage());
 
       jmse.initCause(e);
@@ -91,28 +81,21 @@ public class JMSManagementHelper
    /**
     * Stores an operation invocation in a JMS message to invoke the corresponding operation the value from the server resource.
     *
-    * @param message JMS message
-    * @param resourceName the name of the server resource
+    * @param message       JMS message
+    * @param resourceName  the name of the server resource
     * @param operationName the name of the operation to invoke on the server resource
-    * @param parameters the parameters to use to invoke the server resource
+    * @param parameters    the parameters to use to invoke the server resource
     * @throws JMSException if an exception occurs while putting the information in the message
-    *
     * @see org.apache.activemq.artemis.api.core.management.ResourceNames
     */
    public static void putOperationInvocation(final Message message,
                                              final String resourceName,
                                              final String operationName,
-                                             final Object... parameters) throws JMSException
-   {
-      try
-      {
-         ManagementHelper.putOperationInvocation(JMSManagementHelper.getCoreMessage(message),
-                                                 resourceName,
-                                                 operationName,
-                                                 parameters);
+                                             final Object... parameters) throws JMSException {
+      try {
+         ManagementHelper.putOperationInvocation(JMSManagementHelper.getCoreMessage(message), resourceName, operationName, parameters);
       }
-      catch (Exception e)
-      {
+      catch (Exception e) {
          throw JMSManagementHelper.convertFromException(e);
       }
    }
@@ -120,24 +103,21 @@ public class JMSManagementHelper
    /**
     * Returns whether the JMS message corresponds to the result of a management operation invocation.
     */
-   public static boolean isOperationResult(final Message message) throws JMSException
-   {
+   public static boolean isOperationResult(final Message message) throws JMSException {
       return ManagementHelper.isOperationResult(JMSManagementHelper.getCoreMessage(message));
    }
 
    /**
     * Returns whether the JMS message corresponds to the result of a management attribute value.
     */
-   public static boolean isAttributesResult(final Message message) throws JMSException
-   {
+   public static boolean isAttributesResult(final Message message) throws JMSException {
       return ManagementHelper.isAttributesResult(JMSManagementHelper.getCoreMessage(message));
    }
 
    /**
     * Returns whether the invocation of the management operation on the server resource succeeded.
     */
-   public static boolean hasOperationSucceeded(final Message message) throws JMSException
-   {
+   public static boolean hasOperationSucceeded(final Message message) throws JMSException {
       return ManagementHelper.hasOperationSucceeded(JMSManagementHelper.getCoreMessage(message));
    }
 
@@ -147,8 +127,7 @@ public class JMSManagementHelper
     * If an error occurred on the server, {@link #hasOperationSucceeded(Message)} will return {@code false}.
     * and the result will be a String corresponding to the server exception.
     */
-   public static Object[] getResults(final Message message) throws Exception
-   {
+   public static Object[] getResults(final Message message) throws Exception {
       return ManagementHelper.getResults(JMSManagementHelper.getCoreMessage(message));
    }
 
@@ -158,13 +137,11 @@ public class JMSManagementHelper
     * If an error occurred on the server, {@link #hasOperationSucceeded(Message)} will return {@code false}.
     * and the result will be a String corresponding to the server exception.
     */
-   public static Object getResult(final Message message) throws Exception
-   {
+   public static Object getResult(final Message message) throws Exception {
       return ManagementHelper.getResult(JMSManagementHelper.getCoreMessage(message));
    }
 
-   private JMSManagementHelper()
-   {
+   private JMSManagementHelper() {
       // Utility class
    }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bac96047/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java
index d12372f..43e20ab 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSQueueControl.java
@@ -26,8 +26,7 @@ import org.apache.activemq.artemis.api.core.management.Parameter;
 /**
  * A JMSQueueControl is used to manage a JMS queue.
  */
-public interface JMSQueueControl extends DestinationControl
-{
+public interface JMSQueueControl extends DestinationControl {
    // Attributes ----------------------------------------------------
 
    /**
@@ -168,7 +167,6 @@ public interface JMSQueueControl extends DestinationControl
     * Changes the message's priority corresponding to the specified message ID to the specified priority.
     *
     * @param newPriority between 0 and 9 inclusive.
-    *
     * @return {@code true} if the message priority was changed
     */
    @Operation(desc = "Change the priority of the message corresponding to the given messageID", impact = MBeanOperationInfo.ACTION)
@@ -185,6 +183,7 @@ public interface JMSQueueControl extends DestinationControl
    @Operation(desc = "Change the priority of the messages corresponding to the given filter", impact = MBeanOperationInfo.ACTION)
    int changeMessagesPriority(@Parameter(name = "filter", desc = "A message filter") String filter,
                               @Parameter(name = "newPriority", desc = "the new priority (between 0 and 9)") int newPriority) throws Exception;
+
    /**
     * Moves the message corresponding to the specified message ID to the specified other queue.
     *
@@ -194,7 +193,6 @@ public interface JMSQueueControl extends DestinationControl
    boolean moveMessage(@Parameter(name = "messageID", desc = "A message ID") String messageID,
                        @Parameter(name = "otherQueueName", desc = "The name of the queue to move the message to") String otherQueueName) throws Exception;
 
-
    /**
     * Moves the message corresponding to the specified message ID to the specified other queue.
     *


Mime
View raw message