[RESTEASY-1974] Checkstyle - Modifiers order

eagledns/src/main/java/se/unlogic/standardutils/crypto/Base64.java

@@ -120,61 +120,61 @@ public class Base64 {
    /* ******** P U B L I C F I E L D S ******** */
 
    /** No options specified. Value is zero. */
-   public final static int NO_OPTIONS = 0;
+   public static final int NO_OPTIONS = 0;
 
    /** Specify encoding in first bit. Value is one. */
-   public final static int ENCODE = 1;
+   public static final int ENCODE = 1;
 
    /** Specify decoding in first bit. Value is zero. */
-   public final static int DECODE = 0;
+   public static final int DECODE = 0;
 
    /** Specify that data should be gzip-compressed in second bit. Value is two. */
-   public final static int GZIP = 2;
+   public static final int GZIP = 2;
 
    /** Specify that gzipped data should <em>not</em> be automatically gunzipped. */
-   public final static int DONT_GUNZIP = 4;
+   public static final int DONT_GUNZIP = 4;
 
    /** Do break lines when encoding. Value is 8. */
-   public final static int DO_BREAK_LINES = 8;
+   public static final int DO_BREAK_LINES = 8;
 
    /**
     * Encode using Base64-like encoding that is URL- and Filename-safe as described in Section 4 of RFC3548: <a
     * href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>. It is important to note that data encoded this way is
     * <em>not</em> officially valid Base64, or at the very least should not be called Base64 without also specifying that is was encoded using the URL- and
     * Filename-safe dialect.
     */
-   public final static int URL_SAFE = 16;
+   public static final int URL_SAFE = 16;
 
    /**
     * Encode using the special "ordered" dialect of Base64 described here: <a
     * href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
     */
-   public final static int ORDERED = 32;
+   public static final int ORDERED = 32;
 
    /* ******** P R I V A T E F I E L D S ******** */
 
    /** Maximum line length (76) of Base64 output. */
-   private final static int MAX_LINE_LENGTH = 76;
+   private static final int MAX_LINE_LENGTH = 76;
 
    /** The equals sign (=) as a byte. */
-   private final static byte EQUALS_SIGN = (byte) '=';
+   private static final byte EQUALS_SIGN = (byte) '=';
 
    /** The new line character (\n) as a byte. */
-   private final static byte NEW_LINE = (byte) '\n';
+   private static final byte NEW_LINE = (byte) '\n';
 
    /** Preferred encoding. */
-   private final static String PREFERRED_ENCODING = "US-ASCII";
+   private static final String PREFERRED_ENCODING = "US-ASCII";
 
-   private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
-   private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
+   private static final byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
+   private static final byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
 
-   private final static Logger logger = Logger.getLogger(Base64.class);
+   private static final Logger logger = Logger.getLogger(Base64.class);
 
    /* ******** S T A N D A R D B A S E 6 4 A L P H A B E T ******** */
 
    /** The 64 valid Base64 values. */
    /* Host platform me be something funny like EBCDIC, so we hardcode these values. */
-   private final static byte[] _STANDARD_ALPHABET = {
+   private static final byte[] _STANDARD_ALPHABET = {
       (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G',
       (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N',
       (byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U',
@@ -190,7 +190,7 @@ public class Base64 {
    /**
     * Translates a Base64 value to either its 6-bit reconstruction value or a negative number indicating some other meaning.
     **/
-   private final static byte[] _STANDARD_DECODABET = {
+   private static final byte[] _STANDARD_DECODABET = {
       -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal  0 -  8
       -5, -5, // Whitespace: Tab and Linefeed
       -9, -9, // Decimal 11 - 12
@@ -231,7 +231,7 @@ public class Base64 {
     * href="http://www.faqs.org/rfcs/rfc3548.html">http://www.faqs.org/rfcs/rfc3548.html</a>. Notice that the last two bytes become "hyphen" and "underscore"
     * instead of "plus" and "slash."
     */
-   private final static byte[] _URL_SAFE_ALPHABET = {
+   private static final byte[] _URL_SAFE_ALPHABET = {
       (byte) 'A', (byte) 'B', (byte) 'C', (byte) 'D', (byte) 'E', (byte) 'F', (byte) 'G',
       (byte) 'H', (byte) 'I', (byte) 'J', (byte) 'K', (byte) 'L', (byte) 'M', (byte) 'N',
       (byte) 'O', (byte) 'P', (byte) 'Q', (byte) 'R', (byte) 'S', (byte) 'T', (byte) 'U',
@@ -247,7 +247,7 @@ public class Base64 {
    /**
     * Used in decoding URL- and Filename-safe dialects of Base64.
     */
-   private final static byte[] _URL_SAFE_DECODABET = {
+   private static final byte[] _URL_SAFE_DECODABET = {
       -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal  0 -  8
       -5, -5, // Whitespace: Tab and Linefeed
       -9, -9, // Decimal 11 - 12
@@ -291,7 +291,7 @@ public class Base64 {
     * I don't get the point of this technique, but someone requested it, and it is described here: <a
     * href="http://www.faqs.org/qa/rfcc-1940.html">http://www.faqs.org/qa/rfcc-1940.html</a>.
     */
-   private final static byte[] _ORDERED_ALPHABET = {
+   private static final byte[] _ORDERED_ALPHABET = {
       (byte) '-',
       (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4',
       (byte) '5', (byte) '6', (byte) '7', (byte) '8', (byte) '9',
@@ -309,7 +309,7 @@ public class Base64 {
    /**
     * Used in decoding the "ordered" dialect of Base64.
     */
-   private final static byte[] _ORDERED_DECODABET = {
+   private static final byte[] _ORDERED_DECODABET = {
       -9, -9, -9, -9, -9, -9, -9, -9, -9, // Decimal  0 -  8
       -5, -5, // Whitespace: Tab and Linefeed
       -9, -9, // Decimal 11 - 12

eagledns/src/main/java/se/unlogic/standardutils/io/FileUtils.java

@@ -34,7 +34,7 @@ public static String toValidHttpFilename(String string) {
       return string.replaceAll("[^0-9a-�A-�-+. ()-+!@�&%$�=�]", "_");
    }
 
-   public final static byte[] getRawBytes(File f) throws IOException {
+   public static final byte[] getRawBytes(File f) throws IOException {
       FileInputStream fin = new FileInputStream(f);
       byte[] buffer = new byte[(int) f.length()];
       fin.read(buffer);

eagledns/src/main/java/se/unlogic/standardutils/populators/BeanStringPopulatorRegistery.java

@@ -7,7 +7,7 @@
 
 public class BeanStringPopulatorRegistery {
 
-   private final static HashMap<Class<?>, BeanStringPopulator<?>> TYPE_POPULATORS = new HashMap<Class<?>, BeanStringPopulator<?>>();
+   private static final HashMap<Class<?>, BeanStringPopulator<?>> TYPE_POPULATORS = new HashMap<Class<?>, BeanStringPopulator<?>>();
 
    static{
       addTypePopulator(new UUIDPopulator());

eagledns/src/main/java/se/unlogic/standardutils/populators/QueryParameterPopulatorRegistery.java

@@ -7,7 +7,7 @@
 
 public class QueryParameterPopulatorRegistery {
 
-   private final static HashMap<Class<?>, QueryParameterPopulator<?>> QUERY_PARAMETER_POPULATORS = new HashMap<Class<?>, QueryParameterPopulator<?>>();
+   private static final HashMap<Class<?>, QueryParameterPopulator<?>> QUERY_PARAMETER_POPULATORS = new HashMap<Class<?>, QueryParameterPopulator<?>>();
 
    static{
       addTypePopulator(new UUIDPopulator());

eagledns/src/main/java/se/unlogic/standardutils/threads/ThreadPoolTaskGroupHandler.java

@@ -35,7 +35,7 @@ public class ThreadPoolTaskGroupHandler<T extends TaskGroup> implements TaskGrou
 
    protected final ArrayList<Thread> threads = new ArrayList<Thread>();
 
-   private final static Logger logger = Logger.getLogger(ThreadPoolTaskGroupHandler.class);
+   private static final Logger logger = Logger.getLogger(ThreadPoolTaskGroupHandler.class);
 
    public ThreadPoolTaskGroupHandler(final int poolSize, final boolean daemon){
 

eagledns/src/main/java/se/unlogic/standardutils/xml/XMLUtils.java

@@ -40,7 +40,7 @@ public class XMLUtils {
 
    private static DocumentBuilder documentBuilder;
    private static DocumentBuilder namespaceAwareDocumentBuilder;
-   private final static Logger logger = Logger.getLogger(XMLUtils.class);
+   private static final Logger logger = Logger.getLogger(XMLUtils.class);
 
    static {
       try {

providers/jackson/src/test/java/org/jboss/resteasy/test/nextgen/providers/jackson/ProxyWithGenericReturnTypeJacksonTest.java

@@ -132,7 +132,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
    }
 
    @Path("/")
-   static public class TestResource
+   public static class TestResource
    {
       @Produces("text/plain")
       @Path("test")

providers/jaxb/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java

@@ -17,7 +17,7 @@
  *
  * Copyright Aug 24, 2015
  */
-abstract public class TestMessagesAbstract extends TestMessagesParent
+public abstract class TestMessagesAbstract extends TestMessagesParent
 {
    private static final Logger LOG = Logger.getLogger(TestMessagesAbstract.class);
    protected String BASE = String.format("00%4s", Messages.BASE).substring(0, 4);
@@ -44,5 +44,5 @@ protected int getExpectedNumberOfMethods()
       return Messages.class.getDeclaredMethods().length;
    }
 
-   abstract protected Locale getLocale();
+   protected abstract Locale getLocale();
 }

providers/jaxb/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java

@@ -15,20 +15,20 @@
  *
  * Copyright Oct 8, 2014
  */
-abstract public class TestMessagesParent
+public abstract class TestMessagesParent
 {
    private static final Logger LOG = Logger.getLogger(TestMessagesParent.class);
-   static protected Locale savedLocale;
+   protected static Locale savedLocale;
    protected Properties properties = new Properties();
 
    @BeforeClass
-   static public void beforeClass()
+   public static void beforeClass()
    {
       savedLocale = Locale.getDefault();
    }
 
    @AfterClass
-   static public void afterClass()
+   public static void afterClass()
    {
       Locale.setDefault(savedLocale);
       LOG.info("Reset default locale to: " + savedLocale);
@@ -78,6 +78,6 @@ protected String replacePositionalSpecifiers(String s)
       return s;
    }
 
-   abstract protected int getExpectedNumberOfMethods();
-   abstract protected Locale getLocale();
+   protected abstract int getExpectedNumberOfMethods();
+   protected abstract Locale getLocale();
 }

providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java

@@ -15,7 +15,7 @@
  *
  * Copyright Aug 24, 2015
  */
-abstract public class TestMessagesAbstract extends TestMessagesParent
+public abstract class TestMessagesAbstract extends TestMessagesParent
 {
    private static final Logger LOG = Logger.getLogger(TestMessagesAbstract.class);
    protected final String dir = "org/jboss/resteasy/providers/jaxb/json/i18n/Messages.i18n_";
@@ -43,5 +43,5 @@ protected int getExpectedNumberOfMethods()
       return Messages.class.getDeclaredMethods().length;
    }
 
-   abstract protected Locale getLocale();
+   protected abstract Locale getLocale();
 }

providers/jettison/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java

@@ -15,20 +15,20 @@
  *
  * Copyright Oct 8, 2014
  */
-abstract public class TestMessagesParent
+public abstract class TestMessagesParent
 {
    private static final Logger LOG = Logger.getLogger(TestMessagesParent.class);
-   static protected Locale savedLocale;
+   protected static Locale savedLocale;
    protected Properties properties = new Properties();
 
    @BeforeClass
-   static public void beforeClass()
+   public static void beforeClass()
    {
       savedLocale = Locale.getDefault();
    }
 
    @AfterClass
-   static public void afterClass()
+   public static void afterClass()
    {
       Locale.setDefault(savedLocale);
       LOG.info("Reset default locale to: " + savedLocale);
@@ -78,6 +78,6 @@ protected String replacePositionalSpecifiers(String s)
       return s;
    }
 
-   abstract protected int getExpectedNumberOfMethods();
-   abstract protected Locale getLocale();
+   protected abstract int getExpectedNumberOfMethods();
+   protected abstract Locale getLocale();
 }

providers/resteasy-atom/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java

@@ -17,7 +17,7 @@
  *
  * Copyright Sep 27, 2014
  */
-abstract public class TestMessagesAbstract extends TestMessagesParent
+public abstract class TestMessagesAbstract extends TestMessagesParent
 {
    private static final Logger LOG = Logger.getLogger(TestMessagesAbstract.class);
    protected String BASE = String.format("00%4s", Messages.BASE).substring(0, 4);
@@ -45,5 +45,5 @@ protected int getExpectedNumberOfMethods()
       return Messages.class.getDeclaredMethods().length;
    }
 
-   abstract protected Locale getLocale();
+   protected abstract Locale getLocale();
 }

providers/resteasy-atom/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java

@@ -15,20 +15,20 @@
  *
  * Copyright Oct 8, 2014
  */
-abstract public class TestMessagesParent
+public abstract class TestMessagesParent
 {
    private static final Logger LOG = Logger.getLogger(TestMessagesParent.class);
-   static protected Locale savedLocale;
+   protected static Locale savedLocale;
    protected Properties properties = new Properties();
 
    @BeforeClass
-   static public void beforeClass()
+   public static void beforeClass()
    {
       savedLocale = Locale.getDefault();
    }
 
    @AfterClass
-   static public void afterClass()
+   public static void afterClass()
    {
       Locale.setDefault(savedLocale);
       LOG.info("Reset default locale to: " + savedLocale);
@@ -78,6 +78,6 @@ protected String replacePositionalSpecifiers(String s)
       return s;
    }
 
-   abstract protected int getExpectedNumberOfMethods();
-   abstract protected Locale getLocale();
+   protected abstract int getExpectedNumberOfMethods();
+   protected abstract Locale getLocale();
 }

providers/resteasy-html/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesAbstract.java

@@ -15,7 +15,7 @@
  *
  * Copyright Aug 24, 2015
  */
-abstract public class TestMessagesAbstract extends TestMessagesParent
+public abstract class TestMessagesAbstract extends TestMessagesParent
 {
    private static final Logger LOG = Logger.getLogger(TestMessagesAbstract.class);
    protected String BASE = String.format("00%4s", Messages.BASE).substring(0, 4);
@@ -40,5 +40,5 @@ protected int getExpectedNumberOfMethods()
       return Messages.class.getDeclaredMethods().length;
    }
 
-   abstract protected Locale getLocale();
+   protected abstract Locale getLocale();
 }

providers/resteasy-html/src/test/java/org/jboss/resteasy/test/i18n/TestMessagesParent.java

@@ -15,20 +15,20 @@
  *
  * Copyright Oct 8, 2014
  */
-abstract public class TestMessagesParent
+public abstract class TestMessagesParent
 {
    private static final Logger LOG = Logger.getLogger(TestMessagesParent.class);
-   static protected Locale savedLocale;
+   protected static Locale savedLocale;
    protected Properties properties = new Properties();
 
    @BeforeClass
-   static public void beforeClass()
+   public static void beforeClass()
    {
       savedLocale = Locale.getDefault();
    }
 
    @AfterClass
-   static public void afterClass()
+   public static void afterClass()
    {
       Locale.setDefault(savedLocale);
       LOG.info("Reset default locale to: " + savedLocale);
@@ -78,6 +78,6 @@ protected String replacePositionalSpecifiers(String s)
       return s;
    }
 
-   abstract protected int getExpectedNumberOfMethods();
-   abstract protected Locale getLocale();
+   protected abstract int getExpectedNumberOfMethods();
+   protected abstract Locale getLocale();
 }

providers/resteasy-validator-provider-11/src/main/java/org/jboss/resteasy/plugins/validation/AbstractValidatorContextResolver.java

@@ -29,7 +29,7 @@
 public class AbstractValidatorContextResolver
 {
    private volatile ValidatorFactory validatorFactory;
-   final static Object RD_LOCK = new Object();
+   static final Object RD_LOCK = new Object();
    private volatile Configuration<?> config;
    private volatile BootstrapConfiguration bootstrapConfiguration;