Skip to content

Commit 6de7f73

Browse files
committed
extend toDictionary to 5 keys/values
1 parent 026d169 commit 6de7f73

File tree

2 files changed

+26
-6
lines changed
  • src/AndroidClient
    • android/src/main/java/net/servicestack/func
    • client/src/main/java/net/servicestack/func

2 files changed

+26
-6
lines changed

src/AndroidClient/android/src/main/java/net/servicestack/func/Func.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,23 @@ public static <K, V> HashMap<K, V> toDictionary(K k1, V v1, K k2, V v2) {
7373
}
7474

7575
public static <K, V> HashMap<K, V> toDictionary(K k1, V v1, K k2, V v2, K k3, V v3) {
76-
HashMap<K, V> to = new HashMap<>();
77-
to.put(k1, v1);
78-
to.put(k2, v2);
76+
HashMap<K, V> to = toDictionary(k1, v1, k2, v2);
7977
to.put(k3, v3);
8078
return to;
8179
}
8280

81+
public static <K, V> HashMap<K, V> toDictionary(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4) {
82+
HashMap<K, V> to = toDictionary(k1, v1, k2, v2, k3, v3);
83+
to.put(k4, v4);
84+
return to;
85+
}
86+
87+
public static <K, V> HashMap<K, V> toDictionary(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5) {
88+
HashMap<K, V> to = toDictionary(k1, v1, k2, v2, k3, v3, k4, v4);
89+
to.put(k5, v5);
90+
return to;
91+
}
92+
8393
public static <K, V> HashMap<K, V> toDictionary(Tuple<K, V>... xs) {
8494
HashMap<K, V> to = new HashMap<>();
8595
for (Tuple<K, V> x : xs) {

src/AndroidClient/client/src/main/java/net/servicestack/func/Func.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,23 @@ public static <K, V> HashMap<K, V> toDictionary(K k1, V v1, K k2, V v2) {
7373
}
7474

7575
public static <K, V> HashMap<K, V> toDictionary(K k1, V v1, K k2, V v2, K k3, V v3) {
76-
HashMap<K, V> to = new HashMap<>();
77-
to.put(k1, v1);
78-
to.put(k2, v2);
76+
HashMap<K, V> to = toDictionary(k1, v1, k2, v2);
7977
to.put(k3, v3);
8078
return to;
8179
}
8280

81+
public static <K, V> HashMap<K, V> toDictionary(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4) {
82+
HashMap<K, V> to = toDictionary(k1, v1, k2, v2, k3, v3);
83+
to.put(k4, v4);
84+
return to;
85+
}
86+
87+
public static <K, V> HashMap<K, V> toDictionary(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5) {
88+
HashMap<K, V> to = toDictionary(k1, v1, k2, v2, k3, v3, k4, v4);
89+
to.put(k5, v5);
90+
return to;
91+
}
92+
8393
public static <K, V> HashMap<K, V> toDictionary(Tuple<K, V>... xs) {
8494
HashMap<K, V> to = new HashMap<>();
8595
for (Tuple<K, V> x : xs) {

0 commit comments

Comments
 (0)