Java：APIJSONDemo-RawSQL 升级 JDK 17，APIJSON 7.1.0, apijson-framework …

Author: TommyLemon

APIJSON-Java-Server/APIJSONDemo-RawSQL/pom.xml

@@ -5,33 +5,36 @@
 	<groupId>apijson.demo</groupId>
 	<artifactId>apijson-demo-druid-rawSQL</artifactId>
 	<packaging>jar</packaging>
-	<version>7.0.3</version>
+	<version>7.1.5</version>
 
 	<name>APIJSONDemo-Druid</name>
 	<description>Demo project for Testing APIJSON Server based on SpringBoot</description>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
+		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+		<maven.compiler.source>17</maven.compiler.source>
+		<maven.compiler.target>17</maven.compiler.target>
 	</properties>
 
 	<dependencies>
 		<!-- 需要的 APIJSON 相关依赖 -->
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>7.0.3</version>
+			<version>7.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-framework</artifactId>
-			<version>7.0.3</version>
+			<version>7.1.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-router</artifactId>
-			<version>2.0.3</version>
+			<version>2.1.5</version>
 		</dependency>
 
 		<!-- 需要用的数据库 JDBC 驱动 -->
@@ -82,8 +85,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.8.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>17</source>
+					<target>17</target>
 				</configuration>
 			</plugin>
 		</plugins>

APIJSON-Java-Server/APIJSONDemo-RawSQL/src/main/java/apijson/demo/DemoApplication.java

@@ -28,8 +28,8 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import apijson.Log;
-import apijson.framework.APIJSONApplication;
-import apijson.framework.APIJSONCreator;
+import apijson.framework.javax.APIJSONApplication;
+import apijson.framework.javax.APIJSONCreator;
 import apijson.orm.FunctionParser;
 import apijson.orm.SQLConfig;
 import apijson.orm.SQLExecutor;
@@ -87,19 +87,19 @@ public void addCorsMappings(CorsRegistry registry) {
 
 	static {
 		// 使用本项目的自定义处理类
-		APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<Long>() {
+		APIJSONApplication.DEFAULT_APIJSON_CREATOR = new APIJSONCreator<String>() {
 			@Override
-			public SQLConfig createSQLConfig() {
+			public SQLConfig<String> createSQLConfig() {
 				return new DemoSQLConfig();
 			}
 
 			@Override
-			public SQLExecutor createSQLExecutor() {
+			public SQLExecutor<String> createSQLExecutor() {
 				return new DemoSQLExecutor();
 			}
 
 			@Override
-			public FunctionParser createFunctionParser() {
+			public FunctionParser<String> createFunctionParser() {
 				return new DemoFunctionParser();
 			}
 		};

APIJSON-Java-Server/APIJSONDemo-RawSQL/src/main/java/apijson/demo/DemoController.java

@@ -30,7 +30,7 @@
 import apijson.RequestMethod;
 import apijson.StringUtil;
 import apijson.orm.Parser;
-import apijson.router.APIJSONRouterController;
+import apijson.router.javax.APIJSONRouterController;
 
 
 /**请求路由入口控制器，包括通用增删改查接口等，转交给 APIJSON 的 Parser 来处理

APIJSON-Java-Server/APIJSONDemo-RawSQL/src/main/java/apijson/demo/DemoFunctionParser.java

@@ -16,11 +16,11 @@
 import apijson.NotNull;
 import apijson.RequestMethod;
 import apijson.StringUtil;
-import apijson.framework.APIJSONConstant;
-import apijson.framework.APIJSONFunctionParser;
-import apijson.router.APIJSONRouterVerifier;
+import apijson.framework.javax.APIJSONConstant;
+import apijson.framework.javax.APIJSONFunctionParser;
+import apijson.router.javax.APIJSONRouterVerifier;
 
-public class DemoFunctionParser extends APIJSONFunctionParser {
+public class DemoFunctionParser extends APIJSONFunctionParser<String> {
 	public DemoFunctionParser() {
 		this(null, null, 0, null, null);
 	}

APIJSON-Java-Server/APIJSONDemo-RawSQL/src/main/java/apijson/demo/DemoSQLConfig.java

@@ -14,7 +14,7 @@
 
 package apijson.demo;
 
-import apijson.framework.APIJSONSQLConfig;
+import apijson.framework.javax.APIJSONSQLConfig;
 
 
 /**SQL 配置，这里不配置数据库账号密码等信息，改为使用 DemoDataSourceConfig 来配置
@@ -23,7 +23,7 @@
  * https://github.com/Tencent/APIJSON/blob/master/%E8%AF%A6%E7%BB%86%E7%9A%84%E8%AF%B4%E6%98%8E%E6%96%87%E6%A1%A3.md#c-1-1%E4%BF%AE%E6%94%B9%E6%95%B0%E6%8D%AE%E5%BA%93%E9%93%BE%E6%8E%A5
  * @author Lemon
  */
-public class DemoSQLConfig extends APIJSONSQLConfig<Long> {
+public class DemoSQLConfig extends APIJSONSQLConfig<String> {
 
 	static {
 		DEFAULT_DATABASE = DATABASE_MYSQL;  // TODO 默认数据库类型，改成你自己的

APIJSON-Java-Server/APIJSONDemo-RawSQL/src/main/java/apijson/demo/DemoSQLExecutor.java

@@ -18,20 +18,20 @@
 
 import javax.sql.DataSource;
 
-import apijson.framework.APIJSONSQLExecutor;
+import apijson.framework.javax.APIJSONSQLExecutor;
 import apijson.orm.SQLConfig;
 
 
 /**SQL 执行器，支持连接池及多数据源
  * 具体见 https://github.com/Tencent/APIJSON/issues/151
  * @author Lemon
  */
-public class DemoSQLExecutor extends APIJSONSQLExecutor<Long> {
+public class DemoSQLExecutor extends APIJSONSQLExecutor<String> {
 	public static final String TAG = "DemoSQLExecutor";
 
 	// 适配连接池，如果这里能拿到连接池的有效 Connection，则 SQLConfig 不需要配置 dbVersion, dbUri, dbAccount, dbPassword
 	@Override
-	public Connection getConnection(SQLConfig config) throws Exception {
+	public Connection getConnection(SQLConfig<String> config) throws Exception {
 		//		Log.d(TAG, "getConnection  config.getDatasource() = " + config.getDatasource());
 
 		String key = config.getDatasource() + "-" + config.getDatabase();

APIJSON-Java-Server/APIJSONDemo-RawSQL/src/main/resources/application.yml

@@ -7,9 +7,9 @@ spring:
 #    password: apijson
     druid:
       driverClassName: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://localhost:3306/apijson?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://localhost:3306?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8
       username: root
-      password: root
+      password: apijson
       type: com.alibaba.druid.pool.DruidDataSource
       initialSize: 5
       minIdle: 5