Rename config option

Author: ben-manes

README.md

@@ -33,8 +33,8 @@ Snapshots of the development version is available in
 In addition Caffeine offers extensions for [tracing][3], [simulation][4], [JSR-107 JCache][5],
 and [Guava][6] adapters.
 
-[1]: https://github.com/ben-manes/caffeine/wiki
-[2]: https://github.com/ben-manes/caffeine/wiki/Benchmarks
+[1]: https://github.com/ben-manes/caffeine/wiki/Benchmarks
+[2]: https://github.com/ben-manes/caffeine/wiki
 [3]: https://github.com/ben-manes/caffeine/wiki/Tracing
 [4]: https://github.com/ben-manes/caffeine/wiki/Simulator
 [5]: https://github.com/ben-manes/caffeine/wiki/JCache

build.gradle

@@ -30,7 +30,6 @@ subprojects { proj ->
   if (proj.name == 'tracing') {
     return
   }
-
   apply plugin: 'com.github.ethankhall.semantic-versioning'
   apply plugin: 'org.dm.bundle'
   apply plugin: 'errorprone'

caffeine/src/main/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java

@@ -219,13 +219,17 @@ protected boolean hasRemovalListener() {
   /** Asynchronously sends a removal notification to the listener. */
   void notifyRemoval(@Nullable K key, @Nullable V value, RemovalCause cause) {
     requireState(hasRemovalListener(), "Notification should be guarded with a check");
-    executor().execute(() -> {
-      try {
-        removalListener().onRemoval(new RemovalNotification<K, V>(key, value, cause));
-      } catch (Throwable t) {
-        logger.log(Level.WARNING, "Exception thrown by removal listener", t);
-      }
-    });
+    try {
+      executor().execute(() -> {
+        try {
+          removalListener().onRemoval(new RemovalNotification<K, V>(key, value, cause));
+        } catch (Throwable t) {
+          logger.log(Level.WARNING, "Exception thrown by removal listener", t);
+        }
+      });
+    } catch (Throwable t) {
+      logger.log(Level.SEVERE, "Exception thrown when submitting removal listener", t);
+    }
   }
 
   /* ---------------- Reference Support -------------- */

caffeine/src/main/java/com/github/benmanes/caffeine/cache/Caffeine.java

@@ -683,7 +683,7 @@ Supplier<? extends StatsCounter> getStatsCounterSupplier() {
    * @throws NullPointerException if the specified supplier is null
    */
   @Nonnull
-  public Caffeine<K, V> named(@Nonnull Supplier<String> nameSupplier) {
+  public Caffeine<K, V> name(@Nonnull Supplier<String> nameSupplier) {
     requireState(this.nameSupplier == null);
     this.nameSupplier = requireNonNull(nameSupplier);
     return this;

caffeine/src/test/java/com/github/benmanes/caffeine/cache/BoundedLocalCacheTest.java

@@ -29,7 +29,6 @@
 import java.util.Map.Entry;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
-import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.testng.annotations.Listeners;
@@ -88,7 +87,7 @@ public void putWeighted_noOverflow() {
     assertThat(map.adjustedWeightedSize(), is(BoundedLocalCache.MAXIMUM_CAPACITY));
   }
 
-  @Test(dataProvider = "caches", expectedExceptions = RejectedExecutionException.class)
+  @Test(dataProvider = "caches")
   @CacheSpec(compute = Compute.SYNC, implementation = Implementation.Caffeine,
       population = Population.FULL, maximumSize = MaximumSize.FULL,
       executor = CacheExecutor.REJECTING, removalListener = Listener.CONSUMING)

caffeine/src/test/java/com/github/benmanes/caffeine/cache/CaffeineTest.java

@@ -411,19 +411,19 @@ public void removalListener() {
   /* ---------------- named -------------- */
 
   @Test(expectedExceptions = NullPointerException.class)
-  public void named_null() {
-    Caffeine.newBuilder().named(null);
+  public void name_null() {
+    Caffeine.newBuilder().name(null);
   }
 
   @Test(expectedExceptions = IllegalStateException.class)
-  public void named_twice() {
-    Caffeine.newBuilder().named(() -> "a").named(() -> "b");
+  public void name_twice() {
+    Caffeine.newBuilder().name(() -> "a").name(() -> "b");
   }
 
   @Test
-  public void named() {
+  public void name() {
     Supplier<String> nameSupplier = () -> "a";
-    Caffeine<?, ?> builder = Caffeine.newBuilder().named(nameSupplier);
+    Caffeine<?, ?> builder = Caffeine.newBuilder().name(nameSupplier);
     assertThat(builder.nameSupplier, is(nameSupplier));
     builder.build();
   }

jcache/src/main/java/com/github/benmanes/caffeine/jcache/CacheFactory.java

@@ -117,7 +117,7 @@ private final class Builder<K, V> {
       this.statistics = new JCacheStatisticsMXBean();
       this.expiry = config.getExpiryPolicyFactory().create();
 
-      caffeine.named(cacheName::toString);
+      caffeine.name(cacheName::toString);
       if (config.getCacheLoaderFactory() != null) {
         cacheLoader = config.getCacheLoaderFactory().create();
       }