Skip to content

Commit c43e844

Browse files
javadevjavadev
committed
Sync with underscore-java
1 parent f43dd49 commit c43e844

File tree

13 files changed

+100
-181
lines changed

13 files changed

+100
-181
lines changed

‎pom-central17.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<dependency>
5858
<groupId>org.junit.jupiter</groupId>
5959
<artifactId>junit-jupiter-engine</artifactId>
60-
<version>[5.9.3,)</version>
60+
<version>[5.10.0,)</version>
6161
</dependency>
6262
</dependencies>
6363
</plugin>
@@ -129,7 +129,7 @@
129129
<dependency>
130130
<groupId>org.junit.jupiter</groupId>
131131
<artifactId>junit-jupiter-api</artifactId>
132-
<version>[5.9.3,)</version>
132+
<version>[5.10.0,)</version>
133133
<scope>test</scope>
134134
</dependency>
135135
<dependency>

‎pom-pack17.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<dependency>
5959
<groupId>org.junit.jupiter</groupId>
6060
<artifactId>junit-jupiter-engine</artifactId>
61-
<version>[5.9.3,)</version>
61+
<version>[5.10.0,)</version>
6262
</dependency>
6363
</dependencies>
6464
</plugin>
@@ -94,7 +94,6 @@
9494
<option>-keep public class com.github.underscore.*$Chain { *; }</option>
9595
<option>-keep public class com.github.underscore.Underscore.Function3 { *; }</option>
9696
<option>-keep public class com.github.underscore.Underscore.MemoizeFunction { *; }</option>
97-
<option>-keep public class com.github.underscore.Optional { *; }</option>
9897
<option>-keep public class com.github.underscore.Underscore.PredicateIndexed { *; }</option>
9998
<option>-keep public class com.github.underscore.Underscore.Template { *; }</option>
10099
<option>-keep public class com.github.underscore.Base32 { *; }</option>
@@ -239,7 +238,7 @@
239238
<dependency>
240239
<groupId>org.junit.jupiter</groupId>
241240
<artifactId>junit-jupiter-api</artifactId>
242-
<version>[5.9.3,)</version>
241+
<version>[5.10.0,)</version>
243242
<scope>test</scope>
244243
</dependency>
245244
<dependency>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>org.junit.jupiter</groupId>
6262
<artifactId>junit-jupiter-engine</artifactId>
63-
<version>[5.9.3,)</version>
63+
<version>[5.10.0,)</version>
6464
</dependency>
6565
</dependencies>
6666
</plugin>
@@ -211,7 +211,7 @@
211211
<dependency>
212212
<groupId>org.junit.jupiter</groupId>
213213
<artifactId>junit-jupiter-api</artifactId>
214-
<version>[5.9.3,)</version>
214+
<version>[5.10.0,)</version>
215215
<scope>test</scope>
216216
</dependency>
217217
<dependency>

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

Lines changed: 0 additions & 143 deletions
This file was deleted.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import java.util.List;
4848
import java.util.Locale;
4949
import java.util.Map;
50+
import java.util.Optional;
5051
import java.util.Set;
5152
import java.util.function.BiConsumer;
5253
import java.util.function.BiFunction;
@@ -63,6 +64,7 @@
6364
@SuppressWarnings({
6465
"java:S135",
6566
"java:S1168",
67+
"java:S3655",
6668
"java:S3740",
6769
"java:S3776",
6870
"java:S4423",

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@
3434
import java.util.Date;
3535
import java.util.Deque;
3636
import java.util.HashMap;
37-
import java.util.HashSet;
3837
import java.util.Iterator;
3938
import java.util.LinkedHashMap;
4039
import java.util.LinkedHashSet;
41-
import java.util.LinkedList;
4240
import java.util.List;
4341
import java.util.ListIterator;
4442
import java.util.Map;
4543
import java.util.Objects;
46-
import java.util.Queue;
44+
import java.util.Optional;
4745
import java.util.Set;
4846
import java.util.UUID;
4947
import java.util.function.BiConsumer;
@@ -60,7 +58,14 @@
6058
*
6159
* @author Valentyn Kolesnikov
6260
*/
63-
@SuppressWarnings({"java:S106", "java:S2189", "java:S2272", "java:S3740", "java:S5852"})
61+
@SuppressWarnings({
62+
"java:S106",
63+
"java:S2189",
64+
"java:S2272",
65+
"java:S2789",
66+
"java:S3740",
67+
"java:S5852"
68+
})
6469
public class Underscore<T> {
6570
private static final Map<String, Function<String, String>> FUNCTIONS = newLinkedHashMap();
6671
private static final Map<String, String> TEMPLATE_SETTINGS = new HashMap<>();
@@ -534,7 +539,7 @@ public static <T, E> E foldr(
534539
public static <E> Optional<E> find(final Iterable<E> iterable, final Predicate<E> pred) {
535540
for (E element : iterable) {
536541
if (pred.test(element)) {
537-
return Optional.of(element);
542+
return isNull(element) ? null : Optional.of(element);
538543
}
539544
}
540545
return Optional.empty();
@@ -667,7 +672,8 @@ public boolean all(final Predicate<T> pred) {
667672
}
668673

669674
public static <E> boolean some(final Iterable<E> iterable, final Predicate<E> pred) {
670-
return find(iterable, pred).isPresent();
675+
Optional<E> optional = find(iterable, pred);
676+
return optional == null || optional.isPresent();
671677
}
672678

673679
public boolean some(final Predicate<T> pred) {

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

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

41-
@SuppressWarnings({
42-
"java:S107",
43-
"java:S1119",
44-
"java:S3740",
45-
"java:S3776",
46-
"java:S4276"
47-
})
41+
@SuppressWarnings({"java:S107", "java:S1119", "java:S3740", "java:S3776", "java:S4276"})
4842
public final class Xml {
4943
private Xml() {}
5044

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.util.LinkedHashSet;
4040
import java.util.List;
4141
import java.util.Map;
42+
import java.util.Optional;
4243
import java.util.Set;
4344
import java.util.function.BiConsumer;
4445
import java.util.function.BinaryOperator;

‎src/test/java/com/github/underscore/FunctionsTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.LinkedHashMap;
3434
import java.util.List;
3535
import java.util.Map;
36+
import java.util.Optional;
3637
import java.util.concurrent.TimeUnit;
3738
import java.util.function.Function;
3839
import java.util.function.Predicate;

‎src/test/java/com/github/underscore/LodashTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,6 +1295,10 @@ void formatXml() {
12951295
+ "<element>2</element></root>"));
12961296
assertEquals(
12971297
"<a>\n <b></b>\n <b></b>\n</a>", U.formatXml("<a>\n <b></b>\n <b></b>\n</a>"));
1298+
assertEquals(
1299+
"<a>\n <b></b>\n <b></b>\n</a>",
1300+
U.formatXml(
1301+
"<a>\n <b></b>\n <b></b>\n</a>", Xml.XmlStringBuilder.Step.THREE_SPACES));
12981302
assertEquals(
12991303
"<a>\n <b></b>\n <b></b>\n</a>",
13001304
U.formatXml(

0 commit comments

Comments
 (0)