TRR: Dependency remediation (WiP)

Author: stonesmi

plugin/virtualized-table-plugin/pom.xml

@@ -51,13 +51,17 @@
             <version>${scala.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+            <version>${caffeine.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
 
-
-
         <dependency>
             <groupId>org.scalatest</groupId>
             <artifactId>scalatest_2.13</artifactId>

plugin/virtualized-table-plugin/src/main/scala/org/finos/vuu/plugin/virtualized/table/WindowedCache.scala

@@ -2,7 +2,7 @@ package org.finos.vuu.plugin.virtualized.table
 
 import org.finos.toolbox.time.Clock
 import org.finos.vuu.core.table.RowData
-import org.finos.vuu.plugin.virtualized.table.cache.GuavaWindowedRowDataCache
+import org.finos.vuu.plugin.virtualized.table.cache.CaffeineWindowedRowDataCache
 
 trait WindowedCache[KEY, VALUE] {
   def put(key: KEY, v: VALUE): Unit
@@ -13,7 +13,7 @@ trait WindowedCache[KEY, VALUE] {
 
 object RowDataCache{
   def apply(cacheSize: Int)(implicit clock: Clock): WindowedCache[String, RowData] = {
-    new GuavaWindowedRowDataCache(cacheSize)
+    new CaffeineWindowedRowDataCache(cacheSize)
   }
 
 }

…le/cache/GuavaWindowedRowDataCache.scala …cache/CaffeineWindowedRowDataCache.scalaplugin/virtualized-table-plugin/src/main/scala/org/finos/vuu/plugin/virtualized/table/cache/GuavaWindowedRowDataCache.scala renamed to plugin/virtualized-table-plugin/src/main/scala/org/finos/vuu/plugin/virtualized/table/cache/CaffeineWindowedRowDataCache.scala plugin/virtualized-table-plugin/src/main/scala/org/finos/vuu/plugin/virtualized/table/cache/GuavaWindowedRowDataCache.scala renamed to plugin/virtualized-table-plugin/src/main/scala/org/finos/vuu/plugin/virtualized/table/cache/CaffeineWindowedRowDataCache.scala

@@ -1,6 +1,6 @@
 package org.finos.vuu.plugin.virtualized.table.cache
 
-import com.google.common.cache.{Cache, CacheBuilder, RemovalListener, RemovalNotification}
+import com.github.benmanes.caffeine.cache.{Cache, Caffeine, RemovalCause}
 import com.typesafe.scalalogging.StrictLogging
 import org.finos.toolbox.logging.LogAtFrequency
 import org.finos.toolbox.time.Clock
@@ -9,22 +9,19 @@ import org.finos.vuu.plugin.virtualized.table.WindowedCache
 
 import java.util.concurrent.atomic.AtomicInteger
 
-class GuavaWindowedRowDataCache(val cacheSize: Int)(implicit clock: Clock) extends WindowedCache[String, RowData] with StrictLogging {
+class CaffeineWindowedRowDataCache(val cacheSize: Int)(implicit clock: Clock) extends WindowedCache[String, RowData] with StrictLogging {
 
   val logAtFrequency = new LogAtFrequency(10_000)
   val removalCounter = new AtomicInteger()
 
-  val cache: Cache[String, RowData] = CacheBuilder.newBuilder()
+  val cache: Cache[String, RowData] = Caffeine.newBuilder()
     .maximumSize(cacheSize)
-    .removalListener((notification: RemovalNotification[String, RowData]) => {
-
+    .removalListener((_: String, _: RowData, _: RemovalCause) => {
       val count = removalCounter.incrementAndGet()
-
-      if(logAtFrequency.shouldLog()){
+      if (logAtFrequency.shouldLog()) {
         logger.debug(s"[ROWCACHE] Removing ${count} rowCache keys in last 10 seconds")
         removalCounter.set(0)
       }
-
     })
     .build()
 

pom.xml

@@ -75,6 +75,7 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <scala.version>2.13.14</scala.version>
+        <caffeine.version>3.2.1</caffeine.version>
         <metrics.version>4.2.5</metrics.version>
         <curator.version>3.1.0</curator.version>
         <scalatest.version>3.2.19</scalatest.version>
@@ -90,7 +91,6 @@
         <logback.version>1.5.6</logback.version>
         <slf4j.version>2.0.13</slf4j.version>
         <jmh.version>1.36</jmh.version>
-        <guava.version>32.0.1-jre</guava.version>
         <maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
         <gpg.executable>gpg</gpg.executable>
         <publish.server.id>ossrh</publish.server.id>

vuu/pom.xml

@@ -20,12 +20,6 @@
             <version>0.9.76-SNAPSHOT</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>