Sonar: Reorder modifiers ...

... to comply with the Java Language Specification.

Change-Id: I670b63d32ce0e8d4f9d0814a5fdbefa989064319
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java
index 2b300d7c3214653e0366072ea1a1f91bd3307b34..c2ed1e05f5709bd81a1386ad7d8b4bbfd70745c5 100644 (file)
--- a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java
+++ b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java
@@ -275,7 +275,7 @@ public abstract class BaseExpectations extends Expectations {
     }
 
     @SafeVarargs
-    protected final static <T> Matcher<T[]> contains(final T... expected) {
+    protected static final <T> Matcher<T[]> contains(final T... expected) {
         return new BaseMatcher<T[]>() {
             @SuppressWarnings("unchecked")
             public boolean matches(Object actual) {
@@ -301,7 +301,7 @@ public abstract class BaseExpectations extends Expectations {
     }
 
     @SafeVarargs
-    protected final static <T> Matcher<T[]> sameArbitraryArray(final T... expectedArr) {
+    protected static final <T> Matcher<T[]> sameArbitraryArray(final T... expectedArr) {
         return new TypeSafeMatcher<T[]>() {
             @Override
             public boolean matchesSafely(T[] actualArr) {
@@ -321,7 +321,7 @@ public abstract class BaseExpectations extends Expectations {
     }
 
     @SafeVarargs
-    protected final static <T> Matcher<T[]> doseNotContain(final T... forbiddenValues) {
+    protected static final <T> Matcher<T[]> doseNotContain(final T... forbiddenValues) {
         return new TypeSafeMatcher<T[]>() {
             @Override
             public boolean matchesSafely(T[] arr) {

diff --git a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java
index c1c832b66aab0f1b3ce7f871c9f0987e38bc12a8..a88e13ab89d547bf4cdb6e55962ada75217134f0 100644 (file)
--- a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java
+++ b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java
@@ -121,8 +121,8 @@ public abstract class BaseTestCase extends BaseExpectations {
         return null;
     }
 
-    static protected final class FieldData {
-        final public Field field;
+    protected static final class FieldData {
+        public final Field field;
         public Object value;
 
         public FieldData(Field field, Object value) {