replace guava with caffeine

This commit is contained in:
death-claw
2021-05-08 13:03:20 +01:00
parent 06d636329e
commit b08b730dff
4 changed files with 15 additions and 35 deletions
+3 -3
View File
@@ -81,9 +81,9 @@
<version>2.0.1</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>28.1-jre</version>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>tn.mnlr</groupId>
@@ -49,8 +49,8 @@ public class QueuedRepository implements IQueuedRepository, ApplicationEventPubl
List<Queued> 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<Queued> findById(Long id) {
List<Queued> 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 {
@@ -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<Key, Metadata> 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 {
@@ -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<Queued, MultiPostScanResult> 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) {