perf($ORM): migrate Redis library to spring-boot-starter

johnnymillergh · Jan 14, 2021 · 7af0ccc · 7af0ccc
1 parent 0e66476
commit 7af0ccc
Show file tree

Hide file tree

Showing 37 changed files with 219 additions and 124 deletions.
diff --git a/auth-center/pom.xml b/auth-center/pom.xml
@@ -78,16 +78,6 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
-        <!-- Redis -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-sftp</artifactId>

diff --git a/...java/com/jmsoftware/maf/authcenter/universal/configuration/RestTemplateConfiguration.java b/...java/com/jmsoftware/maf/authcenter/universal/configuration/RestTemplateConfiguration.java
diff --git a/auth-center/src/main/resources/application-development-docker.yml b/auth-center/src/main/resources/application-development-docker.yml
@@ -6,24 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.dev:9411
+  devtools:
+    add-properties: true
   datasource:
     url: jdbc:mysql://maf.mysql.dev:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
   redis:
-    database: 0
     host: maf.redis.dev
     port: 6379
     password: 123456
-    timeout: 10000ms
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 10
-        max-wait: -1ms
-        min-idle: 0
-  devtools:
-    add-properties: true
 
 sftp:
   client:

diff --git a/auth-center/src/main/resources/application-development-local.yml b/auth-center/src/main/resources/application-development-local.yml
@@ -6,24 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://localhost:9411
+  devtools:
+    add-properties: true
   datasource:
     url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
   redis:
-    database: 0
     host: localhost
     port: 6379
     password: 123456
-    timeout: 10000ms
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 10
-        max-wait: -1ms
-        min-idle: 0
-  devtools:
-    add-properties: true
 
 logging:
   # Configure logging level for SFTP/JSCH

diff --git a/auth-center/src/main/resources/application-production.yml b/auth-center/src/main/resources/application-production.yml
@@ -6,24 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.production:9411
+  devtools:
+    add-properties: false
   datasource:
     url: jdbc:mysql://maf.mysql.production:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
   redis:
-    database: 0
     host: maf.redis.production
     port: 6379
     password: 123456
-    timeout: 10000ms
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 10
-        max-wait: -1ms
-        min-idle: 0
-  devtools:
-    add-properties: false
 
 sftp:
   client:

diff --git a/auth-center/src/main/resources/application-stage.yml b/auth-center/src/main/resources/application-stage.yml
@@ -6,24 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.stage:9411
+  devtools:
+    add-properties: false
   datasource:
     url: jdbc:mysql://maf.mysql.stage:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
   redis:
-    database: 0
     host: maf.redis.stage
     port: 6379
     password: 123456
-    timeout: 10000ms
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 10
-        max-wait: -1ms
-        min-idle: 0
-  devtools:
-    add-properties: false
 
 sftp:
   client:

diff --git a/auth-center/src/main/resources/application-test.yml b/auth-center/src/main/resources/application-test.yml
@@ -6,24 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.test:9411
+  devtools:
+    add-properties: false
   datasource:
     url: jdbc:mysql://maf.mysql.test:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
   redis:
-    database: 0
     host: maf.redis.test
     port: 6379
     password: 123456
-    timeout: 10000ms
-    lettuce:
-      pool:
-        max-active: 20
-        max-idle: 10
-        max-wait: -1ms
-        min-idle: 0
-  devtools:
-    add-properties: false
 
 sftp:
   client:

diff --git a/auth-center/src/main/resources/application.yml b/auth-center/src/main/resources/application.yml
@@ -32,6 +32,15 @@ spring:
     name: muscle_and_fitness
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
+  redis:
+    database: 0
+    timeout: 10000ms
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
 
 eureka:
   instance:

