activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [31/52] [partial] activemq-artemis git commit: ARTEMIS-765 Improve Checkstyle
Date Fri, 30 Sep 2016 15:26:31 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java
index f6573b6..077e81e 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushQueueConsumerTest.java
@@ -16,22 +16,21 @@
  */
 package org.apache.activemq.artemis.rest.test;
 
-import org.apache.activemq.artemis.rest.util.Constants;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import org.apache.activemq.artemis.rest.queue.QueueDeployment;
 import org.apache.activemq.artemis.rest.queue.push.ActiveMQPushStrategy;
 import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
 import org.apache.activemq.artemis.rest.queue.push.xml.XmlLink;
+import org.apache.activemq.artemis.rest.util.Constants;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.Link;
 import org.junit.Assert;
 import org.junit.Test;
 
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
 import static org.jboss.resteasy.test.TestPortProvider.generateURL;
 
 public class PushQueueConsumerTest extends MessageTestBase {
@@ -68,8 +67,7 @@ public class PushQueueConsumerTest extends MessageTestBase {
          sendMessage(destination, messageContent);
 
          consumerResponse = consume(destinationForConsumption, messageContent);
-      }
-      finally {
+      } finally {
          cleanupConsumer(consumerResponse);
          cleanupSubscription(pushSubscription);
       }
@@ -112,8 +110,7 @@ public class PushQueueConsumerTest extends MessageTestBase {
          sendMessage(destinationForSend, messageContent);
 
          consumerResponse = consume(destinationForConsumption, messageContent);
-      }
-      finally {
+      } finally {
          cleanupConsumer(consumerResponse);
          cleanupSubscription(pushSubscription);
       }
@@ -150,8 +147,7 @@ public class PushQueueConsumerTest extends MessageTestBase {
          sendMessage(destinationForSend, messageContent);
 
          consumerResponse = consume(destinationForConsumption, messageContent);
-      }
-      finally {
+      } finally {
          cleanupConsumer(consumerResponse);
          cleanupSubscription(pushSubscription);
       }
@@ -184,8 +180,7 @@ public class PushQueueConsumerTest extends MessageTestBase {
          try {
             // sleep here so the concurrent invocations can stack up
             Thread.sleep(1000);
-         }
-         catch (InterruptedException e) {
+         } catch (InterruptedException e) {
             e.printStackTrace();
          }
 
@@ -219,8 +214,7 @@ public class PushQueueConsumerTest extends MessageTestBase {
          Thread.sleep(100);
 
          Assert.assertEquals(messageContent, MyResource.got_it);
-      }
-      finally {
+      } finally {
          cleanupSubscription(pushSubscription);
       }
    }
@@ -257,8 +251,7 @@ public class PushQueueConsumerTest extends MessageTestBase {
          }
 
          Assert.assertEquals(CONCURRENT, MyConcurrentResource.maxConcurrentInvocations.get());
-      }
-      finally {
+      } finally {
          cleanupSubscription(pushSubscription);
       }
    }
