Started migrating to Caffeine

Author: wolpert

gradle/libs.versions.toml

@@ -8,6 +8,7 @@ aws-dynamodblocal = "2.6.0"
 awsSDK1 = "1.12.782"
 awsSDK2 = "2.31.6"
 c3p0 = "0.10.2"
+caffine = "3.2.0"
 commons-io = "2.18.0"
 dagger = "2.56"
 dropwizard4 = "4.0.12"
@@ -36,6 +37,8 @@ aws-dynamodblocal = { module = "com.amazonaws:DynamoDBLocal", version.ref = "aws
 aws-sdk-ddb = { module = "com.amazonaws:aws-java-sdk-dynamodb", version.ref = "awsSDK1" }
 aws-sdk2-bom = { module = "software.amazon.awssdk:bom", version.ref = "awsSDK2" }
 c3p0 =  { module = "com.mchange:c3p0", version.ref ="c3p0" }
+caffine = { module = "com.github.ben-manes.caffeine:caffeine", version.ref = "caffine" }
+caffine-jcache = { module = "com.github.ben-manes.caffeine:jcache", version.ref = "caffine" }
 commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
 dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
@@ -74,6 +77,7 @@ testcontainers-postgres = { module = "org.testcontainers:postgresql", version.re
 javapoet = { module = "com.squareup:kotlinpoet-javapoet", version = "2.1.0" }
 
 [bundles]
+caffine = ["caffine", "caffine-jcache"]
 dagger-annotation = ['javapoet', 'dagger-compiler']
 jackson = ['jackson-dataformat-yaml']
 logback = ['logback-classic', 'logback-core']

oop-mock-client/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.jackson.annotations)
     implementation(libs.jackson.datatype.jdk8)
-    implementation(libs.guava)
+    implementation(libs.bundles.caffine)
     implementation(libs.commons.io)
 
     implementation(libs.dagger)

oop-mock-client/src/main/java/com/codeheadsystems/oop/client/OopMockClientFactory.java

@@ -17,9 +17,8 @@
 package com.codeheadsystems.oop.client;
 
 import com.codeheadsystems.oop.client.dagger.OopMockClientAssistedFactory;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.slf4j.Logger;
@@ -43,7 +42,7 @@ public class OopMockClientFactory {
   @Inject
   public OopMockClientFactory(final OopMockClientAssistedFactory assistedFactory) {
     LOGGER.info("OopMockClientFactory()");
-    this.cache = CacheBuilder.newBuilder().build(CacheLoader.from(assistedFactory::create));
+    this.cache = Caffeine.newBuilder().build(assistedFactory::create);
   }
 
   /**
@@ -54,7 +53,7 @@ public OopMockClientFactory(final OopMockClientAssistedFactory assistedFactory)
    */
   public OopMockClient generate(final Class<?> clazz) {
     LOGGER.info("generate({})", clazz);
-    return cache.getUnchecked(clazz);
+    return cache.get(clazz);
   }
 
 }

oop-mock/build.gradle.kts

@@ -7,7 +7,7 @@ dependencies {
     implementation(libs.slf4j.api)
     implementation(libs.jackson.annotations)
     implementation(libs.jackson.datatype.jdk8)
-    implementation(libs.guava)
+    implementation(libs.bundles.caffine)
     implementation(libs.commons.io)
 
     implementation(libs.dagger)

oop-mock/src/main/java/com/codeheadsystems/oop/OopMockFactory.java

@@ -18,9 +18,8 @@
 
 import com.codeheadsystems.oop.dagger.ClassOopMockFactory;
 import com.codeheadsystems.oop.mock.PassThroughOopMock;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.slf4j.Logger;
@@ -48,9 +47,9 @@ public OopMockFactory(final OopMockConfiguration oopMockConfiguration,
                         final PassThroughOopMock passThroughOopMock) {
     if (oopMockConfiguration.enabled()) {
       LOGGER.info("OopMockFactory() -> enabled");
-      final LoadingCache<Class<?>, OopMock> oppMockCache = CacheBuilder.newBuilder()
-          .build(CacheLoader.from(classOopMockFactory::create));
-      generator = oppMockCache::getUnchecked;
+      final LoadingCache<Class<?>, OopMock> oppMockCache = Caffeine.newBuilder()
+          .build(classOopMockFactory::create);
+      generator = oppMockCache::get;
     } else {
       LOGGER.info("OopMockFactory() -> disabled");
       generator = c -> passThroughOopMock;