Fix issue #1

- Fix for https://github.com/mihaicostin/hibernate-l2-memcached/issues/ : take into account the region specific cache cacheTimeSeconds setting.
- Move all tests to java (from groovy) and add some new tests for Issue #1

Author: mihaicostin

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.github.mihaicostin</groupId>
     <artifactId>hibernate-l2-memcached</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>hibernate-l2-memcached</name>
     <description>A library for using Memcached as a second level distributed cache in Hibernate.</description>
     <url>https://github.com/mihaicostin/hibernate-l2-memcached</url>
@@ -43,9 +43,7 @@
         <spymemcached.version>2.11.6</spymemcached.version>
         <slf4j-api.version>1.5.6</slf4j-api.version>
 
-        <junit.version>4.4</junit.version>
-        <gmaven.version>1.5</gmaven.version>
-        <groovy.version>1.6.3</groovy.version>
+        <junit.version>4.12</junit.version>
         <hsqldb.version>2.3.2</hsqldb.version>
         <slf4j-log4j12.version>1.5.6</slf4j-log4j12.version>
     </properties>
@@ -72,56 +70,6 @@
                     </descriptorRefs>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
-                <version>1.5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generateTestStubs</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- Allow writing tests in Groovy -->
-            <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>gmaven-plugin</artifactId>
-                <version>${gmaven.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generateTestStubs</goal>
-                            <goal>testCompile</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <providerSelection>1.7</providerSelection>
-                    <source>src/main/groovy</source>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.codehaus.gmaven.runtime</groupId>
-                        <artifactId>gmaven-runtime-2.0</artifactId>
-                        <version>${gmaven.version}</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>org.codehaus.groovy</groupId>
-                                <artifactId>groovy-all</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-all</artifactId>
-                        <version>${groovy.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
 
             <!-- Releasing to OSSRH -->
             <plugin>
@@ -178,12 +126,6 @@
             <version>${hsqldb.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <version>${groovy.version}</version>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 

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

@@ -15,14 +15,13 @@
 
 package com.mc.hibernate.memcached;
 
-import java.util.Map;
-
+import com.mc.hibernate.memcached.keystrategy.KeyStrategy;
+import com.mc.hibernate.memcached.keystrategy.Sha1KeyStrategy;
 import org.hibernate.cache.CacheException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mc.hibernate.memcached.keystrategy.KeyStrategy;
-import com.mc.hibernate.memcached.keystrategy.Sha1KeyStrategy;
+import java.util.Map;
 
 /**
  * Wrapper around MemcachedClient instance to provide the bridge between Hibernate and Memcached.
@@ -63,9 +62,10 @@ public class MemcachedCache {
 
     public static final Integer DOGPILE_TOKEN = 0;
 
-    public MemcachedCache(String regionName, Memcache memcachedClient) {
+    public MemcachedCache(String regionName, Memcache memcachedClient, Config config) {
         this.regionName = (regionName != null) ? regionName : "default";
         this.memcache = memcachedClient;
+        this.cacheTimeSeconds = config.getCacheTimeSeconds(this.regionName);
         clearIndexKey = this.regionName.replaceAll("\\s", "") + ":index_key";
     }
 

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

@@ -15,29 +15,18 @@
 
 package com.mc.hibernate.memcached;
 
-import java.lang.reflect.Constructor;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
+import com.mc.hibernate.memcached.region.*;
 import org.hibernate.cache.CacheException;
-import org.hibernate.cache.spi.CacheDataDescription;
-import org.hibernate.cache.spi.CollectionRegion;
-import org.hibernate.cache.spi.EntityRegion;
-import org.hibernate.cache.spi.NaturalIdRegion;
-import org.hibernate.cache.spi.QueryResultsRegion;
-import org.hibernate.cache.spi.RegionFactory;
-import org.hibernate.cache.spi.TimestampsRegion;
+import org.hibernate.cache.spi.*;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cfg.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.mc.hibernate.memcached.region.MemcachedCollectionRegion;
-import com.mc.hibernate.memcached.region.MemcachedEntityRegion;
-import com.mc.hibernate.memcached.region.MemcachedNaturalIdRegion;
-import com.mc.hibernate.memcached.region.MemcachedQueryResultsRegion;
-import com.mc.hibernate.memcached.region.MemcachedTimestampsRegion;
+import java.lang.reflect.Constructor;
+import java.util.Properties;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 
 public class MemcachedRegionFactory implements RegionFactory {
@@ -132,6 +121,6 @@ protected MemcacheClientFactory getMemcachedClientFactory(Config config) {
     }
 
     private MemcachedCache getCache(String regionName) {
-        return caches.get(regionName) == null ? new MemcachedCache(regionName, client) : caches.get(regionName);
+        return caches.get(regionName) == null ? new MemcachedCache(regionName, client, new Config(new PropertiesHelper(properties))) : caches.get(regionName);
     }
 }