From 92a5cf7e4548a842f7429c6c970452afca1b27f9 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Tue, 7 May 2024 11:14:36 +0300 Subject: [PATCH] Resolved Idea warnings --- src/main/java/com/github/underscore/Json.java | 6 +-- src/main/java/com/github/underscore/U.java | 46 +++++++++---------- .../com/github/underscore/Underscore.java | 20 ++++---- 3 files changed, 34 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/github/underscore/Json.java b/src/main/java/com/github/underscore/Json.java index 86230f3c..17d81040 100644 --- a/src/main/java/com/github/underscore/Json.java +++ b/src/main/java/com/github/underscore/Json.java @@ -83,9 +83,7 @@ public JsonStringBuilder append(final String string) { } public JsonStringBuilder fillSpaces() { - for (int index = 0; index < indent; index += 1) { - builder.append(identStep == Step.TABS ? '\t' : ' '); - } + builder.append(String.valueOf(identStep == Step.TABS ? '\t' : ' ').repeat(Math.max(0, indent))); return this; } @@ -458,7 +456,7 @@ public static class JsonParser { private int line; private int lineOffset; private int current; - private StringBuilder captureBuffer = new StringBuilder(); + private final StringBuilder captureBuffer = new StringBuilder(); private int captureStart; private final int maxDepth; diff --git a/src/main/java/com/github/underscore/U.java b/src/main/java/com/github/underscore/U.java index d566dad9..e539b2b8 100644 --- a/src/main/java/com/github/underscore/U.java +++ b/src/main/java/com/github/underscore/U.java @@ -91,23 +91,23 @@ public class U extends Underscore { private static final int BUFFER_LENGTH_1024 = 1024; private static final int RESPONSE_CODE_400 = 400; private static final String ROOT = "root"; - private static String upper = "[A-Z\\xc0-\\xd6\\xd8-\\xde\\u0400-\\u04FF]"; - private static String lower = "[a-z\\xdf-\\xf6\\xf8-\\xff]+"; - private static String selfClosing = "-self-closing"; - private static String nilKey = "-nil"; - private static java.util.regex.Pattern reWords = + private static final String UPPER = "[A-Z\\xc0-\\xd6\\xd8-\\xde\\u0400-\\u04FF]"; + private static final String LOWER = "[a-z\\xdf-\\xf6\\xf8-\\xff]+"; + private static final String SELF_CLOSING = "-self-closing"; + private static final String NIL_KEY = "-nil"; + private static final java.util.regex.Pattern RE_WORDS = java.util.regex.Pattern.compile( - upper + UPPER + "+(?=" - + upper - + lower + + UPPER + + LOWER + ")|" - + upper + + UPPER + "?" - + lower + + LOWER + "|" - + upper - + "+|[0-9]+"); + + UPPER + + "+|\\d+"); static { String[] deburredLetters = @@ -1460,7 +1460,7 @@ public static String deburr(final String string) { public static List words(final String string) { final String localString = baseToString(string); final List result = new ArrayList<>(); - final java.util.regex.Matcher matcher = reWords.matcher(localString); + final java.util.regex.Matcher matcher = RE_WORDS.matcher(localString); while (matcher.find()) { result.add(matcher.group()); } @@ -2885,7 +2885,7 @@ public static Map removeMinusesAndConvertNumbers(Map replaceSelfClosingWithEmpty(Map map, String value) { Object outMap = new LinkedHashMap<>(); for (Map.Entry entry : map.entrySet()) { - if (selfClosing.equals(entry.getKey()) && "true".equals(entry.getValue())) { + if (SELF_CLOSING.equals(entry.getKey()) && "true".equals(entry.getValue())) { if (map.size() == 1) { outMap = value; break; @@ -3226,9 +3226,9 @@ public static Map replaceFirstLevel(Map map, int } if (level == 0 && Xml.XmlValue.getMapValue(outMap) instanceof Map) { Map outMap2 = (Map) Xml.XmlValue.getMapValue(outMap); - if (selfClosing.equals(Xml.XmlValue.getMapKey(outMap2)) + if (SELF_CLOSING.equals(Xml.XmlValue.getMapKey(outMap2)) && "true".equals(Xml.XmlValue.getMapValue(outMap2))) { - outMap2.remove(selfClosing); + outMap2.remove(SELF_CLOSING); } return outMap2; } @@ -3257,11 +3257,11 @@ public static Map replaceNilWithNull(Map map) { for (Map.Entry entry : map.entrySet()) { Object outValue = makeReplaceNilWithNull(entry.getValue()); if (outValue instanceof Map - && (nilKey.equals(Xml.XmlValue.getMapKey(outValue)) + && (NIL_KEY.equals(Xml.XmlValue.getMapKey(outValue)) || Xml.XmlValue.getMapKey(outValue).endsWith(":nil")) && "true".equals(Xml.XmlValue.getMapValue(outValue)) - && ((Map) outValue).containsKey(selfClosing) - && "true".equals(((Map) outValue).get(selfClosing))) { + && ((Map) outValue).containsKey(SELF_CLOSING) + && "true".equals(((Map) outValue).get(SELF_CLOSING))) { outValue = null; } outMap.put(entry.getKey(), outValue); @@ -3405,7 +3405,7 @@ public Builder addNull(final String key) { @SuppressWarnings("unchecked") public Map build() { - return (Map) ((LinkedHashMap) data).clone(); + return (Map) ((LinkedHashMap) data).clone(); } public String toXml() { @@ -3511,13 +3511,13 @@ public ArrayBuilder add(final Builder builder) { @SuppressWarnings("unchecked") public ArrayBuilder merge(final List list) { - U.merge(data, (List) ((ArrayList) list).clone()); + U.merge(data, (List) ((ArrayList) list).clone()); return this; } @SuppressWarnings("unchecked") public List build() { - return (List) ((ArrayList) data).clone(); + return (List) ((ArrayList) data).clone(); } public String toXml() { diff --git a/src/main/java/com/github/underscore/Underscore.java b/src/main/java/com/github/underscore/Underscore.java index e2565bda..aaf28342 100644 --- a/src/main/java/com/github/underscore/Underscore.java +++ b/src/main/java/com/github/underscore/Underscore.java @@ -1214,7 +1214,7 @@ public static List> partition(final Iterable iterable, final Pred @SuppressWarnings("unchecked") public static List[] partition(final E[] iterable, final Predicate pred) { - return partition(Arrays.asList(iterable), pred).toArray(new ArrayList[0]); + return partition(Arrays.asList(iterable), pred).toArray(new List[0]); } public T singleOrNull() { @@ -1482,7 +1482,7 @@ public static List compact(final List list) { !String.valueOf(arg).equals("null") && !String.valueOf(arg).equals("0") && !String.valueOf(arg).equals("false") - && !String.valueOf(arg).equals("")); + && !String.valueOf(arg).isEmpty()); } @SuppressWarnings("unchecked") @@ -1605,8 +1605,7 @@ public static E[] distinctBy(final E[] array, final Function func) */ @SuppressWarnings("unchecked") public static List union(final List list, final List... lists) { - final Set union = new LinkedHashSet<>(); - union.addAll(list); + final Set union = new LinkedHashSet<>(list); for (List localList : lists) { union.addAll(localList); } @@ -2355,8 +2354,7 @@ public static List methods(final Object object) { */ @SuppressWarnings("unchecked") public static Map extend(final Map destination, final Map... sources) { - final Map result = new LinkedHashMap<>(); - result.putAll(destination); + final Map result = new LinkedHashMap<>(destination); for (final Map source : sources) { result.putAll(source); } @@ -2735,7 +2733,7 @@ public static Template> template(final String template) { public static String format(final String template, final Object... params) { final java.util.regex.Matcher matcher = FORMAT_PATTERN.matcher(template); - final StringBuffer buffer = new StringBuffer(); + final StringBuilder buffer = new StringBuilder(); int index = 0; while (matcher.find()) { if (matcher.group(1).isEmpty()) { @@ -3526,7 +3524,7 @@ public static List> splitAt(final Iterable iterable, final int po if (position < 0) { index = 0; } else { - index = position > size ? size : position; + index = Math.min(position, size); } result.add(newArrayList(iterable).subList(0, index)); result.add(newArrayList(iterable).subList(index, size)); @@ -3855,7 +3853,7 @@ public static void main(String... args) { System.out.println(message); } - public static interface Function3 { + public interface Function3 { T apply(F1 arg1, F2 arg2, F3 arg3); } @@ -3870,11 +3868,11 @@ public T apply(final F key) { } } - public static interface PredicateIndexed { + public interface PredicateIndexed { boolean test(int index, T arg); } - public static interface Template extends Function { + public interface Template extends Function { List check(T arg); } }