make region.nextTimestamp() and region.getTimeout() consistent

Author: mihaicostin

src/main/java/com/mc/hibernate/memcached/MemcachedCache.java

@@ -217,7 +217,7 @@ public void lock(Object key) throws CacheException {
     public void unlock(Object key) throws CacheException {
     }
 
-    public int getTimeout() {
+    public int getTimeoutSeconds() {
         return cacheTimeSeconds;
     }
 

src/main/java/com/mc/hibernate/memcached/MemcachedRegionFactory.java

@@ -73,8 +73,13 @@ public AccessType getDefaultAccessType() {
         return AccessType.READ_WRITE;
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @return timestamp in ms
+     */
     public long nextTimestamp() {
-        return System.currentTimeMillis() / 100;
+        return System.currentTimeMillis();
     }
 
     public EntityRegion buildEntityRegion(String regionName, Properties properties, CacheDataDescription metadata) throws CacheException {

src/main/java/com/mc/hibernate/memcached/region/AbstractMemcachedRegion.java

@@ -15,12 +15,12 @@
 
 package com.mc.hibernate.memcached.region;
 
-import java.util.Map;
-
+import com.mc.hibernate.memcached.MemcachedCache;
 import org.hibernate.cache.CacheException;
 import org.hibernate.cache.spi.Region;
 
-import com.mc.hibernate.memcached.MemcachedCache;
+import java.util.Collections;
+import java.util.Map;
 
 public abstract class AbstractMemcachedRegion implements Region {
 
@@ -55,15 +55,25 @@ public long getElementCountOnDisk() {
     }
 
     public Map toMap() {
-        return null;
+        return Collections.emptyMap();
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @return timestamp in ms
+     */
     public long nextTimestamp() {
-        return System.currentTimeMillis() / 100;
+        return System.currentTimeMillis();
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * @return timeout in ms
+     */
     public int getTimeout() {
-        return cache.getTimeout();
+        return cache.getTimeoutSeconds() * 1000;
     }
 
     public MemcachedCache getCache() {

src/test/java/com/integration/com/mc/hibernate/memcached/CacheTimeout.java

@@ -19,7 +19,7 @@ public void testQueryCacheQuickExpire() throws Exception {
 
         SessionFactory sessionFactory = getConfiguration(extraProp).buildSessionFactory();
 
-        Person p = new Person(10L, "Jhon");
+        Person p = new Person(10L, "John");
 
         Session session = sessionFactory.openSession();
         Transaction transaction = session.beginTransaction();
@@ -38,6 +38,34 @@ public void testQueryCacheQuickExpire() throws Exception {
 
     }
 
+
+    @Test
+    public void testQueryCacheSlowExpire() throws Exception {
+
+        Properties extraProp = new Properties();
+        extraProp.put("hibernate.memcached.com.integration.com.mc.hibernate.memcached.entities.Person.cacheTimeSeconds", "5");
+
+        SessionFactory sessionFactory = getConfiguration(extraProp).buildSessionFactory();
+
+        Person p = new Person(101L, "Long John");
+
+        Session session = sessionFactory.openSession();
+        Transaction transaction = session.beginTransaction();
+        session.save(p);
+        transaction.commit();
+
+        session.get(Person.class, 101L);
+
+        boolean containsEntity = sessionFactory.getCache().containsEntity(Person.class, 101L);
+        Assert.assertTrue(containsEntity);
+
+        Thread.sleep(3000);
+
+        containsEntity = sessionFactory.getCache().containsEntity(Person.class, 101L);
+        Assert.assertTrue(containsEntity);
+
+    }
+
     @Test
     public void testNoExpireProvided() throws Exception {