Skip to content

Commit f28eb15

Browse files
chore: merge main into release [skip ci]
2 parents 85f42be + 3b34419 commit f28eb15

11 files changed

Lines changed: 581 additions & 582 deletions

File tree

microsphere-java-core/src/main/java/io/microsphere/collection/Maps.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ public static <K, V> Map<K, V> ofMap(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V
442442
}
443443

444444
static <K, V> Map<K, V> ofMap8(MethodHandle methodHandle, K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7,
445-
K k8, V v8) {
445+
K k8, V v8) {
446446
if (methodHandle == null) {
447447
return of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8);
448448
}
@@ -494,7 +494,7 @@ public static <K, V> Map<K, V> ofMap(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V
494494
}
495495

496496
static <K, V> Map<K, V> ofMap9(MethodHandle methodHandle, K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7,
497-
K k8, V v8, K k9, V v9) {
497+
K k8, V v8, K k9, V v9) {
498498
if (methodHandle == null) {
499499
return of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8, k9, v9);
500500
}
@@ -549,7 +549,7 @@ public static <K, V> Map<K, V> ofMap(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V
549549
}
550550

551551
static <K, V> Map<K, V> ofMap10(MethodHandle methodHandle, K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7,
552-
K k8, V v8, K k9, V v9, K k10, V v10) {
552+
K k8, V v8, K k9, V v9, K k10, V v10) {
553553
if (methodHandle == null) {
554554
return of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8, k9, v9, k10, v10);
555555
}

microsphere-java-core/src/main/java/io/microsphere/collection/PropertiesUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import static io.microsphere.collection.MapUtils.isEmpty;
2929
import static io.microsphere.collection.MapUtils.newLinkedHashMap;
30-
import static io.microsphere.constants.SeparatorConstants.FILE_SEPARATOR;
3130
import static io.microsphere.constants.SeparatorConstants.LINE_SEPARATOR;
3231
import static io.microsphere.constants.SymbolConstants.DOT;
3332
import static io.microsphere.lang.function.ThrowableAction.execute;

0 commit comments

Comments
 (0)