Java：Hadoop&Hive Demo 升级 JDK 17，APIJSON 7.1.0, apijson-framework 及自身 7.1.5

Author: TommyLemon

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

@@ -5,28 +5,31 @@
 
 	<groupId>apijson.demo</groupId>
 	<artifactId>apijson-demo</artifactId>
-	<version>7.0.3</version>
+	<version>7.1.5</version>
 
 	<name>APIJSONDemo-Hadoop</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>
 
 		<!-- 需要用的数据库 JDBC 驱动 -->
@@ -123,6 +126,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>2.5.13</version>
 				<executions>
 					<execution>
 						<goals>
@@ -134,9 +138,10 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<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-Hadoop/src/main/java/apijson/demo/DemoApplication.java

@@ -26,8 +26,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.SQLConfig;
 import apijson.orm.SQLExecutor;
 
@@ -61,12 +61,12 @@ public void customize(ConfigurableServletWebServerFactory server) {
 
     // 支持 APIAuto 中 JavaScript 代码跨域请求
     @Bean
-    public WebMvcConfigurer corsConfigurer() {
+    public WebMvcConfigurer corsConfig() {
         return new WebMvcConfigurer() {
             @Override
             public void addCorsMappings(CorsRegistry registry) {
                 registry.addMapping("/**")
-                        .allowedOrigins("*")  //.allowedOriginPatterns("*")
+                        .allowedOriginPatterns("*")
                         .allowedMethods("*")
                         .allowCredentials(true)
                         .maxAge(3600);

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

@@ -29,7 +29,7 @@
 
 import apijson.RequestMethod;
 import apijson.StringUtil;
-import apijson.framework.APIJSONController;
+import apijson.framework.javax.APIJSONController;
 import apijson.orm.Parser;
 
 

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

@@ -16,7 +16,7 @@
 
 import com.alibaba.fastjson.annotation.JSONField;
 
-import apijson.framework.APIJSONSQLConfig;
+import apijson.framework.javax.APIJSONSQLConfig;
 
 
 /**SQL 配置
@@ -44,7 +44,7 @@ public class DemoSQLConfig extends APIJSONSQLConfig<Long> {
 
     @Override
     public String getDBVersion() {
-        return "4.0.0-alpha-1";  // TODO 改成你自己的
+        return "4.0.1";  // TODO 改成你自己的
     }
 
     @JSONField(serialize = false)  // 不在日志打印 账号/密码 等敏感信息

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

@@ -25,8 +25,8 @@
 
 import apijson.Log;
 import apijson.RequestMethod;
-import apijson.framework.APIJSONSQLConfig;
-import apijson.framework.APIJSONSQLExecutor;
+import apijson.framework.javax.APIJSONSQLConfig;
+import apijson.framework.javax.APIJSONSQLExecutor;
 import apijson.orm.SQLConfig;
 
 
@@ -37,13 +37,20 @@ public class DemoSQLExecutor extends APIJSONSQLExecutor<Long> {
 	public static final String TAG = "DemoSQLExecutor";
 
 	@Override
-	protected String getKey(SQLConfig config, ResultSet rs, ResultSetMetaData rsmd, int tablePosition, JSONObject table, int columnIndex, Map<String, JSONObject> childMap) throws Exception {
+	protected String getKey(SQLConfig<Long> config, ResultSet rs, ResultSetMetaData rsmd, int tablePosition, JSONObject table, int columnIndex, Map<String, JSONObject> childMap) throws Exception {
 		String key = super.getKey(config, rs, rsmd, tablePosition, table, columnIndex, childMap);
-		String table_name = config.getTable();
-		if(APIJSONSQLConfig.TABLE_KEY_MAP.containsKey(table_name)) table_name = APIJSONSQLConfig.TABLE_KEY_MAP.get(table_name);
-		String pattern = "^" + table_name + "\\." + "[a-zA-Z]+$";
+		String tbl = config.getTable();
+
+		if (APIJSONSQLConfig.TABLE_KEY_MAP.containsKey(tbl)) {
+			tbl = APIJSONSQLConfig.TABLE_KEY_MAP.get(tbl);
+		}
+
+		String pattern = "^" + tbl + "\\." + "[a-zA-Z]+$";
 		boolean isMatch = Pattern.matches(pattern, key);
-		if(isMatch) key = key.split("\\.")[1];
+		if (isMatch) {
+			key = key.split("\\.")[1];
+		}
+
 		return key;
 	}