Address PR review

Author: SiyaoIsHiding

core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlPrepareAsyncProcessor.java

@@ -34,7 +34,6 @@
 import com.datastax.oss.driver.internal.core.session.RequestProcessor;
 import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures;
 import com.datastax.oss.driver.internal.core.util.concurrent.RunOrSchedule;
-import com.datastax.oss.driver.shaded.guava.common.base.Functions;
 import com.datastax.oss.driver.shaded.guava.common.cache.Cache;
 import com.datastax.oss.driver.shaded.guava.common.cache.CacheBuilder;
 import com.datastax.oss.driver.shaded.guava.common.collect.Iterables;
@@ -64,14 +63,17 @@ public CqlPrepareAsyncProcessor() {
   }
 
   public CqlPrepareAsyncProcessor(@NonNull Optional<? extends DefaultDriverContext> context) {
-    this(context, Functions.identity());
+    this(context, CacheBuilder::weakValues);
   }
 
   protected CqlPrepareAsyncProcessor(
       Optional<? extends DefaultDriverContext> context,
       Function<CacheBuilder<Object, Object>, CacheBuilder<Object, Object>> decorator) {
 
-    CacheBuilder<Object, Object> baseCache = CacheBuilder.newBuilder().weakValues();
+    // CASSJAVA-104
+    // Note that the base cache does NOT use weak values like the one-arg constructor it previously
+    // does!
+    CacheBuilder<Object, Object> baseCache = CacheBuilder.newBuilder();
     this.cache = decorator.apply(baseCache).build();
     context.ifPresent(
         (ctx) -> {
@@ -83,19 +85,6 @@ protected CqlPrepareAsyncProcessor(
         });
   }
 
-  protected CqlPrepareAsyncProcessor(
-      Optional<? extends DefaultDriverContext> context, CacheBuilder<Object, Object> cacheBuilder) {
-    this.cache = cacheBuilder.build();
-    context.ifPresent(
-        (ctx) -> {
-          LOG.info("Adding handler to invalidate cached prepared statements on type changes");
-          EventExecutor adminExecutor = ctx.getNettyOptions().adminEventExecutorGroup().next();
-          ctx.getEventBus()
-              .register(
-                  TypeChangeEvent.class, RunOrSchedule.on(adminExecutor, this::onTypeChanged));
-        });
-  }
-
   private static boolean typeMatches(UserDefinedType oldType, DataType typeToCheck) {
 
     switch (typeToCheck.getProtocolCode()) {

integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementCachingIT.java

@@ -40,7 +40,6 @@
 import com.datastax.oss.driver.internal.core.session.BuiltInRequestProcessors;
 import com.datastax.oss.driver.internal.core.session.RequestProcessor;
 import com.datastax.oss.driver.internal.core.session.RequestProcessorRegistry;
-import com.datastax.oss.driver.shaded.guava.common.cache.CacheBuilder;
 import com.datastax.oss.driver.shaded.guava.common.cache.RemovalListener;
 import com.datastax.oss.driver.shaded.guava.common.util.concurrent.Uninterruptibles;
 import com.google.common.collect.ImmutableList;
@@ -136,7 +135,7 @@ private static RemovalListener<Object, Object> buildCacheRemoveCallback(
     public TestCqlPrepareAsyncProcessor(@NonNull Optional<DefaultDriverContext> context) {
       // Default CqlPrepareAsyncProcessor uses weak values here as well.  We avoid doing so
       // to prevent cache entries from unexpectedly disappearing mid-test.
-      super(context, CacheBuilder.newBuilder().removalListener(buildCacheRemoveCallback(context)));
+      super(context, builder -> builder.removalListener(buildCacheRemoveCallback(context)));
     }
   }
 

integration-tests/src/test/java/com/datastax/oss/driver/core/cql/PreparedStatementCancellationIT.java

@@ -39,12 +39,12 @@
 import com.datastax.oss.driver.internal.core.session.RequestProcessorRegistry;
 import com.datastax.oss.driver.shaded.guava.common.base.Predicates;
 import com.datastax.oss.driver.shaded.guava.common.cache.Cache;
-import com.datastax.oss.driver.shaded.guava.common.cache.CacheBuilder;
 import com.datastax.oss.driver.shaded.guava.common.collect.Iterables;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -69,7 +69,7 @@ private static class TestCqlPrepareAsyncProcessor extends CqlPrepareAsyncProcess
     public TestCqlPrepareAsyncProcessor(@NonNull Optional<DefaultDriverContext> context) {
       // Default CqlPrepareAsyncProcessor uses weak values here as well.  We avoid doing so
       // to prevent cache entries from unexpectedly disappearing mid-test.
-      super(context, CacheBuilder.newBuilder());
+      super(context, Function.identity());
     }
   }