fix schema

xlorne · xlorne · commit 28d45318ce39 · 2023-12-25T09:49:08.000+08:00
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/AutoConfiguration.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/AutoConfiguration.java
@@ -2,7 +2,7 @@
 
 import com.codingapi.springboot.persistence.scanner.SchemaScanner;
 import com.codingapi.springboot.persistence.schema.executor.SchemaExecutor;
-import com.codingapi.springboot.persistence.schema.SchemaFactory;
+import com.codingapi.springboot.persistence.schema.factory.SchemaFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.context.annotation.Bean;
 
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/JdbcAutoConfiguration.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/JdbcAutoConfiguration.java
@@ -5,7 +5,7 @@
 import com.codingapi.springboot.persistence.jdbc.impl.JdbcDomainPersistence;
 import com.codingapi.springboot.persistence.jdbc.impl.JdbcSchemaFactory;
 import com.codingapi.springboot.persistence.schema.executor.SchemaExecutor;
-import com.codingapi.springboot.persistence.schema.SchemaFactory;
+import com.codingapi.springboot.persistence.schema.factory.SchemaFactory;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/executor/JdbcSchemaExecutor.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/executor/JdbcSchemaExecutor.java
@@ -15,7 +15,7 @@ public class JdbcSchemaExecutor implements SchemaExecutor {
 
     @Override
     public void create(Schema schema) {
-        jdbcTemplate.execute(schema.buildSchema().createSchema());
+        jdbcTemplate.execute(schema.buildSchema().schema());
     }
 
 
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/impl/JdbcDomainPersistence.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/impl/JdbcDomainPersistence.java
@@ -24,15 +24,15 @@ public class JdbcDomainPersistence implements DomainPersistence {
 
     @Override
     public void save(Object domain) {
-        Schema schema = SchemaContext.getINSTANCE().getSchema(domain.getClass());
+        Schema schema = SchemaContext.getInstance().getSchema(domain.getClass());
         if (schema != null) {
-            SaveSchema saveSchema = schema.insertSchema();
+            SaveSchema saveSchema = schema.saveSchema();
             if (schema.getSchemaProperty().hasIdValue(domain)) {
-                jdbcTemplate.update(saveSchema.saveSchema(), saveSchema.getSaveValues(domain));
+                jdbcTemplate.update(saveSchema.schema(), saveSchema.getSaveValues(domain));
             } else {
                 KeyHolder keyHolder = new GeneratedKeyHolder();
                 jdbcTemplate.update(con -> {
-                    PreparedStatement ps = con.prepareStatement(saveSchema.saveSchema(false), Statement.RETURN_GENERATED_KEYS);
+                    PreparedStatement ps = con.prepareStatement(saveSchema.schema(false), Statement.RETURN_GENERATED_KEYS);
                     int index = 1;
                     for (Object value : saveSchema.getSaveValues(domain, false)) {
                         ps.setObject(index++, value);
@@ -46,10 +46,10 @@ public void save(Object domain) {
 
     @Override
     public <T> T get(Class<T> domainClass, Object id) {
-        Schema schema = SchemaContext.getINSTANCE().getSchema(domainClass);
+        Schema schema = SchemaContext.getInstance().getSchema(domainClass);
         if (schema != null) {
-            SearchSchema searchSchema = schema.getById();
-            String sql = searchSchema.getById();
+            SearchSchema searchSchema = schema.searchSchema();
+            String sql = searchSchema.schema();
             try {
                 return jdbcTemplate.queryForObject(sql, new Object[]{id}, new BeanPropertyRowMapper<>(domainClass));
             } catch (EmptyResultDataAccessException e) {
@@ -62,26 +62,26 @@ public <T> T get(Class<T> domainClass, Object id) {
 
     @Override
     public void delete(Class<?> domainClazz, Object id) {
-        Schema schema = SchemaContext.getINSTANCE().getSchema(domainClazz);
+        Schema schema = SchemaContext.getInstance().getSchema(domainClazz);
         if (schema != null) {
-            String sql = schema.deleteSchema().deleteSchema();
+            String sql = schema.deleteSchema().schema();
             jdbcTemplate.update(sql, id);
         }
     }
 
     @Override
     public void update(Object domain) {
-        Schema schema = SchemaContext.getINSTANCE().getSchema(domain.getClass());
+        Schema schema = SchemaContext.getInstance().getSchema(domain.getClass());
         if (schema != null) {
             UpdateSchema updateSchema = schema.updateSchema();
-            jdbcTemplate.update(updateSchema.updateSchema(), updateSchema.getUpdateValues(domain));
+            jdbcTemplate.update(updateSchema.schema(), updateSchema.getUpdateValues(domain));
         }
     }
 
 
     @Override
     public <T> List<T> find(Class<T> domainClass, String sql, Object... fields) {
-        Schema schema = SchemaContext.getINSTANCE().getSchema(domainClass);
+        Schema schema = SchemaContext.getInstance().getSchema(domainClass);
         if (schema != null) {
             return jdbcTemplate.query(sql, fields, new BeanPropertyRowMapper<>(domainClass));
         }
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/impl/JdbcSchemaFactory.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/impl/JdbcSchemaFactory.java
@@ -2,7 +2,7 @@
 
 import com.codingapi.springboot.persistence.jdbc.schema.JdbcSchema;
 import com.codingapi.springboot.persistence.schema.Schema;
-import com.codingapi.springboot.persistence.schema.SchemaFactory;
+import com.codingapi.springboot.persistence.schema.factory.SchemaFactory;
 
 public class JdbcSchemaFactory implements SchemaFactory {
 
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcBuildSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcBuildSchema.java
@@ -13,7 +13,7 @@ public JdbcBuildSchema(Schema schema) {
     }
 
     @Override
-    public String createSchema() {
+    public String schema() {
         StringBuilder sql = new StringBuilder();
         sql.append("CREATE TABLE IF NOT EXISTS ");
         sql.append(property.getSchemaName());
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcDeleteSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcDeleteSchema.java
@@ -10,7 +10,7 @@ public JdbcDeleteSchema(Schema schema) {
     }
 
     @Override
-    public String deleteSchema() {
+    public String schema() {
         return "DELETE FROM " + property.getSchemaName() + " WHERE id = ?";
     }
 }
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcSaveSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcSaveSchema.java
@@ -11,7 +11,7 @@ public JdbcSaveSchema(Schema schema) {
     }
 
     @Override
-    public String saveSchema(boolean hasId) {
+    public String schema(boolean hasId) {
         StringBuilder sql = new StringBuilder();
         sql.append("INSERT INTO ");
         sql.append(property.getSchemaName());
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcSchema.java
@@ -14,12 +14,12 @@ public BuildSchema buildSchema() {
     }
 
     @Override
-    public SaveSchema insertSchema() {
+    public SaveSchema saveSchema() {
         return new JdbcSaveSchema(this);
     }
 
     @Override
-    public SearchSchema getById() {
+    public SearchSchema searchSchema() {
         return new JdbcSearchSchema(this);
     }
 
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcSearchSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcSearchSchema.java
@@ -10,7 +10,7 @@ public JdbcSearchSchema(Schema schema) {
     }
 
     @Override
-    public String getById() {
+    public String schema() {
         return "SELECT * FROM " + property.getSchemaName() + " WHERE id = ?";
     }
 
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcUpdateSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/jdbc/schema/JdbcUpdateSchema.java
@@ -11,7 +11,7 @@ public JdbcUpdateSchema(Schema schema) {
     }
 
     @Override
-    public String updateSchema() {
+    public String schema() {
         StringBuilder sql = new StringBuilder();
         sql.append("UPDATE ").append(property.getSchemaName()).append(" SET ");
         for (BeanProperty property : property.getProperties(false)) {
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/register/DomainClassRegister.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/register/DomainClassRegister.java
@@ -10,7 +10,7 @@ public class DomainClassRegister {
 
     private final List<Class<?>> classes;
 
-    public final static DomainClassRegister INSTANCE = new DomainClassRegister();
+    private final static DomainClassRegister INSTANCE = new DomainClassRegister();
 
     private DomainClassRegister() {
         this.classes = new ArrayList<>();
@@ -26,4 +26,8 @@ public boolean supports(Class<?> domainClass) {
 
     }
 
+    public static DomainClassRegister getInstance() {
+        return INSTANCE;
+    }
+
 }
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/scanner/SchemaContext.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/scanner/SchemaContext.java
@@ -8,8 +8,7 @@
 
 public class SchemaContext {
 
-    @Getter
-    public final static SchemaContext INSTANCE = new SchemaContext();
+    private final static SchemaContext INSTANCE = new SchemaContext();
 
     private final List<Schema> schemas;
 
@@ -27,4 +26,8 @@ public Schema getSchema(Class<?> domainClass) {
                 .findFirst()
                 .orElseThrow(() -> new RuntimeException("schema not found"));
     }
+
+    public static SchemaContext getInstance() {
+        return INSTANCE;
+    }
 }
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/scanner/SchemaScanner.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/scanner/SchemaScanner.java
@@ -3,7 +3,7 @@
 import com.codingapi.springboot.persistence.register.DomainClassRegister;
 import com.codingapi.springboot.persistence.schema.Schema;
 import com.codingapi.springboot.persistence.schema.executor.SchemaExecutor;
-import com.codingapi.springboot.persistence.schema.SchemaFactory;
+import com.codingapi.springboot.persistence.schema.factory.SchemaFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -24,10 +24,10 @@ public SchemaScanner(SchemaExecutor schemaExecutor, SchemaFactory schemaFactory)
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        List<Class<?>> domainClasses = DomainClassRegister.INSTANCE.getClasses();
+        List<Class<?>> domainClasses = DomainClassRegister.getInstance().getClasses();
         for (Class<?> domainClass : domainClasses) {
             Schema schema = schemaFactory.getSchema(domainClass);
-            SchemaContext.INSTANCE.register(schema);
+            SchemaContext.getInstance().register(schema);
             schemaExecutor.create(schema);
         }
     }
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/BuildSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/BuildSchema.java
@@ -4,7 +4,7 @@
 
 public abstract class BuildSchema {
 
-    public abstract String createSchema();
+    public abstract String schema();
 
     protected final SchemaProperty property;
 
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/DeleteSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/DeleteSchema.java
@@ -4,7 +4,7 @@
 
 public abstract class DeleteSchema {
 
-    public abstract String deleteSchema();
+    public abstract String schema();
 
     protected final SchemaProperty property;
 
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/SaveSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/SaveSchema.java
@@ -16,11 +16,11 @@ public SaveSchema(Schema schema) {
         this.property = schema.getSchemaProperty();
     }
 
-    public String saveSchema() {
-        return saveSchema(true);
+    public String schema() {
+        return schema(true);
     }
 
-    public abstract String saveSchema(boolean hasId);
+    public abstract String schema(boolean hasId);
 
 
     public Object[] getSaveValues(Object object, boolean hasId) {
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/Schema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/Schema.java
@@ -22,17 +22,12 @@ public Schema(Class<?> domainClass) {
 
     public abstract BuildSchema buildSchema();
 
-    public abstract SaveSchema insertSchema();
+    public abstract SaveSchema saveSchema();
 
-    public abstract SearchSchema getById();
+    public abstract SearchSchema searchSchema();
 
     public abstract DeleteSchema deleteSchema();
 
     public abstract UpdateSchema updateSchema();
 
-    public boolean supports(Class<?> domainClass) {
-        return this.domainClass.equals(domainClass);
-    }
-
-
 }
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/SchemaFactory.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/SchemaFactory.java
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/SearchSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/SearchSchema.java
@@ -12,7 +12,7 @@ public SearchSchema(Schema schema) {
         this.property = schema.getSchemaProperty();
     }
 
-    public abstract String getById();
+    public abstract String schema();
 
     public Object getByIdValue(Object domain) {
         return property.getIdBeanProperty().get(domain);
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/UpdateSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/UpdateSchema.java
@@ -5,7 +5,7 @@
 
 public abstract class UpdateSchema {
 
-    public abstract String updateSchema();
+    public abstract String schema();
 
     protected final SchemaProperty property;
 
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/factory/SchemaFactory.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/factory/SchemaFactory.java
@@ -0,0 +1,8 @@
+package com.codingapi.springboot.persistence.schema.factory;
+
+import com.codingapi.springboot.persistence.schema.Schema;
+
+public interface SchemaFactory {
+
+    Schema getSchema(Class<?> domainClass);
+}
diff --git a/springboot-starter-persistence/src/test/java/com/example/demo/register/DomainRegister.java b/springboot-starter-persistence/src/test/java/com/example/demo/register/DomainRegister.java
@@ -10,6 +10,6 @@ public class DomainRegister implements InitializingBean {
 
     @Override
     public void afterPropertiesSet() throws Exception {
-        DomainClassRegister.INSTANCE.register(Demo.class);
+        DomainClassRegister.getInstance().register(Demo.class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class JdbcSchemaExecutor implements SchemaExecutor {`
`15`	`15`
`16`	`16`	`@Override`
`17`	`17`	`public void create(Schema schema) {`
`18`		`- jdbcTemplate.execute(schema.buildSchema().createSchema());`
	`18`	`+ jdbcTemplate.execute(schema.buildSchema().schema());`
`19`	`19`	`}`
`20`	`20`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public JdbcBuildSchema(Schema schema) {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`@Override`
`16`		`- public String createSchema() {`
	`16`	`+ public String schema() {`
`17`	`17`	`StringBuilder sql = new StringBuilder();`
`18`	`18`	`sql.append("CREATE TABLE IF NOT EXISTS ");`
`19`	`19`	`sql.append(property.getSchemaName());`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public JdbcDeleteSchema(Schema schema) {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`@Override`
`13`		`- public String deleteSchema() {`
	`13`	`+ public String schema() {`
`14`	`14`	`return "DELETE FROM " + property.getSchemaName() + " WHERE id = ?";`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public JdbcSaveSchema(Schema schema) {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`@Override`
`14`		`- public String saveSchema(boolean hasId) {`
	`14`	`+ public String schema(boolean hasId) {`
`15`	`15`	`StringBuilder sql = new StringBuilder();`
`16`	`16`	`sql.append("INSERT INTO ");`
`17`	`17`	`sql.append(property.getSchemaName());`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ public BuildSchema buildSchema() {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`@Override`
`17`		`- public SaveSchema insertSchema() {`
	`17`	`+ public SaveSchema saveSchema() {`
`18`	`18`	`return new JdbcSaveSchema(this);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`		`- public SearchSchema getById() {`
	`22`	`+ public SearchSchema searchSchema() {`
`23`	`23`	`return new JdbcSearchSchema(this);`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public JdbcSearchSchema(Schema schema) {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`@Override`
`13`		`- public String getById() {`
	`13`	`+ public String schema() {`
`14`	`14`	`return "SELECT * FROM " + property.getSchemaName() + " WHERE id = ?";`
`15`	`15`	`}`
`16`	`16`