diff --git a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java index 0e970a1b9..b66137c42 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java +++ b/src/main/java/com/avaje/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java @@ -405,7 +405,8 @@ public final class BeanDescriptorCacheHelp { } public T beanCacheGet(SpiQuery query, PersistenceContext context) { - T bean = beanCacheGetInternal(query.getId(), query.isReadOnly()); + Object id = desc.convertId(query.getId()); + T bean = beanCacheGetInternal(id, query.isReadOnly()); if (bean != null) { setupContext(bean, context); } diff --git a/src/test/java/com/avaje/tests/cache/TestBeanCache.java b/src/test/java/com/avaje/tests/cache/TestBeanCache.java new file mode 100644 index 000000000..9497c641e --- /dev/null +++ b/src/test/java/com/avaje/tests/cache/TestBeanCache.java @@ -0,0 +1,44 @@ +package com.avaje.tests.cache; + +import com.avaje.ebean.BaseTestCase; +import com.avaje.ebean.Ebean; +import com.avaje.tests.model.basic.OCachedBean; +import org.avaje.ebeantest.LoggedSqlCollector; +import org.junit.Test; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertNotNull; + +/** + * Test class testing deleting/invalidating of cached beans + */ +public class TestBeanCache extends BaseTestCase { + + @Test + public void findById_when_idTypeConverted() { + + OCachedBean bean = new OCachedBean(); + bean.setName("findById"); + Ebean.save(bean); + + OCachedBean bean0 = Ebean.find(OCachedBean.class, bean.getId()); + assertNotNull(bean0); + + // expect to hit the cache, no SQL + LoggedSqlCollector.start(); + OCachedBean bean1 = Ebean.find(OCachedBean.class, bean.getId()); + List sql = LoggedSqlCollector.stop(); + assertNotNull(bean1); + assertThat(sql).isEmpty(); + + // expect to hit the cache, no SQL + LoggedSqlCollector.start(); + OCachedBean bean2 = Ebean.find(OCachedBean.class).setReadOnly(true).setId(String.valueOf(bean.getId())).findUnique(); + sql = LoggedSqlCollector.stop(); + assertNotNull(bean2); + assertThat(sql).isEmpty(); + + } +}