diff --git a/auth-center/src/test/java/com/jmsoftware/maf/authcenter/mybatis/MyBatisPlusTests.java b/auth-center/src/test/java/com/jmsoftware/maf/authcenter/mybatis/MyBatisPlusTests.java
@@ -66,7 +66,7 @@ void logicDeleteTest() {
         val rolePersistence2 = roleMapper.selectByName(rolePersistence.getName());
         log.info("Deleted role: {}", rolePersistence2);
         Assertions.assertEquals(rolePersistence2.getDeleted(), DeleteFlag.DELETED.getValue());
-        roleMapper.selectByName("role-for-mybatis-plus-tests");
-        log.warn("Role not found! {}", lambdaQuery.getEntity());
+        final var deletedRolePersistence = roleService.getOne(lambdaQuery);
+        Assertions.assertNull(deletedRolePersistence);
     }
 }
diff --git a/exercise-mis/src/main/resources/application-development-docker.yml b/exercise-mis/src/main/resources/application-development-docker.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.dev:9411
+  devtools:
+    add-properties: true
   datasource:
     url: jdbc:mysql://maf.mysql.dev:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: true
+  redis:
+    host: maf.redis.dev
+    port: 6379
+    password: 123456
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application-development-local.yml b/exercise-mis/src/main/resources/application-development-local.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://localhost:9411
+  devtools:
+    add-properties: true
   datasource:
     url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: true
+  redis:
+    host: localhost
+    port: 6379
+    password: 123456
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application-production.yml b/exercise-mis/src/main/resources/application-production.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.production:9411
+  devtools:
+    add-properties: false
   datasource:
     url: jdbc:mysql://maf.mysql.production:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: false
+  redis:
+    host: maf.redis.production
+    port: 6379
+    password: 123456
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application-stage.yml b/exercise-mis/src/main/resources/application-stage.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.stage:9411
+  devtools:
+    add-properties: false
   datasource:
     url: jdbc:mysql://maf.mysql.stage:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: false
+  redis:
+    host: maf.redis.stage
+    port: 6379
+    password: 123456
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application-test.yml b/exercise-mis/src/main/resources/application-test.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.test:9411
+  devtools:
+    add-properties: false
   datasource:
     url: jdbc:mysql://maf.mysql.test:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: false
+  redis:
+    host: maf.redis.test
+    port: 6379
+    password: 123456
 
 maf:
   configuration:

diff --git a/exercise-mis/src/main/resources/application.yml b/exercise-mis/src/main/resources/application.yml
@@ -32,6 +32,15 @@ spring:
     name: muscle_and_fitness
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
+  redis:
+    database: 0
+    timeout: 10000ms
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 10
+        max-wait: -1ms
+        min-idle: 0
 
 eureka:
   instance:

diff --git a/muscle-mis/src/main/resources/application-development-docker.yml b/muscle-mis/src/main/resources/application-development-docker.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.dev:9411
+  devtools:
+    add-properties: true
   datasource:
     url: jdbc:mysql://maf.mysql.dev:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: true
+  redis:
+    host: maf.redis.dev
+    port: 6379
+    password: 123456
 
 maf:
   configuration:

diff --git a/muscle-mis/src/main/resources/application-development-local.yml b/muscle-mis/src/main/resources/application-development-local.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://localhost:9411
+  devtools:
+    add-properties: true
   datasource:
     url: jdbc:mysql://localhost:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: true
+  redis:
+    host: localhost
+    port: 6379
+    password: 123456
 
 logging:
   level:

diff --git a/muscle-mis/src/main/resources/application-production.yml b/muscle-mis/src/main/resources/application-production.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.production:9411
+  devtools:
+    add-properties: false
   datasource:
     url: jdbc:mysql://maf.mysql.production:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: false
+  redis:
+    host: maf.redis.production
+    port: 6379
+    password: 123456
 
 maf:
   configuration:

diff --git a/muscle-mis/src/main/resources/application-stage.yml b/muscle-mis/src/main/resources/application-stage.yml
@@ -6,12 +6,16 @@ eureka:
 spring:
   zipkin:
     base-url: http://maf.open-zipkin.stage:9411
+  devtools:
+    add-properties: false
   datasource:
     url: jdbc:mysql://maf.mysql.stage:3306/muscle_and_fitness?useSSL=true&useUnicode=true
     username: root
     password: jm@mysql
-  devtools:
-    add-properties: false
+  redis:
+    host: maf.redis.stage
+    port: 6379
+    password: 123456
 
 maf:
   configuration: