fix: spring.data.redis.redisson -> spring.data.redisson

Nexters · Nov 18, 2024 · 582d6e1 · 582d6e1
1 parent 7bd824b
commit 582d6e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 14 deletions.
diff --git a/src/main/java/com/nexters/goalpanzi/config/RedissonConfig.java b/src/main/java/com/nexters/goalpanzi/config/RedissonConfig.java
@@ -11,17 +11,16 @@
 
 import java.io.IOException;
 
-@ConditionalOnProperty(name = "spring.data.redis.redisson.enabled", havingValue = "true")
+@ConditionalOnProperty(name = "spring.data.redisson.enabled", havingValue = "true")
 @Configuration
 public class RedissonConfig {
 
-    @Value("${spring.data.redis.redisson.file}")
+    @Value("${spring.data.redisson.file}")
     private Resource redissonConfigFile;
 
     @Bean
     public RedissonClient redissonClient() throws IOException {
         Config config = Config.fromYAML(redissonConfigFile.getInputStream());
-
         return Redisson.create(config);
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -16,9 +16,9 @@ spring:
     redis:
       host: localhost
       port: 6379
-      redisson:
-        enabled: true
-        file: classpath:redisson-config.yml
+    redisson:
+      enabled: true
+      file: classpath:redisson-config.yml
   servlet:
     multipart:
       max-file-size: 5MB

diff --git a/src/test/java/com/nexters/goalpanzi/infrastructure/aws/S3ClientTest.java b/src/test/java/com/nexters/goalpanzi/infrastructure/aws/S3ClientTest.java
@@ -1,10 +1,8 @@
 package com.nexters.goalpanzi.infrastructure.aws;
 
-import com.nexters.goalpanzi.config.redis.RedisInitializer;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.nexters.goalpanzi.fixture.MissionFixture.IMAGE_FILE;
@@ -14,9 +12,6 @@
 import static org.mockito.Mockito.when;
 
 @SpringBootTest
-@ContextConfiguration(
-        initializers = {RedisInitializer.class}
-)
 class S3ClientTest {
 
     @MockBean

diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
@@ -12,9 +12,8 @@ spring:
         highlight_sql: true
     open-in-view: false
   data:
-    redis:
-      redisson:
-        enabled: false
+    redisson:
+      enabled: false
   flyway:
     enabled: false