🔥 refactor(QueryHelperTest.java): Remove unused JUnit test class.

⬇️ refactor(`InfrastructureConfiguration.java`): Remove unused import. 🚀 refactor(`BootApplicationTest.java`): Update SpringBootTest annotation. ⬆️ refactor(`build.gradle`): Upgrade dependency-management plugin. 🔧 refactor(`platform/build.gradle`): Comment out Jooq implementation. ➖ refactor(`ContextUtils.java`): Remove JOOQDSL and related code. 🚨 refactor(`R2dbcConfiguration.java`): Remove DSLContext bean definition.
vnobo · Dec 22, 2024 · 5c49980 · 5c49980
1 parent c12cd59
commit 5c49980
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 30 deletions.
diff --git a/boot/platform/build.gradle b/boot/platform/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-data-redis-reactive")
 
     //implementation("org.springframework.boot:spring-boot-starter-jooq")
-    implementation("org.jooq:jooq")
+    //implementation("org.jooq:jooq")
     implementation("org.springframework.boot:spring-boot-starter-data-r2dbc")
     implementation("org.postgresql:r2dbc-postgresql")
 

diff --git a/boot/platform/src/main/java/com/plate/boot/commons/utils/ContextUtils.java b/boot/platform/src/main/java/com/plate/boot/commons/utils/ContextUtils.java
@@ -7,7 +7,6 @@
 import com.plate.boot.security.SecurityDetails;
 import com.plate.boot.security.core.user.UsersService;
 import lombok.extern.log4j.Log4j2;
-import org.jooq.DSLContext;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -107,18 +106,15 @@ public final class ContextUtils implements InitializingBean {
      */
     public static UsersService USERS_SERVICE;
 
-    public static DSLContext JOOQDSL;
-
     /**
      * Initializes the ContextUtils class with necessary dependencies.
      *
      * @param objectMapper The ObjectMapper instance used for JSON serialization and deserialization.
      * @param usersService The UsersService instance to provide access to user-related operations.
      */
-    ContextUtils(ObjectMapper objectMapper, UsersService usersService, DSLContext create) {
+    ContextUtils(ObjectMapper objectMapper, UsersService usersService) {
         ContextUtils.OBJECT_MAPPER = objectMapper;
         ContextUtils.USERS_SERVICE = usersService;
-        ContextUtils.JOOQDSL = create;
     }
 
     /**

diff --git a/boot/platform/src/main/java/com/plate/boot/config/R2dbcConfiguration.java b/boot/platform/src/main/java/com/plate/boot/config/R2dbcConfiguration.java
@@ -6,17 +6,13 @@
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactory;
 import lombok.RequiredArgsConstructor;
-import org.jooq.DSLContext;
-import org.jooq.SQLDialect;
-import org.jooq.impl.DSL;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.domain.ReactiveAuditorAware;
 import org.springframework.data.r2dbc.config.AbstractR2dbcConfiguration;
 import org.springframework.data.r2dbc.config.EnableR2dbcAuditing;
 import org.springframework.lang.NonNull;
-import org.springframework.r2dbc.connection.TransactionAwareConnectionFactoryProxy;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import java.util.List;
@@ -75,11 +71,4 @@ public ReactiveAuditorAware<UserAuditor> userAuditorProvider() {
         return new UserAuditorAware();
     }
 
-    @Bean
-    public DSLContext dslContext(ConnectionFactory connectionFactory) {
-        return DSL.using(
-                new TransactionAwareConnectionFactoryProxy(connectionFactory),
-                SQLDialect.POSTGRES
-        );
-    }
 }
diff --git a/boot/platform/src/test/java/com/plate/boot/BootApplicationTest.java b/boot/platform/src/test/java/com/plate/boot/BootApplicationTest.java
@@ -1,11 +1,12 @@
 package com.plate.boot;
 
 import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
 
 /**
  * @author <a href="https://github.com/vnobo">Alex Bob</a>
  */
-//@SpringBootTest(classes = InfrastructureConfiguration.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest
 class BootApplicationTest {
 
     @Test

diff --git a/boot/platform/src/test/java/com/plate/boot/commons/utils/query/QueryHelperTest.java b/boot/platform/src/test/java/com/plate/boot/commons/utils/query/QueryHelperTest.java
diff --git a/boot/platform/src/test/java/com/plate/boot/config/InfrastructureConfiguration.java b/boot/platform/src/test/java/com/plate/boot/config/InfrastructureConfiguration.java
@@ -10,5 +10,4 @@
 @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, SecurityConfiguration.class})
 @EnableTransactionManagement
 public class InfrastructureConfiguration {
-
 }
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'org.springframework.boot' version '3.4.1' apply false
-    id 'io.spring.dependency-management' version '1.1.6'
+    id 'io.spring.dependency-management' version '1.1.7'
     id 'org.graalvm.buildtools.native' version '0.10.3'
 }
 
@@ -36,6 +36,12 @@ configure(subprojects - project(":boot")) { project ->
         ]
     }
 
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(21)
+        }
+    }
+
     configurations {
         compileOnly {
             extendsFrom annotationProcessor