Skip to content

Commit ad56eb6

Browse files
committed
Sync with underscore-java.
1 parent ca424ff commit ad56eb6

File tree

3 files changed

+25
-19
lines changed

3 files changed

+25
-19
lines changed

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2016,17 +2016,23 @@ public static class MyX509TrustManager implements javax.net.ssl.X509TrustManager
20162016

20172017
static MyX509TrustManager manger = new MyX509TrustManager();
20182018

2019-
public MyX509TrustManager() {}
2019+
public MyX509TrustManager() {
2020+
// ignore MyX509TrustManager
2021+
}
20202022

20212023
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
20222024
return new java.security.cert.X509Certificate[] {};
20232025
}
20242026

20252027
public void checkClientTrusted(
2026-
java.security.cert.X509Certificate[] chain, String authType) {}
2028+
java.security.cert.X509Certificate[] chain, String authType) {
2029+
// ignore checkClientTrusted
2030+
}
20272031

20282032
public void checkServerTrusted(
2029-
java.security.cert.X509Certificate[] chain, String authType) {}
2033+
java.security.cert.X509Certificate[] chain, String authType) {
2034+
// ignore checkServerTrusted
2035+
}
20302036
}
20312037
}
20322038

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,11 +1096,11 @@ public static String toXml(Map map, XmlStringBuilder.Step identStep, String newR
10961096
final XmlStringBuilder builder;
10971097
final Map localMap;
10981098
if (map != null && map.containsKey(ENCODING)) {
1099-
localMap = (Map) U.clone(map);
1099+
localMap = (Map) ((LinkedHashMap) map).clone();
11001100
builder =
11011101
checkStandalone(String.valueOf(localMap.remove(ENCODING)), identStep, localMap);
11021102
} else if (map != null && map.containsKey(STANDALONE)) {
1103-
localMap = (Map) U.clone(map);
1103+
localMap = (Map) ((LinkedHashMap) map).clone();
11041104
builder =
11051105
new XmlStringBuilderWithoutRoot(
11061106
identStep,
@@ -1110,7 +1110,7 @@ public static String toXml(Map map, XmlStringBuilder.Step identStep, String newR
11101110
+ "\"");
11111111
localMap.remove(STANDALONE);
11121112
} else if (map != null && map.containsKey(OMITXMLDECLARATION)) {
1113-
localMap = (Map) U.clone(map);
1113+
localMap = (Map) ((LinkedHashMap) map).clone();
11141114
builder = new XmlStringBuilderWithoutHeader(identStep, 0);
11151115
localMap.remove(OMITXMLDECLARATION);
11161116
} else {
@@ -1125,7 +1125,7 @@ private static void checkLocalMap(
11251125
final XmlStringBuilder builder, final Map localMap, final String newRootName) {
11261126
final Map localMap2;
11271127
if (localMap != null && localMap.containsKey(DOCTYPE_TEXT)) {
1128-
localMap2 = (Map) U.clone(localMap);
1128+
localMap2 = (Map) ((LinkedHashMap) localMap).clone();
11291129
localMap2.remove(DOCTYPE_TEXT);
11301130
builder.append(DOCTYPE_HEADER)
11311131
.append(String.valueOf(localMap.get(DOCTYPE_TEXT)))

src/test/java/com/github/underscore/CollectionsTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -795,30 +795,30 @@ public void containsAtMost() {
795795
@Test
796796
@SuppressWarnings("unchecked")
797797
public void invoke() {
798-
assertEquals(Underscore.invoke(asList(" foo ", " bar"), "trim"), asList("foo", "bar"));
799-
assertEquals(new Underscore(asList(" foo ", " bar")).invoke("trim"), asList("foo", "bar"));
798+
assertEquals(asList("foo", "bar"), Underscore.invoke(asList(" foo ", " bar"), "trim"));
799+
assertEquals(asList("foo", "bar"), new Underscore(asList(" foo ", " bar")).invoke("trim"));
800800
assertEquals(
801-
Underscore.chain(asList(" foo ", " bar")).invoke("trim").value(),
802-
asList("foo", "bar"));
801+
asList("foo", "bar"),
802+
Underscore.chain(asList(" foo ", " bar")).invoke("trim").value());
803803
assertEquals(
804-
Underscore.invoke(asList("foo", "bar"), "concat", Arrays.<Object>asList("1")),
805-
asList("foo1", "bar1"));
804+
asList("foo1", "bar1"),
805+
Underscore.invoke(asList("foo", "bar"), "concat", Arrays.<Object>asList("1")));
806806
assertEquals(
807-
new Underscore(asList("foo", "bar")).invoke("concat", Arrays.<Object>asList("1")),
808-
asList("foo1", "bar1"));
807+
asList("foo1", "bar1"),
808+
new Underscore(asList("foo", "bar")).invoke("concat", Arrays.<Object>asList("1")));
809809
assertEquals(
810+
asList("foo1", "bar1"),
810811
Underscore.chain(asList("foo", "bar"))
811812
.invoke("concat", Arrays.<Object>asList("1"))
812-
.value(),
813-
asList("foo1", "bar1"));
813+
.value());
814814
assertEquals(
815+
asList("[1, 5, 7]", "[1, 2, 3]").toString(),
815816
Underscore.invoke(
816817
asList(
817818
Underscore.chain(asList(5, 1, 7)),
818819
Underscore.chain(asList(3, 2, 1))),
819820
"sort")
820-
.toString(),
821-
asList("[1, 5, 7]", "[1, 2, 3]").toString());
821+
.toString());
822822
}
823823

824824
@Test(expected = IllegalArgumentException.class)

0 commit comments

Comments
 (0)