@@ -319,16 +312,13 @@ public class PushQueueConsumerTest extends MessageTestBase {
       if (pushRegistrationType == PushRegistrationType.CLASS) {
          target.setHref(generateURL(Util.getUrlPath(queueToPushTo)));
          target.setClassName(ActiveMQPushStrategy.class.getName());
-      }
-      else if (pushRegistrationType == PushRegistrationType.BRIDGE) {
+      } else if (pushRegistrationType == PushRegistrationType.BRIDGE) {
          target.setHref(generateURL(Util.getUrlPath(queueToPushTo)));
          target.setRelationship("destination");
-      }
-      else if (pushRegistrationType == PushRegistrationType.TEMPLATE) {
+      } else if (pushRegistrationType == PushRegistrationType.TEMPLATE) {
          target.setHref(queueToPushTo);
          target.setRelationship("template");
-      }
-      else if (pushRegistrationType == PushRegistrationType.URI) {
+      } else if (pushRegistrationType == PushRegistrationType.URI) {
          target.setMethod("put");
          target.setHref(queueToPushTo);
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java
index 320567c..104189d 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/PushTopicConsumerTest.java
@@ -256,8 +256,7 @@ public class PushTopicConsumerTest extends MessageTestBase {
          try {
             // sleep here so the concurrent invocations can stack up
             Thread.sleep(1000);
-         }
-         catch (InterruptedException e) {
+         } catch (InterruptedException e) {
             e.printStackTrace();
          }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java
index 9a4140d..3b6f598 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/RawAckTest.java
@@ -103,8 +103,7 @@ public class RawAckTest {
             }
             Assert.assertNull(message);
             passed = true;
-         }
-         catch (Exception e) {
+         } catch (Exception e) {
             e.printStackTrace();
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java
index 2d6d3f2..176d61e 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SelectorTest.java
@@ -140,8 +140,7 @@ public class SelectorTest extends MessageTestBase {
          message.setObject(object);
 
          producer.send(message);
-      }
-      finally {
+      } finally {
          conn.close();
       }
    }
@@ -303,4 +302,4 @@ public class SelectorTest extends MessageTestBase {
       response.releaseConnection();
       return consumeNext;
    }
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java
index e9c8386..c19288f 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/SessionTest.java
@@ -16,9 +16,9 @@
  */
 package org.apache.activemq.artemis.rest.test;
 
+import org.apache.activemq.artemis.rest.queue.QueueDeployment;
 import org.apache.activemq.artemis.rest.topic.TopicDeployment;
 import org.apache.activemq.artemis.rest.util.Constants;
-import org.apache.activemq.artemis.rest.queue.QueueDeployment;
 import org.jboss.resteasy.client.ClientRequest;
 import org.jboss.resteasy.client.ClientResponse;
 import org.jboss.resteasy.spi.Link;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java
index dfb6cc8..dcb67bd 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/TransformTest.java
@@ -103,13 +103,11 @@ public class TransformTest extends MessageTestBase {
          ClientMessage message = session.createMessage(Message.OBJECT_TYPE, false);
          if (contentType == null) {
             ActiveMQ.setEntity(message, object);
-         }
-         else
+         } else
             ActiveMQ.setEntity(message, object, contentType);
          producer.send(message);
          session.start();
-      }
-      finally {
+      } finally {
          session.close();
       }
 
@@ -193,8 +191,7 @@ public class TransformTest extends MessageTestBase {
          System.out.println("onMessage!");
          try {
             order = ActiveMQ.getEntity(clientMessage, Order.class);
-         }
-         catch (Exception e) {
+         } catch (Exception e) {
             e.printStackTrace();
          }
          latch.countDown();
@@ -240,8 +237,7 @@ public class TransformTest extends MessageTestBase {
             Assert.assertNotNull(Listener.order);
             Assert.assertEquals(order, Listener.order);
          }
-      }
-      finally {
+      } finally {
          session.close();
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java
----------------------------------------------------------------------
diff --git a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java
index a3c521c..2c0bd9d 100644
--- a/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java
+++ b/artemis-rest/src/test/java/org/apache/activemq/artemis/rest/test/XmlTest.java
@@ -16,12 +16,12 @@
  */
 package org.apache.activemq.artemis.rest.test;
 
-import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
-import org.junit.Test;
-
 import javax.xml.bind.JAXBContext;
 import java.io.StringReader;
 
+import org.apache.activemq.artemis.rest.queue.push.xml.PushRegistration;
+import org.junit.Test;
+
 public class XmlTest {
 
    @Test

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-selector/pom.xml b/artemis-selector/pom.xml
index 8b3fe64..45214ea 100644
--- a/artemis-selector/pom.xml
+++ b/artemis-selector/pom.xml
@@ -14,7 +14,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
@@ -66,65 +67,65 @@
             </configuration>
          </plugin>
          <plugin>
-           <groupId>org.codehaus.mojo</groupId>
-           <artifactId>javacc-maven-plugin</artifactId>
-           <version>2.6</version>
-           <executions>
-             <execution>
-               <phase>generate-sources</phase>
-               <goals>
-                 <goal>javacc</goal>
-               </goals>
-             </execution>
-           </executions>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>javacc-maven-plugin</artifactId>
+            <version>2.6</version>
+            <executions>
+               <execution>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>javacc</goal>
+                  </goals>
+               </execution>
+            </executions>
          </plugin>
          <plugin>
-             <groupId>org.codehaus.mojo</groupId>
-             <artifactId>build-helper-maven-plugin</artifactId>
-             <executions>
-                 <execution>
-                     <id>add-source</id>
-                     <phase>generate-sources</phase>
-                     <goals>
-                         <goal>add-source</goal>
-                     </goals>
-                     <configuration>
-                         <sources>
-                             <source>${basedir}/target/generated-sources/javacc</source>
-                         </sources>
-                     </configuration>
-                 </execution>
-             </executions>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <executions>
+               <execution>
+                  <id>add-source</id>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>add-source</goal>
+                  </goals>
+                  <configuration>
+                     <sources>
+                        <source>${basedir}/target/generated-sources/javacc</source>
+                     </sources>
+                  </configuration>
+               </execution>
+            </executions>
          </plugin>
       </plugins>
       <pluginManagement>
-      	<plugins>
-      		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-      		<plugin>
-      			<groupId>org.eclipse.m2e</groupId>
-      			<artifactId>lifecycle-mapping</artifactId>
-      			<version>1.0.0</version>
-      			<configuration>
-      				<lifecycleMappingMetadata>
-      					<pluginExecutions>
-      						<pluginExecution>
-      							<pluginExecutionFilter>
-      								<groupId>org.codehaus.mojo</groupId>
-      								<artifactId>javacc-maven-plugin</artifactId>
-      								<versionRange>[2.6,)</versionRange>
-      								<goals>
-      									<goal>javacc</goal>
-      								</goals>
-      							</pluginExecutionFilter>
-      							<action>
-      								<execute />
-      							</action>
-      						</pluginExecution>
-      					</pluginExecutions>
-      				</lifecycleMappingMetadata>
-      			</configuration>
-      		</plugin>
-      	</plugins>
+         <plugins>
+            <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+            <plugin>
+               <groupId>org.eclipse.m2e</groupId>
+               <artifactId>lifecycle-mapping</artifactId>
+               <version>1.0.0</version>
+               <configuration>
+                  <lifecycleMappingMetadata>
+                     <pluginExecutions>
+                        <pluginExecution>
+                           <pluginExecutionFilter>
+                              <groupId>org.codehaus.mojo</groupId>
+                              <artifactId>javacc-maven-plugin</artifactId>
+                              <versionRange>[2.6,)</versionRange>
+                              <goals>
+                                 <goal>javacc</goal>
+                              </goals>
+                           </pluginExecutionFilter>
+                           <action>
+                              <execute/>
+                           </action>
+                        </pluginExecution>
+                     </pluginExecutions>
+                  </lifecycleMappingMetadata>
+               </configuration>
+            </plugin>
+         </plugins>
       </pluginManagement>
    </build>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java
index 3cff711..87759f4 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ArithmeticExpression.java
@@ -45,8 +45,7 @@ public abstract class ArithmeticExpression extends BinaryExpression {
                String text = (String) lvalue;
                String answer = text + rvalue;
                return answer;
-            }
-            else {
+            } else {
                return plus(asNumber(lvalue), asNumber(rvalue));
             }
          }
@@ -161,11 +160,9 @@ public abstract class ArithmeticExpression extends BinaryExpression {
    private int numberType(Number left, Number right) {
       if (isDouble(left) || isDouble(right)) {
          return DOUBLE;
-      }
-      else if (left instanceof Long || right instanceof Long) {
+      } else if (left instanceof Long || right instanceof Long) {
          return LONG;
-      }
-      else {
+      } else {
          return INTEGER;
       }
    }
@@ -177,19 +174,16 @@ public abstract class ArithmeticExpression extends BinaryExpression {
    protected Number asNumber(Object value) {
       if (value instanceof Number) {
          return (Number) value;
-      }
-      else {
+      } else {
          if (convertStringExpressions && value instanceof String) {
             String v = (String) value;
             try {
                if (v.contains(".")) {
                   return new Double(v);
-               }
-               else {
+               } else {
                   return new Long(v);
                }
-            }
-            catch (NumberFormatException e) {
+            } catch (NumberFormatException e) {
                throw new RuntimeException("Cannot convert value: " + value + " into a number");
             }
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
index bc3b333..a46dd7c 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ComparisonExpression.java
@@ -91,8 +91,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
                char t = like.charAt(i);
                regexp.append("\\x");
                regexp.append(Integer.toHexString(0xFFFF & t));
-            }
-            else {
+            } else {
                append(regexp, c);
             }
          }
@@ -113,15 +112,12 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
       private void append(StringBuffer regexp, char c) {
          if (c == '%') {
             regexp.append(".*?"); // Do a non-greedy match
-         }
-         else if (c == '_') {
+         } else if (c == '_') {
             regexp.append("."); // match one
-         }
-         else if (REGEXP_CONTROL_CHARS.contains(new Character(c))) {
+         } else if (REGEXP_CONTROL_CHARS.contains(new Character(c))) {
             regexp.append("\\x");
             regexp.append(Integer.toHexString(0xFFFF & c));
-         }
-         else {
+         } else {
             regexp.append(c);
          }
       }
@@ -385,146 +381,105 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
             if (lc == Boolean.class) {
                if (convertStringExpressions && rc == String.class) {
                   rv = Boolean.valueOf((String) rv);
-               }
-               else {
+               } else {
                   return Boolean.FALSE;
                }
-            }
-            else if (lc == Byte.class) {
+            } else if (lc == Byte.class) {
                if (rc == Short.class) {
                   lv = ((Number) lv).shortValue();
-               }
-               else if (rc == Integer.class) {
+               } else if (rc == Integer.class) {
                   lv = ((Number) lv).intValue();
-               }
-               else if (rc == Long.class) {
+               } else if (rc == Long.class) {
                   lv = ((Number) lv).longValue();
-               }
-               else if (rc == Float.class) {
+               } else if (rc == Float.class) {
                   lv = ((Number) lv).floatValue();
-               }
-               else if (rc == Double.class) {
+               } else if (rc == Double.class) {
                   lv = ((Number) lv).doubleValue();
-               }
-               else if (convertStringExpressions && rc == String.class) {
+               } else if (convertStringExpressions && rc == String.class) {
                   rv = Byte.valueOf((String) rv);
-               }
-               else {
+               } else {
                   return Boolean.FALSE;
                }
-            }
-            else if (lc == Short.class) {
+            } else if (lc == Short.class) {
                if (rc == Integer.class) {
                   lv = ((Number) lv).intValue();
-               }
-               else if (rc == Long.class) {
+               } else if (rc == Long.class) {
                   lv = ((Number) lv).longValue();
-               }
-               else if (rc == Float.class) {
+               } else if (rc == Float.class) {
                   lv = ((Number) lv).floatValue();
-               }
-               else if (rc == Double.class) {
+               } else if (rc == Double.class) {
                   lv = ((Number) lv).doubleValue();
-               }
-               else if (convertStringExpressions && rc == String.class) {
+               } else if (convertStringExpressions && rc == String.class) {
                   rv = Short.valueOf((String) rv);
-               }
-               else {
+               } else {
                   return Boolean.FALSE;
                }
-            }
-            else if (lc == Integer.class) {
+            } else if (lc == Integer.class) {
                if (rc == Long.class) {
                   lv = ((Number) lv).longValue();
-               }
-               else if (rc == Float.class) {
+               } else if (rc == Float.class) {
                   lv = ((Number) lv).floatValue();
-               }
-               else if (rc == Double.class) {
+               } else if (rc == Double.class) {
                   lv = ((Number) lv).doubleValue();
-               }
-               else if (convertStringExpressions && rc == String.class) {
+               } else if (convertStringExpressions && rc == String.class) {
                   rv = Integer.valueOf((String) rv);
-               }
-               else {
+               } else {
                   return Boolean.FALSE;
                }
-            }
-            else if (lc == Long.class) {
+            } else if (lc == Long.class) {
                if (rc == Integer.class) {
                   rv = ((Number) rv).longValue();
-               }
-               else if (rc == Float.class) {
+               } else if (rc == Float.class) {
                   lv = ((Number) lv).floatValue();
-               }
-               else if (rc == Double.class) {
+               } else if (rc == Double.class) {
                   lv = ((Number) lv).doubleValue();
-               }
-               else if (convertStringExpressions && rc == String.class) {
+               } else if (convertStringExpressions && rc == String.class) {
                   rv = Long.valueOf((String) rv);
-               }
-               else {
+               } else {
                   return Boolean.FALSE;
                }
-            }
-            else if (lc == Float.class) {
+            } else if (lc == Float.class) {
                if (rc == Integer.class || rc == Long.class) {
                   rv = ((Number) rv).floatValue();
-               }
-               else if (rc == Double.class) {
+               } else if (rc == Double.class) {
                   lv = ((Number) lv).doubleValue();
-               }
-               else if (convertStringExpressions && rc == String.class) {
+               } else if (convertStringExpressions && rc == String.class) {
                   rv = Float.valueOf((String) rv);
-               }
-               else {
+               } else {
                   return Boolean.FALSE;
                }
-            }
-            else if (lc == Double.class) {
+            } else if (lc == Double.class) {
                if (rc == Integer.class || rc == Long.class || rc == Float.class) {
                   rv = ((Number) rv).doubleValue();
-               }
-               else if (convertStringExpressions && rc == String.class) {
+               } else if (convertStringExpressions && rc == String.class) {
                   rv = Double.valueOf((String) rv);
-               }
-               else {
+               } else {
                   return Boolean.FALSE;
                }
-            }
-            else if (convertStringExpressions && lc == String.class) {
+            } else if (convertStringExpressions && lc == String.class) {
 
                if (rc == Boolean.class) {
                   lv = Boolean.valueOf((String) lv);
-               }
-               else if (rc == Byte.class) {
+               } else if (rc == Byte.class) {
                   lv = Byte.valueOf((String) lv);
-               }
-               else if (rc == Short.class) {
+               } else if (rc == Short.class) {
                   lv = Short.valueOf((String) lv);
-               }
-               else if (rc == Integer.class) {
+               } else if (rc == Integer.class) {
                   lv = Integer.valueOf((String) lv);
-               }
-               else if (rc == Long.class) {
+               } else if (rc == Long.class) {
                   lv = Long.valueOf((String) lv);
-               }
-               else if (rc == Float.class) {
+               } else if (rc == Float.class) {
                   lv = Float.valueOf((String) lv);
-               }
-               else if (rc == Double.class) {
+               } else if (rc == Double.class) {
                   lv = Double.valueOf((String) lv);
-               }
-               else {
+               } else {
                   return Boolean.FALSE;
                }
 
-            }
-            else {
+            } else {
                return Boolean.FALSE;
             }
-         }
-         catch (NumberFormatException e) {
+         } catch (NumberFormatException e) {
             return Boolean.FALSE;
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java
index 8d88bbd..0cdf991 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/ConstantExpression.java
@@ -58,8 +58,7 @@ public class ConstantExpression implements Expression {
       Number value;
       try {
          value = new Long(text);
-      }
-      catch (NumberFormatException e) {
+      } catch (NumberFormatException e) {
          // The number may be too big to fit in a long.
          value = new BigDecimal(text);
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
index ecdcf23..4c106bd 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/UnaryExpression.java
@@ -64,11 +64,9 @@ public abstract class UnaryExpression implements Expression {
       Collection<Object> t;
       if (elements.size() == 0) {
          t = null;
-      }
-      else if (elements.size() < 5) {
+      } else if (elements.size() < 5) {
          t = elements;
-      }
-      else {
+      } else {
          t = new HashSet<>(elements);
       }
       final Collection<Object> inList = t;
@@ -113,8 +111,7 @@ public abstract class UnaryExpression implements Expression {
          public String getExpressionSymbol() {
             if (not) {
                return "NOT IN";
-            }
-            else {
+            } else {
                return "IN";
             }
          }
@@ -190,17 +187,13 @@ public abstract class UnaryExpression implements Expression {
       Class clazz = left.getClass();
       if (clazz == Integer.class) {
          return -left.intValue();
-      }
-      else if (clazz == Long.class) {
+      } else if (clazz == Long.class) {
          return -left.longValue();
-      }
-      else if (clazz == Float.class) {
+      } else if (clazz == Float.class) {
          return -left.floatValue();
-      }
-      else if (clazz == Double.class) {
+      } else if (clazz == Double.class) {
          return -left.doubleValue();
-      }
-      else if (clazz == BigDecimal.class) {
+      } else if (clazz == BigDecimal.class) {
          // We ussually get a big deciamal when we have Long.MIN_VALUE
          // constant in the
          // Selector. Long.MIN_VALUE is too big to store in a Long as a
@@ -215,8 +208,7 @@ public abstract class UnaryExpression implements Expression {
             return Long.valueOf(Long.MIN_VALUE);
          }
          return bd;
-      }
-      else {
+      } else {
          throw new RuntimeException("Don't know how to negate: " + left);
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java
index 111fce9..4f0f8e6 100755
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XPathExpression.java
@@ -33,8 +33,7 @@ public final class XPathExpression implements BooleanExpression {
                return new XalanXPathEvaluator(xpath);
             }
          };
-      }
-      catch (Throwable e) {
+      } catch (Throwable e) {
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java
index 906074e..3a1714c 100644
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/filter/XalanXPathEvaluator.java
@@ -66,8 +66,7 @@ public class XalanXPathEvaluator implements XPathExpression.XPathEvaluator {
             NodeIterator iterator = cachedXPathAPI.selectNodeIterator(doc, xpath);
             return (iterator.nextNode() != null);
          }
-      }
-      catch (Throwable e) {
+      } catch (Throwable e) {
          return false;
       }
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java
index 1cea9ba..6812f9a 100644
--- a/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java
+++ b/artemis-selector/src/main/java/org/apache/activemq/artemis/selector/impl/SelectorParser.java
@@ -38,11 +38,9 @@ public class SelectorParser {
       Object result = cache.get(sql);
       if (result instanceof FilterException) {
          throw (FilterException) result;
-      }
-      else if (result instanceof BooleanExpression) {
+      } else if (result instanceof BooleanExpression) {
          return (BooleanExpression) result;
-      }
-      else {
+      } else {
          String actual = sql;
          boolean convertStringExpressions = false;
          boolean hyphenatedProps = false;
@@ -78,20 +76,17 @@ public class SelectorParser {
             if (hyphenatedProps) {
                HyphenatedParser parser = new HyphenatedParser(new StringReader(actual));
                e = parser.JmsSelector();
-            }
-            else {
+            } else {
                StrictParser parser = new StrictParser(new StringReader(actual));
                e = parser.JmsSelector();
             }
             cache.put(sql, e);
             return e;
-         }
-         catch (Throwable e) {
+         } catch (Throwable e) {
             FilterException fe = new FilterException(actual, e);
             cache.put(sql, fe);
             throw fe;
-         }
-         finally {
+         } finally {
             if (convertStringExpressions) {
                ComparisonExpression.CONVERT_STRING_EXPRESSIONS.remove();
             }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
----------------------------------------------------------------------
diff --git a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
index d612db0..a540ed7 100755
--- a/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
+++ b/artemis-selector/src/test/java/org/apache/activemq/artemis/selector/SelectorTest.java
@@ -504,8 +504,7 @@ public class SelectorTest {
       try {
          SelectorParser.parse(text);
          Assert.fail("Created a valid selector");
-      }
-      catch (FilterException e) {
+      } catch (FilterException e) {
       }
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/pom.xml b/artemis-server-osgi/pom.xml
index f10a23b..ce2d2fe 100644
--- a/artemis-server-osgi/pom.xml
+++ b/artemis-server-osgi/pom.xml
@@ -8,123 +8,124 @@
 	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. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.apache.activemq</groupId>
-		<artifactId>artemis-pom</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
-	</parent>
+   <parent>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>artemis-pom</artifactId>
+      <version>1.5.0-SNAPSHOT</version>
+   </parent>
 
-	<artifactId>artemis-server-osgi</artifactId>
-	<packaging>bundle</packaging>
-	<name>ActiveMQ Artemis Server OSGi</name>
+   <artifactId>artemis-server-osgi</artifactId>
+   <packaging>bundle</packaging>
+   <name>ActiveMQ Artemis Server OSGi</name>
 
-	<description>
-		Combines the commons, core-client and server jars as they contain too many duplicate packages
-		to be deployed separately.
-	</description>
+   <description>
+      Combines the commons, core-client and server jars as they contain too many duplicate packages
+      to be deployed separately.
+   </description>
 
-	<properties>
-		<activemq.basedir>${project.basedir}/..</activemq.basedir>
-	</properties>
+   <properties>
+      <activemq.basedir>${project.basedir}/..</activemq.basedir>
+   </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-commons</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-core-client</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-jms-client</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-jms-server</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-jdbc-store</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-journal</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-selector</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.activemq</groupId>
-			<artifactId>artemis-service-extensions</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		
-        <dependency>
-            <groupId>org.jboss.modules</groupId>
-            <artifactId>jboss-modules</artifactId>
-            <version>1.3.1.Final</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
-		
-		
-		<dependency>
-			<groupId>org.jboss.logmanager</groupId>
-			<artifactId>jboss-logmanager</artifactId>
-			<optional>true</optional>
-		</dependency>
-		
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.11</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.easymock</groupId>
-			<artifactId>easymock</artifactId>
-			<version>3.2</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+   <dependencies>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-commons</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-core-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-server</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jms-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jms-server</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jdbc-store</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-journal</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-selector</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-service-extensions</artifactId>
+         <version>${project.version}</version>
+      </dependency>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.felix</groupId>
-				<artifactId>maven-bundle-plugin</artifactId>
-				<version>3.0.0</version>
-				<extensions>true</extensions>
-				<configuration>
-					<instructions>
-						<Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
-            <Import-Package>
-              org.postgresql*;resolution:=optional,
-              *
-            </Import-Package>
-						<_exportcontents>*</_exportcontents>
-					</instructions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+      <dependency>
+         <groupId>org.jboss.modules</groupId>
+         <artifactId>jboss-modules</artifactId>
+         <version>1.3.1.Final</version>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+
+
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <optional>true</optional>
+      </dependency>
+
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.11</version>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.easymock</groupId>
+         <artifactId>easymock</artifactId>
+         <version>3.2</version>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>maven-bundle-plugin</artifactId>
+            <version>3.0.0</version>
+            <extensions>true</extensions>
+            <configuration>
+               <instructions>
+                  <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+                  <Import-Package>
+                     org.postgresql*;resolution:=optional,
+                     *
+                  </Import-Package>
+                  <_exportcontents>*</_exportcontents>
+               </instructions>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
 
 </project>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
index 8b43d23..e921768 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/OsgiBroker.java
@@ -50,6 +50,7 @@ import org.osgi.util.tracker.ServiceTracker;
 @SuppressWarnings({"unchecked", "rawtypes"})
 @Component(configurationPid = "org.apache.activemq.artemis", configurationPolicy = ConfigurationPolicy.REQUIRE)
 public class OsgiBroker {
+
    private String name;
    private String configurationUrl;
    private String rolePrincipalClass;
@@ -63,7 +64,7 @@ public class OsgiBroker {
       final Dictionary<String, Object> properties = cctx.getProperties();
       configurationUrl = getMandatory(properties, "config");
       name = getMandatory(properties, "name");
-      rolePrincipalClass = (String)properties.get("rolePrincipalClass");
+      rolePrincipalClass = (String) properties.get("rolePrincipalClass");
       String domain = getMandatory(properties, "domain");
       ActiveMQJAASSecurityManager security = new ActiveMQJAASSecurityManager(domain);
       if (rolePrincipalClass != null) {
@@ -88,7 +89,7 @@ public class OsgiBroker {
 
       components = fileDeploymentManager.buildService(security, ManagementFactory.getPlatformMBeanServer());
 
-      final ActiveMQServer server = (ActiveMQServer)components.get("core");
+      final ActiveMQServer server = (ActiveMQServer) components.get("core");
 
       String[] requiredProtocols = getRequiredProtocols(server.getConfiguration().getAcceptorConfigurations());
       ProtocolTrackerCallBack callback = new ProtocolTrackerCallBack() {
@@ -98,7 +99,6 @@ public class OsgiBroker {
             server.addProtocolManagerFactory(pmf);
          }
 
-
          @Override
          public void removeFactory(ProtocolManagerFactory<Interceptor> pmf) {
             server.removeProtocolManagerFactory(pmf);
@@ -141,7 +141,6 @@ public class OsgiBroker {
       return value;
    }
 
-
    private String[] getRequiredProtocols(Set<TransportConfiguration> acceptors) {
       ArrayList<String> protocols = new ArrayList<>();
       for (TransportConfiguration acceptor : acceptors) {
@@ -185,7 +184,7 @@ public class OsgiBroker {
       for (Map.Entry<String, ActiveMQComponent> component : getComponents().entrySet()) {
          String[] classes = getInterfaces(component.getValue());
          Hashtable<String, Object> props = new Hashtable<>();
-         for (Enumeration<String> keyEnum = properties.keys(); keyEnum.hasMoreElements();) {
+         for (Enumeration<String> keyEnum = properties.keys(); keyEnum.hasMoreElements(); ) {
             String key = keyEnum.nextElement();
             Object val = properties.get(key);
             props.put(key, val);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java
index 661024b..545e897 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTracker.java
@@ -38,13 +38,17 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
  */
 @SuppressWarnings("rawtypes")
 public class ProtocolTracker implements ServiceTrackerCustomizer<ProtocolManagerFactory<Interceptor>, ProtocolManagerFactory<Interceptor>> {
+
    private static Logger LOG = Logger.getLogger(ProtocolTracker.class.getName());
    private String name;
    private BundleContext context;
    private Map<String, Boolean> protocols;
    private ProtocolTrackerCallBack callback;
 
-   public ProtocolTracker(String name, BundleContext context, String[] requiredProtocols, ProtocolTrackerCallBack callback) {
+   public ProtocolTracker(String name,
+                          BundleContext context,
+                          String[] requiredProtocols,
+                          ProtocolTrackerCallBack callback) {
       this.name = name;
       this.context = context;
       this.callback = callback;
@@ -66,14 +70,15 @@ public class ProtocolTracker implements ServiceTrackerCustomizer<ProtocolManager
       return pmf;
    }
 
-
    @Override
-   public void modifiedService(ServiceReference<ProtocolManagerFactory<Interceptor>> reference, ProtocolManagerFactory<Interceptor> pmf) {
+   public void modifiedService(ServiceReference<ProtocolManagerFactory<Interceptor>> reference,
+                               ProtocolManagerFactory<Interceptor> pmf) {
       // Not supported
    }
 
    @Override
-   public void removedService(ServiceReference<ProtocolManagerFactory<Interceptor>> reference, ProtocolManagerFactory<Interceptor> pmf) {
+   public void removedService(ServiceReference<ProtocolManagerFactory<Interceptor>> reference,
+                              ProtocolManagerFactory<Interceptor> pmf) {
       for (String protocol : pmf.getProtocols()) {
          protocolRemoved(protocol);
       }
@@ -86,30 +91,26 @@ public class ProtocolTracker implements ServiceTrackerCustomizer<ProtocolManager
          this.protocols.put(protocol, true);
          List<String> missing = getMissing();
          LOG.info("Required protocol " + protocol + " was added for broker " + name + ". " +
-            (missing.isEmpty() ? "Starting broker." : "Still waiting for " + missing));
+                     (missing.isEmpty() ? "Starting broker." : "Still waiting for " + missing));
          if (missing.isEmpty()) {
             try {
                callback.start();
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                LOG.log(Level.WARNING, "Error starting broker " + name, e);
             }
          }
       }
    }
 
-
    private void protocolRemoved(String protocol) {
       Boolean present = this.protocols.get(protocol);
       if (present != null && present) {
          List<String> missing = getMissing();
-         LOG.info("Required protocol " + protocol + " was removed for broker " + name + ". "
-            + (missing.isEmpty() ? "Stopping broker. " : ""));
+         LOG.info("Required protocol " + protocol + " was removed for broker " + name + ". " + (missing.isEmpty() ? "Stopping broker. " : ""));
          if (missing.isEmpty()) {
             try {
                callback.stop();
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                LOG.log(Level.WARNING, "Error stopping broker " + name, e);
             }
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTrackerCallBack.java
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTrackerCallBack.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTrackerCallBack.java
index 9614b53..44cc590 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTrackerCallBack.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/ProtocolTrackerCallBack.java
@@ -21,6 +21,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQComponent;
 import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory;
 
 public interface ProtocolTrackerCallBack extends ActiveMQComponent {
+
    void addFactory(ProtocolManagerFactory<Interceptor> pmf);
 
    void removeFactory(ProtocolManagerFactory<Interceptor> pmf);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server-osgi/src/test/java/org/apache/activemq/artemis/osgi/ProtocolTrackerTest.java
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/src/test/java/org/apache/activemq/artemis/osgi/ProtocolTrackerTest.java b/artemis-server-osgi/src/test/java/org/apache/activemq/artemis/osgi/ProtocolTrackerTest.java
index 18e1f76..744d45b 100644
--- a/artemis-server-osgi/src/test/java/org/apache/activemq/artemis/osgi/ProtocolTrackerTest.java
+++ b/artemis-server-osgi/src/test/java/org/apache/activemq/artemis/osgi/ProtocolTrackerTest.java
@@ -16,8 +16,6 @@
  */
 package org.apache.activemq.artemis.osgi;
 
-import static org.easymock.EasyMock.expect;
-
 import org.apache.activemq.artemis.api.core.Interceptor;
 import org.apache.activemq.artemis.spi.core.protocol.ProtocolManagerFactory;
 import org.easymock.EasyMock;
@@ -26,6 +24,8 @@ import org.junit.Test;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 
+import static org.easymock.EasyMock.expect;
+
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class ProtocolTrackerTest {
 
@@ -61,6 +61,7 @@ public class ProtocolTrackerTest {
    }
 
    class RefFact {
+
       ServiceReference<ProtocolManagerFactory<Interceptor>> ref;
       ProtocolManagerFactory factory;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 7f9b9db..d9eaead 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -14,7 +14,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
@@ -47,9 +48,9 @@
          <artifactId>jboss-logging</artifactId>
       </dependency>
       <dependency>
-        <groupId>org.jboss.logmanager</groupId>
-        <artifactId>jboss-logmanager</artifactId>
-        <scope>test</scope>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <scope>test</scope>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
@@ -136,7 +137,8 @@
                      <maxmemory>512m</maxmemory>
                      <quiet>false</quiet>
                      <aggregate>true</aggregate>
-                     <excludePackageNames>org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils</excludePackageNames>
+                     <excludePackageNames>org.apache.activemq.artemis.core:org.apache.activemq.artemis.utils
+                     </excludePackageNames>
                   </configuration>
                   <executions>
                      <execution>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
index 2e21949..8339a0f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.artemis.api.core.management;
 
+import javax.json.JsonObject;
 import java.text.DateFormat;
 import java.util.Date;
 
@@ -23,8 +24,6 @@ import org.apache.activemq.artemis.api.core.JsonUtil;
 import org.apache.activemq.artemis.core.messagecounter.MessageCounter;
 import org.apache.activemq.artemis.utils.JsonLoader;
 
-import javax.json.JsonObject;
-
 import static org.apache.activemq.artemis.api.core.JsonUtil.nullSafe;
 
 /**
@@ -62,18 +61,7 @@ public final class MessageCounterInfo {
       DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM);
       String lastAddTimestamp = dateFormat.format(new Date(counter.getLastAddedMessageTime()));
       String updateTimestamp = dateFormat.format(new Date(counter.getLastUpdate()));
-      return JsonLoader.createObjectBuilder()
-         .add("destinationName", nullSafe(counter.getDestinationName()))
-         .add("destinationSubscription", nullSafe(counter.getDestinationSubscription()))
-         .add("destinationDurable", counter.isDestinationDurable())
-         .add("count", counter.getCount())
-         .add("countDelta", counter.getCountDelta())
-         .add("messageCount", counter.getMessageCount())
-         .add("messageCountDelta", counter.getMessageCountDelta())
-         .add("lastAddTimestamp", lastAddTimestamp)
-         .add("updateTimestamp", updateTimestamp)
-         .build()
-         .toString();
+      return JsonLoader.createObjectBuilder().add("destinationName", nullSafe(counter.getDestinationName())).add("destinationSubscription", nullSafe(counter.getDestinationSubscription())).add("destinationDurable", counter.isDestinationDurable()).add("count", counter.getCount()).add("countDelta", counter.getCountDelta()).add("messageCount", counter.getMessageCount()).add("messageCountDelta", counter.getMessageCountDelta()).add("lastAddTimestamp", lastAddTimestamp).add("updateTimestamp", updateTimestamp).build().toString();
    }
 
    /**

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java
index f07fc17..68db973 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/BridgeConfiguration.java
@@ -401,20 +401,17 @@ public final class BridgeConfiguration implements Serializable {
       if (discoveryGroupName == null) {
          if (other.discoveryGroupName != null)
             return false;
-      }
-      else if (!discoveryGroupName.equals(other.discoveryGroupName))
+      } else if (!discoveryGroupName.equals(other.discoveryGroupName))
          return false;
       if (filterString == null) {
          if (other.filterString != null)
             return false;
-      }
-      else if (!filterString.equals(other.filterString))
+      } else if (!filterString.equals(other.filterString))
          return false;
       if (forwardingAddress == null) {
          if (other.forwardingAddress != null)
             return false;
-      }
-      else if (!forwardingAddress.equals(other.forwardingAddress))
+      } else if (!forwardingAddress.equals(other.forwardingAddress))
          return false;
       if (ha != other.ha)
          return false;
@@ -425,20 +422,17 @@ public final class BridgeConfiguration implements Serializable {
       if (name == null) {
          if (other.name != null)
             return false;
-      }
-      else if (!name.equals(other.name))
+      } else if (!name.equals(other.name))
          return false;
       if (password == null) {
          if (other.password != null)
             return false;
-      }
-      else if (!password.equals(other.password))
+      } else if (!password.equals(other.password))
          return false;
       if (queueName == null) {
          if (other.queueName != null)
             return false;
-      }
-      else if (!queueName.equals(other.queueName))
+      } else if (!queueName.equals(other.queueName))
          return false;
       if (initialConnectAttempts != other.initialConnectAttempts)
          return false;
@@ -451,22 +445,19 @@ public final class BridgeConfiguration implements Serializable {
       if (staticConnectors == null) {
          if (other.staticConnectors != null)
             return false;
-      }
-      else if (!staticConnectors.equals(other.staticConnectors))
+      } else if (!staticConnectors.equals(other.staticConnectors))
          return false;
       if (transformerClassName == null) {
          if (other.transformerClassName != null)
             return false;
-      }
-      else if (!transformerClassName.equals(other.transformerClassName))
+      } else if (!transformerClassName.equals(other.transformerClassName))
          return false;
       if (useDuplicateDetection != other.useDuplicateDetection)
          return false;
       if (user == null) {
          if (other.user != null)
             return false;
-      }
-      else if (!user.equals(other.user))
+      } else if (!user.equals(other.user))
          return false;
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
index 90c9db5..2cf8ab8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ClusterConnectionConfiguration.java
@@ -62,8 +62,7 @@ public final class ClusterConnectionConfiguration implements Serializable {
 
    private boolean duplicateDetection = ActiveMQDefaultConfiguration.isDefaultClusterDuplicateDetection();
 
-   private MessageLoadBalancingType messageLoadBalancingType = Enum.valueOf(MessageLoadBalancingType.class, ActiveMQDefaultConfiguration
-      .getDefaultClusterMessageLoadBalancingType());
+   private MessageLoadBalancingType messageLoadBalancingType = Enum.valueOf(MessageLoadBalancingType.class, ActiveMQDefaultConfiguration.getDefaultClusterMessageLoadBalancingType());
 
    private URISupport.CompositeData compositeMembers;
 
@@ -387,8 +386,7 @@ public final class ClusterConnectionConfiguration implements Serializable {
          }
 
          return list.toArray(new TransportConfiguration[list.size()]);
-      }
-      else {
+      } else {
          return staticConnectors != null ? configuration.getTransportConfigurations(staticConnectors) : null;
       }
    }
@@ -405,8 +403,7 @@ public final class ClusterConnectionConfiguration implements Serializable {
             return null;
          }
          return dg;
-      }
-      else {
+      } else {
          return null;
       }
    }
@@ -483,8 +480,7 @@ public final class ClusterConnectionConfiguration implements Serializable {
          if (other.address != null) {
             return false;
          }
-      }
-      else if (!address.equals(other.address)) {
+      } else if (!address.equals(other.address)) {
          return false;
       }
       if (allowDirectConnectionsOnly != other.allowDirectConnectionsOnly) {
@@ -515,16 +511,14 @@ public final class ClusterConnectionConfiguration implements Serializable {
          if (other.connectorName != null) {
             return false;
          }
-      }
-      else if (!connectorName.equals(other.connectorName)) {
+      } else if (!connectorName.equals(other.connectorName)) {
          return false;
       }
       if (discoveryGroupName == null) {
          if (other.discoveryGroupName != null) {
             return false;
          }
-      }
-      else if (!discoveryGroupName.equals(other.discoveryGroupName)) {
+      } else if (!discoveryGroupName.equals(other.discoveryGroupName)) {
          return false;
       }
       if (duplicateDetection != other.duplicateDetection) {
@@ -546,8 +540,7 @@ public final class ClusterConnectionConfiguration implements Serializable {
          if (other.name != null) {
             return false;
          }
-      }
-      else if (!name.equals(other.name)) {
+      } else if (!name.equals(other.name)) {
          return false;
       }
       if (initialConnectAttempts != other.initialConnectAttempts) {
@@ -566,8 +559,7 @@ public final class ClusterConnectionConfiguration implements Serializable {
          if (other.staticConnectors != null) {
             return false;
          }
-      }
-      else if (!staticConnectors.equals(other.staticConnectors)) {
+      } else if (!staticConnectors.equals(other.staticConnectors)) {
          return false;
       }
       return true;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index e78479a..f486a88 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -196,14 +196,14 @@ public interface Configuration {
     */
    Configuration setJMXDomain(String domain);
 
-  /**
-   * whether or not to use the broker name in the JMX tree
-   * */
+   /**
+    * whether or not to use the broker name in the JMX tree
+    */
    boolean isJMXUseBrokerName();
 
    /**
     * whether or not to use the broker name in the JMX tree
-    * */
+    */
    ConfigurationImpl setJMXUseBrokerName(boolean jmxUseBrokerName);
 
    /**
@@ -561,13 +561,16 @@ public interface Configuration {
     */
    Configuration setJournalCompactMinFiles(int minFiles);
 
-   /** Number of files that would be acceptable to keep on a pool. Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_POOL_FILES}.*/
+   /**
+    * Number of files that would be acceptable to keep on a pool. Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_POOL_FILES}.
+    */
    int getJournalPoolFiles();
 
-   /** Number of files that would be acceptable to keep on a pool. Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_POOL_FILES}.*/
+   /**
+    * Number of files that would be acceptable to keep on a pool. Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_POOL_FILES}.
+    */
    Configuration setJournalPoolFiles(int poolSize);
 
-
    /**
     * Returns the percentage of live data before compacting the journal. <br>
     * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}.
@@ -914,7 +917,7 @@ public interface Configuration {
    * */
    Configuration setResolveProtocols(boolean resolveProtocols);
 
-   TransportConfiguration[] getTransportConfigurations(String ...connectorNames);
+   TransportConfiguration[] getTransportConfigurations(String... connectorNames);
 
    TransportConfiguration[] getTransportConfigurations(List<String> connectorNames);
 
@@ -953,7 +956,9 @@ public interface Configuration {
 
    Configuration setPopulateValidatedUser(boolean populateValidatedUser);
 
-   /** It will return all the connectors in a toString manner for debug purposes. */
+   /**
+    * It will return all the connectors in a toString manner for debug purposes.
+    */
    String debugConnectors();
 
    Configuration setConnectionTtlCheckInterval(long connectionTtlCheckInterval);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
index bd626a5..4266860 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
@@ -86,8 +86,7 @@ public final class ConfigurationUtils {
             //if null default to colocated
             if (liveConf == null) {
                livePolicy = new ReplicatedPolicy();
-            }
-            else {
+            } else {
                livePolicy = getHAPolicy(liveConf);
             }
             HAPolicyConfiguration backupConf = pc.getBackupConfig();
@@ -95,20 +94,16 @@ public final class ConfigurationUtils {
             if (backupConf == null) {
                if (livePolicy instanceof ReplicatedPolicy) {
                   backupPolicy = new ReplicaPolicy();
-               }
-               else if (livePolicy instanceof SharedStoreMasterPolicy) {
+               } else if (livePolicy instanceof SharedStoreMasterPolicy) {
                   backupPolicy = new SharedStoreSlavePolicy();
-               }
-               else {
+               } else {
                   throw ActiveMQMessageBundle.BUNDLE.liveBackupMismatch();
                }
-            }
-            else {
+            } else {
                backupPolicy = (BackupPolicy) getHAPolicy(backupConf);
             }
 
-            if ((livePolicy instanceof ReplicatedPolicy && !(backupPolicy instanceof ReplicaPolicy)) ||
-                  (livePolicy instanceof SharedStoreMasterPolicy && !(backupPolicy instanceof SharedStoreSlavePolicy))) {
+            if ((livePolicy instanceof ReplicatedPolicy && !(backupPolicy instanceof ReplicaPolicy)) || (livePolicy instanceof SharedStoreMasterPolicy && !(backupPolicy instanceof SharedStoreSlavePolicy))) {
                throw ActiveMQMessageBundle.BUNDLE.liveBackupMismatch();
             }
             return new ColocatedPolicy(pc.isRequestBackup(), pc.getBackupRequestRetries(), pc.getBackupRequestRetryInterval(), pc.getMaxBackups(), pc.getBackupPortOffset(), pc.getExcludedConnectors(), livePolicy, backupPolicy);
@@ -122,8 +117,7 @@ public final class ConfigurationUtils {
       if (scaleDownConfiguration != null) {
          if (scaleDownConfiguration.getDiscoveryGroup() != null) {
             return new ScaleDownPolicy(scaleDownConfiguration.getDiscoveryGroup(), scaleDownConfiguration.getGroupName(), scaleDownConfiguration.getClusterName(), scaleDownConfiguration.isEnabled());
-         }
-         else {
+         } else {
             return new ScaleDownPolicy(scaleDownConfiguration.getConnectors(), scaleDownConfiguration.getGroupName(), scaleDownConfiguration.getClusterName(), scaleDownConfiguration.isEnabled());
          }
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
index daaca81..2e7b9ca 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
@@ -104,22 +104,19 @@ public class CoreQueueConfiguration implements Serializable {
       if (address == null) {
          if (other.address != null)
             return false;
-      }
-      else if (!address.equals(other.address))
+      } else if (!address.equals(other.address))
          return false;
       if (durable != other.durable)
          return false;
       if (filterString == null) {
          if (other.filterString != null)
             return false;
-      }
-      else if (!filterString.equals(other.filterString))
+      } else if (!filterString.equals(other.filterString))
          return false;
       if (name == null) {
          if (other.name != null)
             return false;
-      }
-      else if (!name.equals(other.name))
+      } else if (!name.equals(other.name))
          return false;
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java
index e8d77a3..a769f17 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/DivertConfiguration.java
@@ -84,8 +84,7 @@ public class DivertConfiguration implements Serializable {
    public DivertConfiguration setRoutingName(final String routingName) {
       if (routingName == null) {
          this.routingName = UUIDGenerator.getInstance().generateStringUUID();
-      }
-      else {
+      } else {
          this.routingName = routingName;
       }
       return this;
@@ -157,40 +156,34 @@ public class DivertConfiguration implements Serializable {
       if (address == null) {
          if (other.address != null)
             return false;
-      }
-      else if (!address.equals(other.address))
+      } else if (!address.equals(other.address))
          return false;
       if (exclusive != other.exclusive)
          return false;
       if (filterString == null) {
          if (other.filterString != null)
             return false;
-      }
-      else if (!filterString.equals(other.filterString))
+      } else if (!filterString.equals(other.filterString))
          return false;
       if (forwardingAddress == null) {
          if (other.forwardingAddress != null)
             return false;
-      }
-      else if (!forwardingAddress.equals(other.forwardingAddress))
+      } else if (!forwardingAddress.equals(other.forwardingAddress))
          return false;
       if (name == null) {
          if (other.name != null)
             return false;
-      }
-      else if (!name.equals(other.name))
+      } else if (!name.equals(other.name))
          return false;
       if (routingName == null) {
          if (other.routingName != null)
             return false;
-      }
-      else if (!routingName.equals(other.routingName))
+      } else if (!routingName.equals(other.routingName))
          return false;
       if (transformerClassName == null) {
          if (other.transformerClassName != null)
             return false;
-      }
-      else if (!transformerClassName.equals(other.transformerClassName))
+      } else if (!transformerClassName.equals(other.transformerClassName))
          return false;
       return true;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ScaleDownConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ScaleDownConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ScaleDownConfiguration.java
index 25721ca..5f58e36 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ScaleDownConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ScaleDownConfiguration.java
@@ -16,12 +16,12 @@
  */
 package org.apache.activemq.artemis.core.config;
 
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+
 public class ScaleDownConfiguration implements Serializable {
 
    private List<String> connectors = new ArrayList<>();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec48f9ed/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ColocatedPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ColocatedPolicyConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ColocatedPolicyConfiguration.java
index 1c5a903..5e9309f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ColocatedPolicyConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ha/ColocatedPolicyConfiguration.java
@@ -16,12 +16,12 @@
  */
 package org.apache.activemq.artemis.core.config.ha;
 
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
+
 public class ColocatedPolicyConfiguration implements HAPolicyConfiguration {
 
    private boolean requestBackup = ActiveMQDefaultConfiguration.isDefaultHapolicyRequestBackup();


Mime
View raw message