Skip to content

Commit 2779fd2

Browse files
authored
Fixed idea warnings for class Xml
1 parent 12654aa commit 2779fd2

File tree

1 file changed

+11
-13
lines changed
  • src/main/java/com/github/underscore

1 file changed

+11
-13
lines changed

src/main/java/com/github/underscore/Xml.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import java.util.function.BiFunction;
3939
import java.util.function.Function;
4040

41-
@SuppressWarnings({"java:S107", "java:S1119", "java:S3740", "java:S3776", "java:S4276"})
41+
@SuppressWarnings({"java:S107", "java:S1119", "java:S2583", "java:S3740", "java:S3776", "java:S4276"})
4242
public final class Xml {
4343
private Xml() {}
4444

@@ -96,7 +96,7 @@ public enum Step {
9696
FOUR_SPACES(4),
9797
COMPACT(0),
9898
TABS(1);
99-
private int ident;
99+
private final int ident;
100100

101101
Step(int ident) {
102102
this.ident = ident;
@@ -1030,7 +1030,7 @@ private static void escape(String s, StringBuilder sb) {
10301030
case '\t':
10311031
sb.append("\t");
10321032
break;
1033-
case '\u20AC':
1033+
case '':
10341034
sb.append("€");
10351035
break;
10361036
default:
@@ -1316,8 +1316,7 @@ private static Object createMap(
13161316
final int[] sourceIndex,
13171317
final Set<String> namespaces,
13181318
final FromType fromType) {
1319-
final Map<String, Object> map = new LinkedHashMap<>();
1320-
map.putAll(attrMap);
1319+
final Map<String, Object> map = new LinkedHashMap<>(attrMap);
13211320
final org.w3c.dom.NodeList nodeList = node.getChildNodes();
13221321
for (int index = 0; index < nodeList.getLength(); index++) {
13231322
final org.w3c.dom.Node currentNode = nodeList.item(index);
@@ -1760,14 +1759,12 @@ private static Map<String, String> getHeaderAttributes(final String xml) {
17601759
XML_HEADER.length(),
17611760
Math.max(XML_HEADER.length(), xml.indexOf("?>", XML_HEADER.length())));
17621761
final Map<String, String> attributes = parseAttributes(xmlLocal);
1763-
for (Map.Entry<String, String> attribute : attributes.entrySet()) {
1764-
result.put(attribute.getKey(), attribute.getValue());
1765-
}
1762+
result.putAll(attributes);
17661763
}
17671764
return result;
17681765
}
17691766

1770-
protected static String getDoctypeValue(final String xml) {
1767+
static String getDoctypeValue(final String xml) {
17711768
int startIndex = xml.indexOf(DOCTYPE_HEADER) + DOCTYPE_HEADER.length();
17721769
char charToFind = '>';
17731770
int endIndexPlus = 0;
@@ -1819,7 +1816,7 @@ private static org.w3c.dom.Document createDocument() {
18191816
final javax.xml.parsers.DocumentBuilder builder = factory.newDocumentBuilder();
18201817
return builder.newDocument();
18211818
} catch (javax.xml.parsers.ParserConfigurationException ex) {
1822-
return null;
1819+
throw new IllegalArgumentException(ex);
18231820
}
18241821
}
18251822

@@ -1888,17 +1885,18 @@ public static Object fromXmlWithoutNamespaces(final String xml) {
18881885
(object, namespaces) -> {
18891886
final String localString = String.valueOf(object);
18901887
final String result;
1888+
String substring = localString.substring(
1889+
Math.max(0, localString.indexOf(':') + 1));
18911890
if (localString.startsWith("-")
18921891
&& namespaces.contains(
18931892
localString.substring(
18941893
1, Math.max(1, localString.indexOf(':'))))) {
18951894
result =
18961895
"-"
1897-
+ localString.substring(
1898-
Math.max(0, localString.indexOf(':') + 1));
1896+
+ substring;
18991897
} else if (namespaces.contains(
19001898
localString.substring(0, Math.max(0, localString.indexOf(':'))))) {
1901-
result = localString.substring(Math.max(0, localString.indexOf(':') + 1));
1899+
result = substring;
19021900
} else {
19031901
result = String.valueOf(object);
19041902
}

0 commit comments

Comments
 (0)