Skip to content

Commit 8a8b8ec

Browse files
committed
Make sure modifiers are in JLS order
1 parent d0650d1 commit 8a8b8ec

File tree

12 files changed

+24
-22
lines changed

12 files changed

+24
-22
lines changed

checkstyle.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ limitations under the License.
4646
<property name="allowUndeclaredRTE" value="true"/>
4747
<property name="scope" value="public" />
4848
</module>
49+
<module name="ModifierOrder"/>
4950
<module name="UpperEll" />
5051
</module>
5152
</module>

src/main/java/org/apache/commons/lang3/ThreadUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public interface ThreadGroupPredicate /*extends java.util.function.Predicate<Thr
272272
/**
273273
* A predicate implementation which always returns true.
274274
*/
275-
private final static class AlwaysTruePredicate implements ThreadPredicate, ThreadGroupPredicate{
275+
private static final class AlwaysTruePredicate implements ThreadPredicate, ThreadGroupPredicate{
276276

277277
private AlwaysTruePredicate() {
278278
}

src/main/java/org/apache/commons/lang3/concurrent/BackgroundInitializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public synchronized Future<T> getFuture() {
244244
*
245245
* @return the {@code ExecutorService} for executing the background task
246246
*/
247-
protected synchronized final ExecutorService getActiveExecutor() {
247+
protected final synchronized ExecutorService getActiveExecutor() {
248248
return executor;
249249
}
250250

src/main/java/org/apache/commons/lang3/concurrent/ThresholdCircuitBreaker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class ThresholdCircuitBreaker extends AbstractCircuitBreaker<Long> {
5555
/**
5656
* The initial value of the internal counter.
5757
*/
58-
private final static long INITIAL_COUNT = 0L;
58+
private static final long INITIAL_COUNT = 0L;
5959

6060
/**
6161
* The threshold.

src/main/java/org/apache/commons/lang3/time/FastDateParser.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ int getMaxWidth(final ListIterator<StrategyAndWidth> lt) {
201201
* Parse format into Strategies
202202
*/
203203
private class StrategyParser {
204-
final private Calendar definingCalendar;
204+
private final Calendar definingCalendar;
205205
private int currentIdx;
206206

207207
StrategyParser(final Calendar definingCalendar) {
@@ -491,7 +491,7 @@ private int adjustYear(final int twoDigitYear) {
491491
/**
492492
* A strategy to parse a single field from the parsing pattern
493493
*/
494-
private static abstract class Strategy {
494+
private abstract static class Strategy {
495495
/**
496496
* Is this field a number?
497497
* The default implementation returns false.
@@ -508,7 +508,7 @@ boolean isNumber() {
508508
/**
509509
* A strategy to parse a single field from the parsing pattern
510510
*/
511-
private static abstract class PatternStrategy extends Strategy {
511+
private abstract static class PatternStrategy extends Strategy {
512512

513513
private Pattern pattern;
514514

@@ -648,7 +648,7 @@ private Strategy getLocaleSpecificStrategy(final int field, final Calendar defin
648648
*/
649649
private static class CopyQuotedStrategy extends Strategy {
650650

651-
final private String formatField;
651+
private final String formatField;
652652

653653
/**
654654
* Construct a Strategy that ensures the formatField has literal text

src/main/java/org/apache/commons/lang3/time/FormatCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public F getInstance(final String pattern, TimeZone timeZone, Locale locale) {
101101
* @throws IllegalArgumentException if pattern is invalid
102102
* or <code>null</code>
103103
*/
104-
abstract protected F createInstance(String pattern, TimeZone timeZone, Locale locale);
104+
protected abstract F createInstance(String pattern, TimeZone timeZone, Locale locale);
105105

106106
/**
107107
* <p>Gets a date/time formatter instance using the specified style,

src/test/java/org/apache/commons/lang3/CharSequenceUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public String toString(){
137137
new TestData("Abcd",false, 1, "abcD",1, 2, true),
138138
};
139139

140-
private static abstract class RunTest {
140+
private abstract static class RunTest {
141141

142142
abstract boolean invoke();
143143

src/test/java/org/apache/commons/lang3/CharUtilsPerfRun.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ Sun Microsystems Inc. Java HotSpot(TM) Server VM 1.4.2_04-b05
5656
5757
*/
5858
public class CharUtilsPerfRun {
59-
final static String VERSION = "$Id$";
59+
private static final String VERSION = "$Id$";
6060

61-
final static int WARM_UP = 100;
61+
private static final int WARM_UP = 100;
6262

63-
final static int COUNT = 5000;
63+
private static final int COUNT = 5000;
64+
65+
private static final char[] CHAR_SAMPLES;
6466

65-
final static char[] CHAR_SAMPLES;
6667
static {
6768
CHAR_SAMPLES = new char[Character.MAX_VALUE];
6869
for (char i = Character.MIN_VALUE; i < Character.MAX_VALUE; i++) {

src/test/java/org/apache/commons/lang3/StringEscapeUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
@Deprecated
4242
public class StringEscapeUtilsTest {
43-
private final static String FOO = "foo";
43+
private static final String FOO = "foo";
4444

4545
@Test
4646
public void testConstructor() {

src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ static class TestSubObject extends TestObject {
109109
private int b;
110110

111111
@SuppressWarnings("unused")
112-
transient private int t;
112+
private transient int t;
113113

114114
public TestSubObject() {
115115
super(0);

0 commit comments

Comments
 (0)