Merge pull request #1040 from rubenporras/cacheConfiguration

add support for concurrencyLevel in the CacheConfiguration

Author: rubenporras

com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/caching/CacheConfiguration.java

@@ -22,6 +22,7 @@ public class CacheConfiguration {
 
   private long cacheSize = UNSET_INT;
   private int initialCapacity = UNSET_INT;
+  private int concurrencyLevel = UNSET_INT;
 
   /**
    * All values stored in the cache are wrapped as {@link java.lang.ref.SoftReference SoftReference}, allowing them to be garbage collected as necessary.
@@ -96,4 +97,17 @@ public CacheConfiguration setInitialCapacity(final int capacity) {
   public int getInitialCapacity() {
     return initialCapacity;
   }
+
+  public int getConcurrencyLevel() {
+    return concurrencyLevel;
+  }
+
+  /**
+   * Setsthe concurrency level for the cache. Guava concurrent maps creates as many segments
+   * as the specified concurrency level, each segment having its own lock.
+   * If not set, a reasonable default is deternimed by the library according to the number of CPUs.
+   */
+  public void setConcurrencyLevel(final int concurrencyLevel) {
+    this.concurrencyLevel = concurrencyLevel;
+  }
 }

com.avaloq.tools.ddk/src/com/avaloq/tools/ddk/caching/MapCache.java

@@ -74,6 +74,9 @@ public int weigh(final K key, final V value) {
         cacheBuilder.maximumSize(config.getMaximumSize());
       }
     }
+    if (config.getConcurrencyLevel() >= 0) {
+      cacheBuilder.concurrencyLevel(config.getConcurrencyLevel());
+    }
     return cacheBuilder;
   }