[JAVA-40687] Moving some article links on Github - spring-boot-caching (#18122)

Author: panos-kakos

spring-boot-modules/spring-boot-caching-2/README.md

@@ -1,7 +1,8 @@
 ## Relevant articles
-- [Spring Boot Cache with Redis](https://www.baeldung.com/spring-boot-redis-cache)
-- [Setting Time-To-Live Value for Caching](https://www.baeldung.com/spring-setting-ttl-value-cache)
 - [Get All Cached Keys with Caffeine Cache in Spring Boot](https://www.baeldung.com/spring-boot-caffeine-spring-get-all-keys)
 - [Implement Two-Level Cache With Spring](https://www.baeldung.com/spring-two-level-cache)
+- [Testing @Cacheable on Spring Data Repositories](https://www.baeldung.com/spring-data-testing-cacheable)
+- [Spring Cache – Creating a Custom KeyGenerator](http://www.baeldung.com/spring-cache-custom-keygenerator)
+- [Introduction To Ehcache](http://www.baeldung.com/ehcache)
 - More articles: [[<-- prev]](/spring-boot-modules/spring-boot-caching)
 

spring-boot-modules/spring-boot-caching-2/pom.xml

@@ -23,6 +23,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
@@ -41,10 +45,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.ben-manes.caffeine</groupId>
             <artifactId>caffeine</artifactId>
@@ -62,12 +62,17 @@
             </exclusions>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.ehcache</groupId>
+            <artifactId>ehcache</artifactId>
+            <classifier>jakarta</classifier>
+        </dependency>
     </dependencies>
 
     <properties>
         <embedded.redis.version>1.4.0</embedded.redis.version>
         <caffeine.version>3.1.8</caffeine.version>
-        <start-class>com.baeldung.caching.ttl.CachingTTLApplication</start-class>
+        <start-class>com.baeldung.caching.twolevelcache.TwoLevelCacheApplication</start-class>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java renamed to spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/config/ApplicationCacheConfig.java

@@ -1,5 +1,7 @@
 package com.baeldung.caching.config;
 
+import java.util.Arrays;
+
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
@@ -9,8 +11,6 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.Arrays;
-
 @EnableCaching
 @Configuration
 public class ApplicationCacheConfig {

spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java renamed to spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/config/CustomKeyGenerator.java

@@ -1,10 +1,10 @@
 package com.baeldung.caching.config;
 
+import java.lang.reflect.Method;
+
 import org.springframework.cache.interceptor.KeyGenerator;
 import org.springframework.util.StringUtils;
 
-import java.lang.reflect.Method;
-
 public class CustomKeyGenerator implements KeyGenerator {
 
     public Object generate(Object target, Method method, Object... params) {

spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/example/BookService.java renamed to spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/example/BookService.java

@@ -1,11 +1,12 @@
 package com.baeldung.caching.example;
 
-import com.baeldung.caching.model.Book;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.baeldung.caching.model.Book;
 
 @Component
 public class BookService {

spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/model/Book.java renamed to spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/model/Book.java

@@ -1,9 +1,10 @@
 package com.baeldung.ehcache.calculator;
 
-import com.baeldung.ehcache.config.CacheHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.baeldung.ehcache.config.CacheHelper;
+
 public class SquaredCalculator {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SquaredCalculator.class);

spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java renamed to spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/ehcache/calculator/SquaredCalculator.java

@@ -0,0 +1,18 @@
+package com.baeldung.springdatacaching;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+//import org.springframework.context.annotation.ComponentScan;
+
+@SpringBootApplication
+@EnableCaching
+//to run any module like ehcache,caching or multiplecachemanager in local machine 
+//add it's package for ComponentScan like below
+//@ComponentScan("com.baeldung.multiplecachemanager")
+public class CacheApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(CacheApplication.class, args);
+    }
+}

spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/ehcache/config/CacheHelper.java renamed to spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/ehcache/config/CacheHelper.java

@@ -1,11 +1,12 @@
 package com.baeldung.springdatacaching.repositories;
 
-import com.baeldung.springdatacaching.model.Book;
+import java.util.Optional;
+import java.util.UUID;
+
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.data.repository.CrudRepository;
 
-import java.util.Optional;
-import java.util.UUID;
+import com.baeldung.springdatacaching.model.Book;
 
 public interface BookRepository extends CrudRepository<Book, UUID> {
 

spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/springdatacaching/CacheApplication.java

@@ -6,8 +6,6 @@ spring.datasource.password=
 spring.h2.console.enabled=true
 spring.h2.console.path=/h2
 spring.jpa.hibernate.ddl-auto=update
-#setting cache TTL
-caching.spring.hotelListTTL=43200
 # Connection details
 #spring.redis.host=localhost
 #spring.redis.port=6379

spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/springdatacaching/model/Book.java renamed to spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/springdatacaching/model/Book.java

@@ -1,14 +1,15 @@
 package com.baeldung.ehcache;
 
-import com.baeldung.ehcache.calculator.SquaredCalculator;
-import com.baeldung.ehcache.config.CacheHelper;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import com.baeldung.ehcache.calculator.SquaredCalculator;
+import com.baeldung.ehcache.config.CacheHelper;
 
 public class SquareCalculatorUnitTest {
 

spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/springdatacaching/repositories/BookRepository.java renamed to spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/springdatacaching/repositories/BookRepository.java

@@ -1,7 +1,12 @@
 package com.baeldung.springdatacaching.repositories;
 
-import com.baeldung.caching.boot.CacheApplication;
-import com.baeldung.springdatacaching.model.Book;
+import static java.util.Optional.empty;
+import static java.util.Optional.ofNullable;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Optional;
+import java.util.UUID;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -12,12 +17,8 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import java.util.Optional;
-import java.util.UUID;
-
-import static java.util.Optional.empty;
-import static java.util.Optional.ofNullable;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import com.baeldung.springdatacaching.CacheApplication;
+import com.baeldung.springdatacaching.model.Book;
 
 @ExtendWith(SpringExtension.class)
 @EntityScan(basePackageClasses = Book.class)

spring-boot-modules/spring-boot-caching-2/src/main/resources/application.properties

@@ -8,7 +8,6 @@ spring.h2.console.enabled=true
 spring.h2.console.path=/h2
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=false
-caching.spring.hotelListTTL=43200
 # Connection details
 #spring.redis.host=localhost
 #spring.redis.port=6379

spring-boot-modules/spring-boot-caching/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java renamed to spring-boot-modules/spring-boot-caching-2/src/test/java/com/baeldung/ehcache/SquareCalculatorUnitTest.java

@@ -1,9 +1,8 @@
 ### Relevant articles:
-- [Introduction To Ehcache](http://www.baeldung.com/ehcache)
 - [A Guide To Caching in Spring](http://www.baeldung.com/spring-cache-tutorial)
-- [Spring Cache – Creating a Custom KeyGenerator](http://www.baeldung.com/spring-cache-custom-keygenerator)
 - [Cache Eviction in Spring Boot](https://www.baeldung.com/spring-boot-evict-cache)
 - [Using Multiple Cache Managers in Spring](https://www.baeldung.com/spring-multiple-cache-managers)
-- [Testing @Cacheable on Spring Data Repositories](https://www.baeldung.com/spring-data-testing-cacheable)
 - [Spring Boot Ehcache Example](https://www.baeldung.com/spring-boot-ehcache)
+- [Setting Time-To-Live Value for Caching](https://www.baeldung.com/spring-setting-ttl-value-cache)
+- [Spring Boot Cache with Redis](https://www.baeldung.com/spring-boot-redis-cache)
 - More articles: [[next -->]](/spring-boot-modules/spring-boot-caching-2)

spring-boot-modules/spring-boot-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryCachingIntegrationTest.java renamed to spring-boot-modules/spring-boot-caching-2/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryCachingIntegrationTest.java

@@ -71,6 +71,22 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-commons</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.codemonstur</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <version>${embedded.redis.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -87,6 +103,7 @@
 
     <properties>
         <start-class>com.baeldung.caching.boot.CacheApplication</start-class>
+        <embedded.redis.version>1.4.0</embedded.redis.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-caching/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryIntegrationTest.java renamed to spring-boot-modules/spring-boot-caching-2/src/test/java/com/baeldung/springdatacaching/repositories/BookRepositoryIntegrationTest.java

@@ -1,15 +1,15 @@
 package com.baeldung.caching.redis;
 
+import static org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair;
+
+import java.time.Duration;
+
 import org.springframework.boot.autoconfigure.cache.RedisCacheManagerBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 
-import java.time.Duration;
-
-import static org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair;
-
 @Configuration
 public class CacheConfig {
 

spring-boot-modules/spring-boot-caching-2/src/test/resources/application.properties

@@ -1,10 +1,11 @@
 package com.baeldung.caching.redis;
 
-import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 
+import lombok.AllArgsConstructor;
+
 @RestController
 @AllArgsConstructor
 public class ItemController {

spring-boot-modules/spring-boot-caching/README.md

@@ -1,9 +1,10 @@
 package com.baeldung.caching.redis;
 
-import lombok.AllArgsConstructor;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
+import lombok.AllArgsConstructor;
+
 @Service
 @AllArgsConstructor
 public class ItemService {

spring-boot-modules/spring-boot-caching/pom.xml

@@ -1,15 +1,16 @@
 package com.baeldung.caching.ttl.controller;
 
-import com.baeldung.caching.ttl.service.HotelService;
-import com.baeldung.caching.ttl.model.Hotel;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
+import com.baeldung.caching.ttl.model.Hotel;
+import com.baeldung.caching.ttl.service.HotelService;
 
 @RestController
 @RequestMapping("/hotel")

spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/redis/CacheConfig.java renamed to spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/redis/CacheConfig.java

@@ -1,14 +1,14 @@
 package com.baeldung.caching.ttl.exception;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 @ControllerAdvice
 public class ControllerAdvisor extends ResponseEntityExceptionHandler {
 

spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/redis/Item.java renamed to spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/redis/Item.java

@@ -1,6 +1,7 @@
 package com.baeldung.caching.ttl.repository;
 
-import com.baeldung.caching.ttl.model.City;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import com.baeldung.caching.ttl.model.City;
+
 public interface CityRepository extends JpaRepository<City, Long> {}

spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/redis/ItemController.java renamed to spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/redis/ItemController.java

@@ -1,10 +1,10 @@
 package com.baeldung.caching.ttl.repository;
 
-import com.baeldung.caching.ttl.model.Hotel;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import java.util.List;
-import java.util.Optional;
+import com.baeldung.caching.ttl.model.Hotel;
 
 public interface HotelRepository extends JpaRepository<Hotel, Long> {
 

spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/redis/ItemRepository.java renamed to spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/redis/ItemRepository.java

@@ -1,15 +1,16 @@
 package com.baeldung.caching.ttl.service;
 
-import com.baeldung.caching.ttl.repository.HotelRepository;
-import com.baeldung.caching.ttl.model.Hotel;
+import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import com.baeldung.caching.ttl.model.Hotel;
+import com.baeldung.caching.ttl.repository.HotelRepository;
 
 @Service
 public class HotelService {

spring-boot-modules/spring-boot-caching-2/src/main/java/com/baeldung/caching/redis/ItemService.java renamed to spring-boot-modules/spring-boot-caching/src/main/java/com/baeldung/caching/redis/ItemService.java

@@ -1,11 +1,11 @@
 package com.baeldung.caching.ttl.service;
 
+import static java.util.Arrays.asList;
+
 import org.springframework.boot.autoconfigure.cache.CacheManagerCustomizer;
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager;
 import org.springframework.stereotype.Component;
 
-import static java.util.Arrays.asList;
-
 @Component
 public class SpringCacheCustomizer implements CacheManagerCustomizer<ConcurrentMapCacheManager> {