From 9f74067d5856a7bfdb012f35ebed2cf1ebe728b7 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Fri, 19 Jun 2020 11:35:25 -0400 Subject: [PATCH] do not use defaultedmap, just check for null --- .../cobbzilla/wizard/server/config/SupportInfo.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/SupportInfo.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/SupportInfo.java index a44e1d9..75424b5 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/SupportInfo.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/SupportInfo.java @@ -2,18 +2,17 @@ package org.cobbzilla.wizard.server.config; import lombok.Getter; import lombok.Setter; -import org.apache.commons.collections4.map.DefaultedMap; +import java.util.HashMap; import java.util.Map; public class SupportInfo extends BasicSupportInfo { - private SupportInfo self; + @Getter @Setter private Map locale = new HashMap<>(); - public SupportInfo () { self = this; } - - @Getter @Setter private Map locale = new DefaultedMap<>(k -> self); - - public BasicSupportInfo forLocale (String loc) { return locale.get(loc); } + public BasicSupportInfo forLocale (String loc) { + final BasicSupportInfo info = locale.get(loc); + return info == null ? this : info; + } }