Switched to Spring Cache

Author: Mikalai Alimenkou

src/main/java/com/xpinjection/library/LibraryApplication.java

@@ -5,8 +5,10 @@
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cache.annotation.EnableCaching;
 
 @SpringBootApplication
+@EnableCaching
 @EnableConfigurationProperties(LibrarySettings.class)
 public class LibraryApplication {
 	public static void main(String[] args) {

src/main/java/com/xpinjection/library/service/impl/BookServiceImpl.java

@@ -8,14 +8,13 @@
 import io.micrometer.observation.annotation.Observed;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.stream.Stream;
 
 import static net.logstash.logback.argument.StructuredArguments.value;
 import static net.logstash.logback.marker.Markers.append;
@@ -28,18 +27,21 @@
 @Transactional
 public class BookServiceImpl implements BookService {
     private final BookDao bookDao;
-    private final ConcurrentMap<String, List<Book>> cache = new ConcurrentHashMap<>();
+    private final Cache cache;
 
-    public BookServiceImpl(BookDao bookDao) {
+    public BookServiceImpl(BookDao bookDao, CacheManager cacheManager) {
         this.bookDao = bookDao;
+        this.cache = cacheManager.getCache("booksByAuthor");
     }
 
     @Override
     public List<BookDto> addBooks(Books books) {
         LOG.info("Adding books: {}", books);
-        return toDto(books.stream()
+        var savedBooks = books.stream()
                 .map(entry -> new Book(entry.getKey(), entry.getValue()))
-                .map(bookDao::save));
+                .map(bookDao::save)
+                .toList();
+        return toDto(savedBooks);
     }
 
     @Override
@@ -52,14 +54,14 @@ public List<BookDto> findBooksByAuthor(String author) {
                 "Try to find books by author: {}", value("author", author));
         Assert.hasText(author, "Author is empty!");
         var normalizedAuthor = normalizeAuthorName(author);
-        var books = cache.computeIfAbsent(normalizedAuthor, bookDao::findByAuthor).stream();
+        var books = cache.get(normalizedAuthor, () -> bookDao.findByAuthor(author));
         return toDto(books);
     }
 
     @Override
     public List<BookDto> findAllBooks() {
         LOG.info("Finding all books");
-        return toDto(bookDao.findAll().stream());
+        return toDto(bookDao.findAll());
     }
 
     private String normalizeAuthorName(String author) {
@@ -81,8 +83,9 @@ private String splitOnFirstAndLastNames(String author) {
         return String.join(" ", firstName, lastName);
     }
 
-    private List<BookDto> toDto(Stream<Book> books) {
-        return books.map(BookServiceImpl::toDto)
+    private List<BookDto> toDto(List<Book> books) {
+        return books.stream()
+                .map(BookServiceImpl::toDto)
                 .toList();
     }
 

src/main/resources/application-perftest.yaml

@@ -3,6 +3,8 @@ spring:
     url: jdbc:postgresql://db:5432/library
     username: test
     password: test
+  cache:
+    type: none
 
 management:
   otlp:

src/main/resources/application.yaml

@@ -70,6 +70,9 @@ spring:
       static-locations: classpath:/static/, classpath:/api/spec/
   jmx:
     enabled: false
+  cache:
+    type: simple
+    cache-names: booksByAuthor
 
 library:
   size: 0

src/test/java/com/xpinjection/library/service/BookServiceTest.java

@@ -10,6 +10,7 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +34,7 @@ public class BookServiceTest {
 
     @BeforeEach
     void init() {
-        bookService = new BookServiceImpl(dao);
+        bookService = new BookServiceImpl(dao, new ConcurrentMapCacheManager("booksByAuthor"));
     }
 
     @Test