From b08b730dffad857f3c0a69f2d20a1dda0c76f38b Mon Sep 17 00:00:00 2001
From: death-claw <53543762+death-claw@users.noreply.github.com>
Date: Sat, 8 May 2021 13:03:20 +0100
Subject: [PATCH] replace guava with caffeine
---
vripper-server/pom.xml | 6 +++---
.../repositories/impl/QueuedRepository.java | 8 +++-----
.../vripper/services/MetadataService.java | 16 +++------------
.../tn/mnlr/vripper/services/PostService.java | 20 ++++++-------------
4 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/vripper-server/pom.xml b/vripper-server/pom.xml
index f66f559..27e52b5 100644
--- a/vripper-server/pom.xml
+++ b/vripper-server/pom.xml
@@ -81,9 +81,9 @@
2.0.1
- com.google.guava
- guava
- 28.1-jre
+ com.github.ben-manes.caffeine
+ caffeine
+ 3.0.2
tn.mnlr
diff --git a/vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/QueuedRepository.java b/vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/QueuedRepository.java
index 927bd5c..550d5f0 100644
--- a/vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/QueuedRepository.java
+++ b/vripper-server/src/main/java/tn/mnlr/vripper/jpa/repositories/impl/QueuedRepository.java
@@ -49,8 +49,8 @@ public class QueuedRepository implements IQueuedRepository, ApplicationEventPubl
List queuedList =
jdbcTemplate.query(
"SELECT * FROM QUEUED AS queued WHERE queued.THREAD_ID = ?",
- new Object[] {threadId},
- new QueuedRowMapper());
+ new QueuedRowMapper(),
+ threadId);
if (queuedList.isEmpty()) {
return Optional.empty();
} else {
@@ -67,9 +67,7 @@ public class QueuedRepository implements IQueuedRepository, ApplicationEventPubl
public Optional findById(Long id) {
List queuedList =
jdbcTemplate.query(
- "SELECT * FROM QUEUED AS queued WHERE queued.ID = ?",
- new Object[] {id},
- new QueuedRowMapper());
+ "SELECT * FROM QUEUED AS queued WHERE queued.ID = ?", new QueuedRowMapper(), id);
if (queuedList.isEmpty()) {
return Optional.empty();
} else {
diff --git a/vripper-server/src/main/java/tn/mnlr/vripper/services/MetadataService.java b/vripper-server/src/main/java/tn/mnlr/vripper/services/MetadataService.java
index b8e5263..fa3219a 100644
--- a/vripper-server/src/main/java/tn/mnlr/vripper/services/MetadataService.java
+++ b/vripper-server/src/main/java/tn/mnlr/vripper/services/MetadataService.java
@@ -1,8 +1,7 @@
package tn.mnlr.vripper.services;
-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 lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import net.jodah.failsafe.Failsafe;
@@ -10,7 +9,6 @@ import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.util.EntityUtils;
-import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@@ -52,15 +50,7 @@ public class MetadataService {
this.htmlProcessorService = htmlProcessorService;
this.xpathService = xpathService;
this.threadPoolService = threadPoolService;
-
- CacheLoader loader =
- new CacheLoader<>() {
- @Override
- public Metadata load(@NonNull Key key) {
- return fetchMetadata(key);
- }
- };
- cache = CacheBuilder.newBuilder().expireAfterWrite(30, TimeUnit.MINUTES).build(loader);
+ cache = Caffeine.newBuilder().expireAfterWrite(30, TimeUnit.MINUTES).build(this::fetchMetadata);
}
public Metadata get(Post post) throws ExecutionException {
diff --git a/vripper-server/src/main/java/tn/mnlr/vripper/services/PostService.java b/vripper-server/src/main/java/tn/mnlr/vripper/services/PostService.java
index 098e89e..1b26aa8 100644
--- a/vripper-server/src/main/java/tn/mnlr/vripper/services/PostService.java
+++ b/vripper-server/src/main/java/tn/mnlr/vripper/services/PostService.java
@@ -1,11 +1,9 @@
package tn.mnlr.vripper.services;
-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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.lang.NonNull;
import org.springframework.stereotype.Service;
import tn.mnlr.vripper.jpa.domain.Post;
import tn.mnlr.vripper.jpa.domain.Queued;
@@ -35,16 +33,10 @@ public class PostService {
this.dataService = dataService;
this.threadPoolService = threadPoolService;
this.metadataService = metadataService;
-
- CacheLoader loader =
- new CacheLoader<>() {
- @Override
- public MultiPostScanResult load(@NonNull Queued multiPostItem) throws Exception {
- return new MultiPostScanParser(multiPostItem).parse();
- }
- };
-
- cache = CacheBuilder.newBuilder().expireAfterWrite(30, TimeUnit.MINUTES).build(loader);
+ cache =
+ Caffeine.newBuilder()
+ .expireAfterWrite(5, TimeUnit.MINUTES)
+ .build(multiPostItem -> new MultiPostScanParser(multiPostItem).parse());
}
public void stopFetchingMetadata(Post post) {