From 149cf3dc607f255b7a51f3a8c3493caa77df5ec4 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Tue, 28 Jan 2020 20:19:17 -0500 Subject: [PATCH] can't cache bounds, unless we also cache params to add --- .../cobbzilla/wizard/dao/SqlViewSearchableDAO.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchableDAO.java b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchableDAO.java index 6d5b35c..21e8f46 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchableDAO.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/dao/SqlViewSearchableDAO.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import static org.cobbzilla.util.daemon.ZillaRuntime.die; -import static org.cobbzilla.util.daemon.ZillaRuntime.hashOf; import static org.cobbzilla.util.reflect.ReflectionUtil.fieldsWithAnnotation; import static org.cobbzilla.util.string.StringUtil.camelCaseToSnakeCase; import static org.cobbzilla.util.string.StringUtil.sqlFilter; @@ -62,18 +61,12 @@ public interface SqlViewSearchableDAO extends DAO { return b.toString(); } - Map _fieldCache = new ExpirationMap<>(); - default String buildBound(String bound, String value, List params, String locale) { for (Field f : fieldsWithAnnotation(getEntityClass(), ECSearchable.class)) { if (!f.getName().equalsIgnoreCase(bound)) continue; final ECSearchable search = f.getAnnotation(ECSearchable.class); - - final String hash = hashOf(f, search, bound, value, params, locale); - return _fieldCache.computeIfAbsent(hash, k -> { - final SearchField field = new SqlDefaultSearchField(f, search, bound, value, params, locale); - return SearchField.buildBound(field, value, params, locale); - }); + final SearchField field = new SqlDefaultSearchField(f, search, bound, value, params, locale); + return SearchField.buildBound(field, value, params, locale); } return die("buildBound: no bound defined for: "+bound); }