Merge pull request #23 from codingapi/2.0

update springboot 3.x

Author: xlorne

.gitignore

@@ -31,5 +31,5 @@ build/
 
 ### VS Code ###
 .vscode/
-*.mv.db
+*.db
 *.trace.db

pom.xml

@@ -6,25 +6,25 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.8</version>
+        <version>3.0.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <groupId>com.codingapi.springboot</groupId>
     <artifactId>springboot-parent</artifactId>
-    <version>1.5.18</version>
+    <version>2.0.0</version>
 
     <url>https://github.com/codingapi/springboot-framewrok</url>
     <name>springboot-parent</name>
     <description>springboot-parent project for Spring Boot</description>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
 
         <!-- maven properties-->
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
-        <maven.compile.source>1.8</maven.compile.source>
-        <maven.compile.target>1.8</maven.compile.target>
+        <maven.compile.source>17</maven.compile.source>
+        <maven.compile.target>17</maven.compile.target>
         <maven.source.plugin>3.0.1</maven.source.plugin>
         <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>

springboot-starter-data-fast/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.5.18</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>springboot-starter-data-fast</artifactId>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
     </properties>
 
 

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/DataFastConfiguration.java

@@ -11,7 +11,7 @@
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.List;
 
 @Configuration

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/JpaExecutor.java

@@ -5,7 +5,7 @@
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 import java.util.Collection;
 import java.util.List;
 

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/executor/JpaQuery.java

@@ -7,9 +7,9 @@
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Parameter;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Parameter;
+import jakarta.persistence.Query;
 import java.lang.reflect.Field;
 import java.util.Set;
 

springboot-starter-data-fast/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1,2 @@
+com.codingapi.springboot.fast.DataFastConfiguration
+com.codingapi.springboot.fast.registrar.DataFastBeanDefinitionRegistrar

springboot-starter-data-fast/src/test/java/com/codingapi/springboot/fast/entity/Demo.java

@@ -3,7 +3,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Setter
 @Getter

springboot-starter-id-generator/pom.xml

@@ -5,30 +5,33 @@
     <parent>
         <artifactId>springboot-parent</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>1.5.18</version>
+        <version>2.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>springboot-starter-id-generator</artifactId>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
     </properties>
 
     <dependencies>
 
-
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>commons-dbutils</groupId>
             <artifactId>commons-dbutils</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

springboot-starter-id-generator/src/main/java/com/codingapi/springboot/generator/AutoConfiguration.java

@@ -1,7 +1,7 @@
 package com.codingapi.springboot.generator;
 
 import com.codingapi.springboot.generator.dao.IdKeyDao;
-import com.codingapi.springboot.generator.properties.GeneratorProperties;
+import com.codingapi.springboot.generator.properties.GeneratorJdbcProperties;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -11,15 +11,15 @@
 public class AutoConfiguration {
 
     @Bean
-    @ConfigurationProperties(prefix = "codingapi.id.generator")
-    public GeneratorProperties generatorProperties() {
-        return new GeneratorProperties();
+    @ConfigurationProperties(prefix = "codingapi.id.jdbc.generator")
+    public GeneratorJdbcProperties generatorJdbcProperties() {
+        return new GeneratorJdbcProperties();
     }
 
     @Bean(initMethod = "init")
     @ConditionalOnMissingBean
-    public IdKeyDao idKeyDao(GeneratorProperties generatorProperties) {
-        IdKeyDao keyDao = new IdKeyDao(generatorProperties.getJdbcUrl());
+    public IdKeyDao idKeyDao(GeneratorJdbcProperties generatorJdbcProperties) {
+        IdKeyDao keyDao = new IdKeyDao(generatorJdbcProperties.openDataSource());
         IdGeneratorContext.getInstance().init(keyDao);
         return keyDao;
     }