Java：APIJSONDemo-SpringBoot3 升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5

Author: TommyLemon

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

@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.6</version>
+		<version>3.2.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>apijson.demo</groupId>
 	<artifactId>apijson-demo</artifactId>
 	<name>apijson-demo</name>
 	<description>Demo project for Spring Boot</description>
-	<version>7.0.3</version>
+	<version>7.1.0</version>
 	<properties>
 		<java.version>17</java.version>
 	</properties>
@@ -28,7 +28,7 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>7.0.3</version>
+			<version>7.1.0</version>
 		</dependency>
 
 		<!-- 数据库 JDBC 驱动 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
@@ -42,11 +42,13 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
+			<version>3.2.5</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
+			<version>3.2.5</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -56,6 +58,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>3.2.5</version>
 			</plugin>
 		</plugins>
 	</build>

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

@@ -57,7 +57,7 @@ public void customize(ConfigurableServletWebServerFactory server) {
 
   // 支持 APIAuto 中 JavaScript 代码跨域请求
   @Bean
-  public WebMvcConfigurer corsConfigurer() {
+  public WebMvcConfigurer corsConfig() {
     return new WebMvcConfigurer() {
       @Override
       public void addCorsMappings(CorsRegistry registry) {

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

@@ -24,7 +24,7 @@
  * 具体见 https://github.com/Tencent/APIJSON/issues/101
  * @author Lemon
  */
-public class DemoFunctionParser extends AbstractFunctionParser {
+public class DemoFunctionParser extends AbstractFunctionParser<Long> {
 	public static final String TAG = "DemoFunctionParser";
 
 

APIJSON-Java-Server/APIJSONDemo-SpringBoot3/src/main/java/apijson/demo/DemoObjectParser.java

@@ -30,7 +30,7 @@
 /**对象解析器，用来简化 Parser
  * @author Lemon
  */
-public class DemoObjectParser extends AbstractObjectParser {
+public class DemoObjectParser extends AbstractObjectParser<Long> {
 
     public DemoObjectParser(HttpSession session, @NotNull JSONObject request, String parentPath, SQLConfig arrayConfig
             , boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {

APIJSON-Java-Server/APIJSONDemo-SpringBoot3/src/main/java/apijson/demo/DemoParser.java

@@ -85,24 +85,24 @@ public Parser<Long> createParser() {
     }
 
     @Override
-    public ObjectParser createObjectParser(JSONObject request, String parentPath, SQLConfig arrayConfig
+    public ObjectParser<Long> createObjectParser(JSONObject request, String parentPath, SQLConfig<Long> arrayConfig
             , boolean isSubquery, boolean isTable, boolean isArrayMainTable) throws Exception {
         return new DemoObjectParser(getSession(), request, parentPath, arrayConfig
                 , isSubquery, isTable, isArrayMainTable).setMethod(getMethod()).setParser(this);
     }
 
     @Override
-    public FunctionParser createFunctionParser() {
+    public FunctionParser<Long> createFunctionParser() {
         return new DemoFunctionParser();
     }
 
     @Override
-    public SQLConfig createSQLConfig() {
+    public SQLConfig<Long> createSQLConfig() {
         return new DemoSQLConfig();
     }
 
     @Override
-    public SQLExecutor createSQLExecutor() {
+    public SQLExecutor<Long> createSQLExecutor() {
         return new DemoSQLExecutor();
     }
 
@@ -111,11 +111,13 @@ public Verifier<Long> createVerifier() {
         return new DemoVerifier();
     }
 
-    private FunctionParser functionParser;
-    public FunctionParser getFunctionParser() {
+    private FunctionParser<Long> functionParser;
+    public FunctionParser<Long> getFunctionParser() {
         return functionParser;
     }
-    public Object onFunctionParse(String key, String function, String parentPath, String currentName, JSONObject currentObject, boolean containRaw) throws Exception {
+
+    public Object onFunctionParse(String key, String function, String parentPath, String currentName
+            , JSONObject currentObject, boolean containRaw) throws Exception {
         if (functionParser == null) {
             functionParser = createFunctionParser();
             functionParser.setMethod(getMethod());

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

@@ -109,8 +109,8 @@ protected void onJoinNotRelation(String sql, String quote, Join j, String jt, Li
 		// 开启 JOIN	ON t1.c1 != t2.c2 等不等式关联 	super.onJoinNotRelation(sql, quote, j, jt, onList, on);
 	}
 	@Override
-	protected void onJoinComplextRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
-		// 开启 JOIN	ON t1.c1 LIKE concat('%', t2.c2, '%') 等复杂关联		super.onJoinComplextRelation(sql, quote, j, jt, onList, on);
+	protected void onJoinComplexRelation(String sql, String quote, Join j, String jt, List<On> onList, On on) {
+		// 开启 JOIN	ON t1.c1 LIKE concat('%', t2.c2, '%') 等复杂关联		super.onJoinComplexRelation(sql, quote, j, jt, onList, on);
 	}