Skip to content

Commit 92a5cf7

Browse files
javadevjavadev
authored
Resolved Idea warnings
1 parent e4fe014 commit 92a5cf7

File tree

3 files changed

+34
-38
lines changed

3 files changed

+34
-38
lines changed

‎src/main/java/com/github/underscore/Json.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ public JsonStringBuilder append(final String string) {
8383
}
8484

8585
public JsonStringBuilder fillSpaces() {
86-
for (int index = 0; index < indent; index += 1) {
87-
builder.append(identStep == Step.TABS ? '\t' : ' ');
88-
}
86+
builder.append(String.valueOf(identStep == Step.TABS ? '\t' : ' ').repeat(Math.max(0, indent)));
8987
return this;
9088
}
9189

@@ -458,7 +456,7 @@ public static class JsonParser {
458456
private int line;
459457
private int lineOffset;
460458
private int current;
461-
private StringBuilder captureBuffer = new StringBuilder();
459+
private final StringBuilder captureBuffer = new StringBuilder();
462460
private int captureStart;
463461
private final int maxDepth;
464462

‎src/main/java/com/github/underscore/U.java‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,23 @@ public class U<T> extends Underscore<T> {
9191
private static final int BUFFER_LENGTH_1024 = 1024;
9292
private static final int RESPONSE_CODE_400 = 400;
9393
private static final String ROOT = "root";
94-
private static String upper = "[A-Z\\xc0-\\xd6\\xd8-\\xde\\u0400-\\u04FF]";
95-
private static String lower = "[a-z\\xdf-\\xf6\\xf8-\\xff]+";
96-
private static String selfClosing = "-self-closing";
97-
private static String nilKey = "-nil";
98-
private static java.util.regex.Pattern reWords =
94+
private static final String UPPER = "[A-Z\\xc0-\\xd6\\xd8-\\xde\\u0400-\\u04FF]";
95+
private static final String LOWER = "[a-z\\xdf-\\xf6\\xf8-\\xff]+";
96+
private static final String SELF_CLOSING = "-self-closing";
97+
private static final String NIL_KEY = "-nil";
98+
private static final java.util.regex.Pattern RE_WORDS =
9999
java.util.regex.Pattern.compile(
100-
upper
100+
UPPER
101101
+ "+(?="
102-
+ upper
103-
+ lower
102+
+ UPPER
103+
+ LOWER
104104
+ ")|"
105-
+ upper
105+
+ UPPER
106106
+ "?"
107-
+ lower
107+
+ LOWER
108108
+ "|"
109-
+ upper
110-
+ "+|[0-9]+");
109+
+ UPPER
110+
+ "+|\\d+");
111111

112112
static {
113113
String[] deburredLetters =
@@ -1460,7 +1460,7 @@ public static String deburr(final String string) {
14601460
public static List<String> words(final String string) {
14611461
final String localString = baseToString(string);
14621462
final List<String> result = new ArrayList<>();
1463-
final java.util.regex.Matcher matcher = reWords.matcher(localString);
1463+
final java.util.regex.Matcher matcher = RE_WORDS.matcher(localString);
14641464
while (matcher.find()) {
14651465
result.add(matcher.group());
14661466
}
@@ -2885,7 +2885,7 @@ public static Map<String, Object> removeMinusesAndConvertNumbers(Map<String, Obj
28852885
} else {
28862886
newKey = entry.getKey();
28872887
}
2888-
if (!entry.getKey().equals(selfClosing)
2888+
if (!entry.getKey().equals(SELF_CLOSING)
28892889
&& !entry.getKey().equals("#omit-xml-declaration")) {
28902890
outMap.put(newKey, makeObject(entry.getValue()));
28912891
}
@@ -2963,7 +2963,7 @@ public static Map<String, Object> replaceSelfClosingWithEmpty(Map<String, Object
29632963
public static Object replaceSelfClosingWithValue(Map<String, Object> map, String value) {
29642964
Object outMap = new LinkedHashMap<>();
29652965
for (Map.Entry<String, Object> entry : map.entrySet()) {
2966-
if (selfClosing.equals(entry.getKey()) && "true".equals(entry.getValue())) {
2966+
if (SELF_CLOSING.equals(entry.getKey()) && "true".equals(entry.getValue())) {
29672967
if (map.size() == 1) {
29682968
outMap = value;
29692969
break;
@@ -3226,9 +3226,9 @@ public static Map<String, Object> replaceFirstLevel(Map<String, Object> map, int
32263226
}
32273227
if (level == 0 && Xml.XmlValue.getMapValue(outMap) instanceof Map) {
32283228
Map<String, Object> outMap2 = (Map<String, Object>) Xml.XmlValue.getMapValue(outMap);
3229-
if (selfClosing.equals(Xml.XmlValue.getMapKey(outMap2))
3229+
if (SELF_CLOSING.equals(Xml.XmlValue.getMapKey(outMap2))
32303230
&& "true".equals(Xml.XmlValue.getMapValue(outMap2))) {
3231-
outMap2.remove(selfClosing);
3231+
outMap2.remove(SELF_CLOSING);
32323232
}
32333233
return outMap2;
32343234
}
@@ -3257,11 +3257,11 @@ public static Map<String, Object> replaceNilWithNull(Map<String, Object> map) {
32573257
for (Map.Entry<String, Object> entry : map.entrySet()) {
32583258
Object outValue = makeReplaceNilWithNull(entry.getValue());
32593259
if (outValue instanceof Map
3260-
&& (nilKey.equals(Xml.XmlValue.getMapKey(outValue))
3260+
&& (NIL_KEY.equals(Xml.XmlValue.getMapKey(outValue))
32613261
|| Xml.XmlValue.getMapKey(outValue).endsWith(":nil"))
32623262
&& "true".equals(Xml.XmlValue.getMapValue(outValue))
3263-
&& ((Map) outValue).containsKey(selfClosing)
3264-
&& "true".equals(((Map) outValue).get(selfClosing))) {
3263+
&& ((Map) outValue).containsKey(SELF_CLOSING)
3264+
&& "true".equals(((Map) outValue).get(SELF_CLOSING))) {
32653265
outValue = null;
32663266
}
32673267
outMap.put(entry.getKey(), outValue);
@@ -3405,7 +3405,7 @@ public Builder addNull(final String key) {
34053405

34063406
@SuppressWarnings("unchecked")
34073407
public Map<String, Object> build() {
3408-
return (Map<String, Object>) ((LinkedHashMap) data).clone();
3408+
return (Map<String, Object>) ((LinkedHashMap<?, ?>) data).clone();
34093409
}
34103410

34113411
public String toXml() {
@@ -3511,13 +3511,13 @@ public ArrayBuilder add(final Builder builder) {
35113511

35123512
@SuppressWarnings("unchecked")
35133513
public ArrayBuilder merge(final List<Object> list) {
3514-
U.merge(data, (List<Object>) ((ArrayList) list).clone());
3514+
U.merge(data, (List<Object>) ((ArrayList<?>) list).clone());
35153515
return this;
35163516
}
35173517

35183518
@SuppressWarnings("unchecked")
35193519
public List<Object> build() {
3520-
return (List<Object>) ((ArrayList) data).clone();
3520+
return (List<Object>) ((ArrayList<?>) data).clone();
35213521
}
35223522

35233523
public String toXml() {

‎src/main/java/com/github/underscore/Underscore.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ public static <E> List<List<E>> partition(final Iterable<E> iterable, final Pred
12141214

12151215
@SuppressWarnings("unchecked")
12161216
public static <E> List<E>[] partition(final E[] iterable, final Predicate<E> pred) {
1217-
return partition(Arrays.asList(iterable), pred).toArray(new ArrayList[0]);
1217+
return partition(Arrays.asList(iterable), pred).toArray(new List[0]);
12181218
}
12191219

12201220
public T singleOrNull() {
@@ -1482,7 +1482,7 @@ public static <E> List<E> compact(final List<E> list) {
14821482
!String.valueOf(arg).equals("null")
14831483
&& !String.valueOf(arg).equals("0")
14841484
&& !String.valueOf(arg).equals("false")
1485-
&& !String.valueOf(arg).equals(""));
1485+
&& !String.valueOf(arg).isEmpty());
14861486
}
14871487

14881488
@SuppressWarnings("unchecked")
@@ -1605,8 +1605,7 @@ public static <K, E> E[] distinctBy(final E[] array, final Function<E, K> func)
16051605
*/
16061606
@SuppressWarnings("unchecked")
16071607
public static <E> List<E> union(final List<E> list, final List<E>... lists) {
1608-
final Set<E> union = new LinkedHashSet<>();
1609-
union.addAll(list);
1608+
final Set<E> union = new LinkedHashSet<>(list);
16101609
for (List<E> localList : lists) {
16111610
union.addAll(localList);
16121611
}
@@ -2355,8 +2354,7 @@ public static List<String> methods(final Object object) {
23552354
*/
23562355
@SuppressWarnings("unchecked")
23572356
public static <K, V> Map<K, V> extend(final Map<K, V> destination, final Map<K, V>... sources) {
2358-
final Map<K, V> result = new LinkedHashMap<>();
2359-
result.putAll(destination);
2357+
final Map<K, V> result = new LinkedHashMap<>(destination);
23602358
for (final Map<K, V> source : sources) {
23612359
result.putAll(source);
23622360
}
@@ -2735,7 +2733,7 @@ public static <K, V> Template<Map<K, V>> template(final String template) {
27352733

27362734
public static String format(final String template, final Object... params) {
27372735
final java.util.regex.Matcher matcher = FORMAT_PATTERN.matcher(template);
2738-
final StringBuffer buffer = new StringBuffer();
2736+
final StringBuilder buffer = new StringBuilder();
27392737
int index = 0;
27402738
while (matcher.find()) {
27412739
if (matcher.group(1).isEmpty()) {
@@ -3526,7 +3524,7 @@ public static <T> List<List<T>> splitAt(final Iterable<T> iterable, final int po
35263524
if (position < 0) {
35273525
index = 0;
35283526
} else {
3529-
index = position > size ? size : position;
3527+
index = Math.min(position, size);
35303528
}
35313529
result.add(newArrayList(iterable).subList(0, index));
35323530
result.add(newArrayList(iterable).subList(index, size));
@@ -3855,7 +3853,7 @@ public static void main(String... args) {
38553853
System.out.println(message);
38563854
}
38573855

3858-
public static interface Function3<F1, F2, F3, T> {
3856+
public interface Function3<F1, F2, F3, T> {
38593857
T apply(F1 arg1, F2 arg2, F3 arg3);
38603858
}
38613859

@@ -3870,11 +3868,11 @@ public T apply(final F key) {
38703868
}
38713869
}
38723870

3873-
public static interface PredicateIndexed<T> {
3871+
public interface PredicateIndexed<T> {
38743872
boolean test(int index, T arg);
38753873
}
38763874

3877-
public static interface Template<T> extends Function<T, String> {
3875+
public interface Template<T> extends Function<T, String> {
38783876
List<String> check(T arg);
38793877
}
38803878
}

0 commit comments

Comments
 (0)