Skip to content

Commit ac3ed05

Browse files
committed
Fix pmd and findbugs warnings.
1 parent 517e344 commit ac3ed05

File tree

4 files changed

+10
-16
lines changed
  • lodash-plugin
  • string-plugin

4 files changed

+10
-16
lines changed

lodash-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.github.javadev</groupId>
66
<artifactId>underscore-lodash</artifactId>
77
<packaging>jar</packaging>
8-
<version>1.0-SNAPSHOT</version>
8+
<version>1.1-SNAPSHOT</version>
99
<name>Lodash plugin for underscore-java</name>
1010
<description>The lodash plugin for underscore-java</description>
1111
<url>https://github.com/javadev/underscore-java</url>

lodash-plugin/src/main/java/com/github/underscore/lodash/$.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class $<T> extends com.github.underscore.$<T> {
3333
private static final String DEFAULT_TRUNC_OMISSION = "...";
3434
private static final java.util.regex.Pattern RE_LATIN_1 = java.util.regex.Pattern.compile(
3535
"[\\xc0-\\xd6\\xd8-\\xde\\xdf-\\xf6\\xf8-\\xff]");
36-
private static Map<String, String> deburredLetters = new LinkedHashMap<String, String>() { {
36+
private static final Map<String, String> DEBURRED_LETTERS = new LinkedHashMap<String, String>() { {
3737
put("\u00c0", "A"); put("\u00c1", "A"); put("\u00c2", "A"); put("\u00c3", "A");
3838
put("\u00c4", "A"); put("\u00c5", "A");
3939
put("\u00e0", "a"); put("\u00e1", "a"); put("\u00e2", "a"); put("\u00e3", "a");
@@ -623,22 +623,22 @@ public static String camelCase(final String string) {
623623
return createCompounder(new Function3<String, String, Integer, String>() {
624624
public String apply(final String result, final String word, final Integer index) {
625625
final String localWord = word.toLowerCase(Locale.getDefault());
626-
return result + (index > 0 ? (word.substring(0, 1).toUpperCase(Locale.getDefault())
627-
+ word.substring(1)) : localWord);
626+
return result + (index > 0 ? word.substring(0, 1).toUpperCase(Locale.getDefault())
627+
+ word.substring(1) : localWord);
628628
}
629629
}).apply(string);
630630
}
631631

632632
public static String capitalize(final String string) {
633633
final String localString = baseToString(string);
634-
return localString.isEmpty() ? "" : (localString.substring(0, 1).toUpperCase(Locale.getDefault())
635-
+ (localString.length() > 1 ? localString.substring(1) : ""));
634+
return localString.isEmpty() ? "" : localString.substring(0, 1).toUpperCase(Locale.getDefault())
635+
+ (localString.length() > 1 ? localString.substring(1) : "");
636636
}
637637

638638
public static String uncapitalize(final String string) {
639639
final String localString = baseToString(string);
640-
return localString.isEmpty() ? "" : (localString.substring(0, 1).toLowerCase(Locale.getDefault())
641-
+ (localString.length() > 1 ? localString.substring(1) : ""));
640+
return localString.isEmpty() ? "" : localString.substring(0, 1).toLowerCase(Locale.getDefault())
641+
+ (localString.length() > 1 ? localString.substring(1) : "");
642642
}
643643

644644
private static String baseToString(String value) {
@@ -650,7 +650,7 @@ public static String deburr(final String string) {
650650
final StringBuilder sb = new StringBuilder();
651651
for (final String str : localString.split("")) {
652652
if (RE_LATIN_1.matcher(str).matches()) {
653-
sb.append(deburredLetters.get(str));
653+
sb.append(DEBURRED_LETTERS.get(str));
654654
} else {
655655
sb.append(str);
656656
}
@@ -706,7 +706,6 @@ public static boolean endsWith(final String string, final String target, final I
706706
public static String kebabCase(final String string) {
707707
return createCompounder(new Function3<String, String, Integer, String>() {
708708
public String apply(final String result, final String word, final Integer index) {
709-
final String localWord = word.toLowerCase(Locale.getDefault());
710709
return result + (index > 0 ? "-" : "") + word.toLowerCase(Locale.getDefault());
711710
}
712711
}).apply(string);
@@ -782,7 +781,6 @@ public static String padRight(final String string, final Integer length, final S
782781
public static String snakeCase(final String string) {
783782
return createCompounder(new Function3<String, String, Integer, String>() {
784783
public String apply(final String result, final String word, final Integer index) {
785-
final String localWord = word.toLowerCase(Locale.getDefault());
786784
return result + (index > 0 ? "_" : "") + word.toLowerCase(Locale.getDefault());
787785
}
788786
}).apply(string);
@@ -791,7 +789,6 @@ public String apply(final String result, final String word, final Integer index)
791789
public static String startCase(final String string) {
792790
return createCompounder(new Function3<String, String, Integer, String>() {
793791
public String apply(final String result, final String word, final Integer index) {
794-
final String localWord = word.toLowerCase(Locale.getDefault());
795792
return result + (index > 0 ? " " : "") + word.substring(0, 1).toUpperCase(Locale.getDefault())
796793
+ word.substring(1);
797794
}

string-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<groupId>com.github.javadev</groupId>
66
<artifactId>underscore-string</artifactId>
77
<packaging>jar</packaging>
8-
<version>1.0-SNAPSHOT</version>
8+
<version>1.1-SNAPSHOT</version>
99
<name>String plugin for underscore-java</name>
1010
<description>The string plugin for underscore-java</description>
1111
<url>https://github.com/javadev/underscore-java</url>

string-plugin/src/main/java/com/github/underscore/string/$.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ public static boolean endsWith(final String string, final String target, final I
288288
public static String kebabCase(final String string) {
289289
return createCompounder(new Function3<String, String, Integer, String>() {
290290
public String apply(final String result, final String word, final Integer index) {
291-
final String localWord = word.toLowerCase(Locale.getDefault());
292291
return result + (index > 0 ? "-" : "") + word.toLowerCase(Locale.getDefault());
293292
}
294293
}).apply(string);
@@ -364,7 +363,6 @@ public static String padRight(final String string, final Integer length, final S
364363
public static String snakeCase(final String string) {
365364
return createCompounder(new Function3<String, String, Integer, String>() {
366365
public String apply(final String result, final String word, final Integer index) {
367-
final String localWord = word.toLowerCase(Locale.getDefault());
368366
return result + (index > 0 ? "_" : "") + word.toLowerCase(Locale.getDefault());
369367
}
370368
}).apply(string);
@@ -373,7 +371,6 @@ public String apply(final String result, final String word, final Integer index)
373371
public static String startCase(final String string) {
374372
return createCompounder(new Function3<String, String, Integer, String>() {
375373
public String apply(final String result, final String word, final Integer index) {
376-
final String localWord = word.toLowerCase(Locale.getDefault());
377374
return result + (index > 0 ? " " : "") + word.substring(0, 1).toUpperCase(Locale.getDefault())
378375
+ word.substring(1);
379376
}

0 commit comments

Comments
 (0)