From bc08b76d23d16968d85eac87ba2b1b78b502ff42 Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Tue, 24 Jan 2023 10:29:34 +0800
Subject: [PATCH] chore: fix compile error in official-processors

---
 powerjob-official-processors/pom.xml                      | 8 ++++++++
 .../processors/impl/sql/SpringDatasourceSqlProcessor.java | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/powerjob-official-processors/pom.xml b/powerjob-official-processors/pom.xml
index 41229d45..dec5cd16 100644
--- a/powerjob-official-processors/pom.xml
+++ b/powerjob-official-processors/pom.xml
@@ -24,6 +24,7 @@
         <spring.jdbc.version>5.2.9.RELEASE</spring.jdbc.version>
         <h2.db.version>2.1.214</h2.db.version>
         <mysql.version>8.0.28</mysql.version>
+        <spring.version>5.3.23</spring.version>
 
         <!-- 全部 shade 化，避免依赖冲突 -->
         <fastjson.version>1.2.83</fastjson.version>
@@ -75,6 +76,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- Spring 依赖（非强依赖） -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/sql/SpringDatasourceSqlProcessor.java b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/sql/SpringDatasourceSqlProcessor.java
index 120feb54..b8cf0b10 100644
--- a/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/sql/SpringDatasourceSqlProcessor.java
+++ b/powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/sql/SpringDatasourceSqlProcessor.java
@@ -3,13 +3,13 @@ package tech.powerjob.official.processors.impl.sql;
 import tech.powerjob.worker.core.processor.TaskContext;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.Assert;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 简单 Spring SQL 处理器，目前只能用 Spring Bean 的方式加载
@@ -75,8 +75,8 @@ public class SpringDatasourceSqlProcessor extends AbstractSqlProcessor {
      * @param dataSource     数据源
      */
     public void registerDataSource(String dataSourceName, DataSource dataSource) {
-        Assert.notNull(dataSourceName, "DataSource name must not be null");
-        Assert.notNull(dataSource, "DataSource must not be null");
+        Objects.requireNonNull(dataSourceName, "DataSource name must not be null");
+        Objects.requireNonNull(dataSource, "DataSource must not be null");
         dataSourceMap.put(dataSourceName, dataSource);
         log.info("register data source({})' successfully.", dataSourceName);
     }