diff --git a/owner/src/main/java/org/aeonbits/owner/util/Collections.java b/owner/src/main/java/org/aeonbits/owner/util/Collections.java index b89f638d..a23faf8b 100644 --- a/owner/src/main/java/org/aeonbits/owner/util/Collections.java +++ b/owner/src/main/java/org/aeonbits/owner/util/Collections.java @@ -44,20 +44,16 @@ private Collections() {} private static class EntryMap extends AbstractMap implements Serializable { private static final long serialVersionUID = -789853606407653214L; - private final Set> entries; + private final Set> entries; - private EntryMap(Entry... entries) { + private EntryMap(Entry... entries) { this.entries = set(entries); } @SuppressWarnings("unchecked") - private EntryMap(K key, V value) { - this(entry(key, value)); - } - @Override public Set> entrySet() { - return entries; + return (Set) entries; } } @@ -65,8 +61,13 @@ public static Entry entry(K key, V value) { return new SimpleEntry(key, value); } + @SuppressWarnings("unchecked") public static Map map(K key, V value) { - return new EntryMap(key, value); + return map(entry(key, value)); + } + + public static Map map(Map.Entry... entries) { + return new EntryMap(entries); } public static Set set(E... elements) {