Skip to content

Commit 837e1bc

Browse files
garydgregorygarydgregory
committed
Add Checkstyle ParenPad and fix
1 parent c024925 commit 837e1bc

27 files changed

+186
-183
lines changed

‎src/main/java/org/apache/commons/lang3/BooleanUtils.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -763,11 +763,11 @@ public static Boolean toBooleanObject(final String str) {
763763
final char ch0 = str.charAt(0);
764764
final char ch1 = str.charAt(1);
765765
if ((ch0 == 'o' || ch0 == 'O') &&
766-
(ch1 == 'n' || ch1 == 'N') ) {
766+
(ch1 == 'n' || ch1 == 'N')) {
767767
return Boolean.TRUE;
768768
}
769769
if ((ch0 == 'n' || ch0 == 'N') &&
770-
(ch1 == 'o' || ch1 == 'O') ) {
770+
(ch1 == 'o' || ch1 == 'O')) {
771771
return Boolean.FALSE;
772772
}
773773
break;
@@ -778,12 +778,12 @@ public static Boolean toBooleanObject(final String str) {
778778
final char ch2 = str.charAt(2);
779779
if ((ch0 == 'y' || ch0 == 'Y') &&
780780
(ch1 == 'e' || ch1 == 'E') &&
781-
(ch2 == 's' || ch2 == 'S') ) {
781+
(ch2 == 's' || ch2 == 'S')) {
782782
return Boolean.TRUE;
783783
}
784784
if ((ch0 == 'o' || ch0 == 'O') &&
785785
(ch1 == 'f' || ch1 == 'F') &&
786-
(ch2 == 'f' || ch2 == 'F') ) {
786+
(ch2 == 'f' || ch2 == 'F')) {
787787
return Boolean.FALSE;
788788
}
789789
break;
@@ -796,7 +796,7 @@ public static Boolean toBooleanObject(final String str) {
796796
if ((ch0 == 't' || ch0 == 'T') &&
797797
(ch1 == 'r' || ch1 == 'R') &&
798798
(ch2 == 'u' || ch2 == 'U') &&
799-
(ch3 == 'e' || ch3 == 'E') ) {
799+
(ch3 == 'e' || ch3 == 'E')) {
800800
return Boolean.TRUE;
801801
}
802802
break;
@@ -811,7 +811,7 @@ public static Boolean toBooleanObject(final String str) {
811811
(ch1 == 'a' || ch1 == 'A') &&
812812
(ch2 == 'l' || ch2 == 'L') &&
813813
(ch3 == 's' || ch3 == 'S') &&
814-
(ch4 == 'e' || ch4 == 'E') ) {
814+
(ch4 == 'e' || ch4 == 'E')) {
815815
return Boolean.FALSE;
816816
}
817817
break;

‎src/main/java/org/apache/commons/lang3/StringEscapeUtils.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ public int translate(final CharSequence input, final int index, final Writer out
8484
throw new IllegalStateException("CsvUnescaper should never reach the [1] index");
8585
}
8686

87-
if ( input.charAt(0) != CSV_QUOTE || input.charAt(input.length() - 1) != CSV_QUOTE ) {
87+
if (input.charAt(0) != CSV_QUOTE || input.charAt(input.length() - 1) != CSV_QUOTE) {
8888
out.write(input.toString());
8989
return Character.codePointCount(input, 0, input.length());
9090
}
9191

9292
// strip quotes
9393
final String quoteless = input.subSequence(1, input.length() - 1).toString();
9494

95-
if ( StringUtils.containsAny(quoteless, CSV_SEARCH_CHARS) ) {
95+
if (StringUtils.containsAny(quoteless, CSV_SEARCH_CHARS)) {
9696
// deal with escaped quotes; ie) ""
9797
out.write(Strings.CS.replace(quoteless, CSV_QUOTE_STR + CSV_QUOTE_STR, CSV_QUOTE_STR));
9898
} else {
@@ -570,7 +570,7 @@ public static final String escapeJson(final String input) {
570570
* <p>Note that Unicode characters greater than 0x7f are as of 3.0, no longer
571571
* escaped. If you still wish this functionality, you can achieve it
572572
* via the following:
573-
* {@code StringEscapeUtils.ESCAPE_XML.with( NumericEntityEscaper.between(0x7f, Integer.MAX_VALUE) );}</p>
573+
* {@code StringEscapeUtils.ESCAPE_XML.with( NumericEntityEscaper.between(0x7f, Integer.MAX_VALUE));}</p>
574574
*
575575
* @param input the {@link String} to escape, may be null
576576
* @return a new escaped {@link String}, {@code null} if null string input

‎src/main/java/org/apache/commons/lang3/StringUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3339,7 +3339,7 @@ public static boolean isAlphanumericSpace(final CharSequence cs) {
33393339
final int sz = cs.length();
33403340
for (int i = 0; i < sz; i++) {
33413341
final char nowChar = cs.charAt(i);
3342-
if (nowChar != ' ' && !Character.isLetterOrDigit(nowChar) ) {
3342+
if (nowChar != ' ' && !Character.isLetterOrDigit(nowChar)) {
33433343
return false;
33443344
}
33453345
}
@@ -7338,7 +7338,7 @@ public static String[] splitByWholeSeparator(final String str, final String sepa
73387338
* array. A zero or negative value implies no limit.
73397339
* @return an array of parsed Strings, {@code null} if null String was input
73407340
*/
7341-
public static String[] splitByWholeSeparator( final String str, final String separator, final int max) {
7341+
public static String[] splitByWholeSeparator(final String str, final String separator, final int max) {
73427342
return splitByWholeSeparatorWorker(str, separator, max, false);
73437343
}
73447344

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ protected Exception getTypedException(final Exception e) {
339339
*/
340340
@Override
341341
public synchronized boolean isInitialized() {
342-
if (future == null || ! future.isDone() ) {
342+
if (future == null || ! future.isDone()) {
343343
return false;
344344
}
345345

‎src/main/java/org/apache/commons/lang3/math/Fraction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ private Fraction addSub(final Fraction fraction, final boolean isAdd) {
530530
// of the time.
531531
final int d1 = greatestCommonDivisor(denominator, fraction.denominator);
532532
if (d1 == 1) {
533-
// result is ( (u*v' +/- u'v) / u'v')
533+
// result is ((u*v' +/- u'v) / u'v')
534534
final int uvp = mulAndCheck(numerator, fraction.denominator);
535535
final int upv = mulAndCheck(fraction.numerator, denominator);
536536
return new Fraction(isAdd ? addAndCheck(uvp, upv) : subAndCheck(uvp, upv), mulPosAndCheck(denominator,

‎src/main/java/org/apache/commons/lang3/text/translate/NumericEntityUnescaper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ public int translate(final CharSequence input, final int index, final Writer out
116116

117117
int end = start;
118118
// Note that this supports character codes without a ; on the end
119-
while (end < seqEnd && ( input.charAt(end) >= '0' && input.charAt(end) <= '9' ||
119+
while (end < seqEnd && (input.charAt(end) >= '0' && input.charAt(end) <= '9' ||
120120
input.charAt(end) >= 'a' && input.charAt(end) <= 'f' ||
121-
input.charAt(end) >= 'A' && input.charAt(end) <= 'F' ) ) {
121+
input.charAt(end) >= 'A' && input.charAt(end) <= 'F')) {
122122
end++;
123123
}
124124

‎src/main/java/org/apache/commons/lang3/text/translate/OctalUnescaper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private boolean isZeroToThree(final char ch) {
6767
public int translate(final CharSequence input, final int index, final Writer out) throws IOException {
6868
final int remaining = input.length() - index - 1; // how many characters left, ignoring the first \
6969
final StringBuilder builder = new StringBuilder();
70-
if (input.charAt(index) == '\\' && remaining > 0 && isOctalDigit(input.charAt(index + 1)) ) {
70+
if (input.charAt(index) == '\\' && remaining > 0 && isOctalDigit(input.charAt(index + 1))) {
7171
final int next = index + 1;
7272
final int next2 = index + 2;
7373
final int next3 = index + 3;
@@ -82,7 +82,7 @@ public int translate(final CharSequence input, final int index, final Writer out
8282
}
8383
}
8484

85-
out.write( Integer.parseInt(builder.toString(), 8) );
85+
out.write(Integer.parseInt(builder.toString(), 8));
8686
return 1 + builder.length();
8787
}
8888
return 0;

‎src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ public boolean equals(final Object obj) {
445445
*/
446446
@Override
447447
public int hashCode() {
448-
return (style * 31 + locale.hashCode() ) * 31 + timeZone.hashCode();
448+
return (style * 31 + locale.hashCode()) * 31 + timeZone.hashCode();
449449
}
450450
}
451451
/**

‎src/site/resources/checkstyle/checkstyle.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,6 @@ limitations under the License.
6262
</module>
6363
<module name="MissingOverride"/>
6464
<module name="ArrayTypeStyle"/>
65+
<module name="ParenPad"/>
6566
</module>
6667
</module>

‎src/test/java/org/apache/commons/lang3/CharSetTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public void testEquals_Object() {
389389

390390
@Test
391391
public void testGetInstance() {
392-
assertSame(CharSet.EMPTY, CharSet.getInstance( (String) null));
392+
assertSame(CharSet.EMPTY, CharSet.getInstance((String) null));
393393
assertSame(CharSet.EMPTY, CharSet.getInstance(""));
394394
assertSame(CharSet.ASCII_ALPHA, CharSet.getInstance("a-zA-Z"));
395395
assertSame(CharSet.ASCII_ALPHA, CharSet.getInstance("A-Za-z"));

0 commit comments

Comments
 (0)