support delete & update

xlorne · xlorne · commit 5c41144e5d19 · 2023-12-25T09:32:08.000+08:00
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/DomainPersistence.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/DomainPersistence.java
@@ -6,4 +6,7 @@ public interface DomainPersistence {
 
     <T> T get(Class<T> domainClass, Object id);
 
+    void delete(Class<?> domainClass,Object id);
+
+    void update(Object domain);
 }
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
@@ -5,6 +5,7 @@
 import com.codingapi.springboot.persistence.schema.SaveSchema;
 import com.codingapi.springboot.persistence.schema.Schema;
 import com.codingapi.springboot.persistence.schema.SearchSchema;
+import com.codingapi.springboot.persistence.schema.UpdateSchema;
 import lombok.AllArgsConstructor;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -57,4 +58,22 @@ public <T> T get(Class<T> domainClass, Object id) {
         }
         return null;
     }
+
+    @Override
+    public void delete(Class<?> domainClazz,Object id) {
+        Schema schema = SchemaContext.getINSTANCE().getSchema(domainClazz);
+        if (schema != null) {
+            String sql = schema.deleteSchema().deleteSchema();
+            jdbcTemplate.update(sql, id);
+        }
+    }
+
+    @Override
+    public void update(Object domain) {
+        Schema schema = SchemaContext.getINSTANCE().getSchema(domain.getClass());
+        if (schema != null) {
+            UpdateSchema updateSchema = schema.updateSchema();
+            jdbcTemplate.update(updateSchema.updateSchema(), updateSchema.getUpdateValues(domain));
+        }
+    }
 }
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
@@ -1,7 +1,7 @@
 package com.codingapi.springboot.persistence.jdbc.schema;
 
 import com.codingapi.springboot.persistence.schema.BuildSchema;
-import com.codingapi.springboot.persistence.property.Property;
+import com.codingapi.springboot.persistence.property.BeanProperty;
 import com.codingapi.springboot.persistence.schema.Schema;
 
 import java.util.List;
@@ -19,12 +19,12 @@ public String createSchema() {
         sql.append(property.getSchemaName());
         sql.append(" (");
         sql.append("id INT PRIMARY KEY AUTO_INCREMENT,");
-        List<Property> properties = property.getProperties(false);
+        List<BeanProperty> properties = property.getProperties(false);
         for (int i = 0; i < properties.size(); i++) {
-            Property property = properties.get(i);
-            sql.append(property.getName());
+            BeanProperty beanProperty = properties.get(i);
+            sql.append(beanProperty.getName());
             sql.append(" ");
-            sql.append(property.getJdbcType());
+            sql.append(beanProperty.getJdbcType());
             if (i != properties.size() - 1) {
                 sql.append(", ");
             }
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
@@ -0,0 +1,16 @@
+package com.codingapi.springboot.persistence.jdbc.schema;
+
+import com.codingapi.springboot.persistence.schema.DeleteSchema;
+import com.codingapi.springboot.persistence.schema.Schema;
+
+public class JdbcDeleteSchema extends DeleteSchema {
+
+    public JdbcDeleteSchema(Schema schema) {
+        super(schema);
+    }
+
+    @Override
+    public String deleteSchema() {
+        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
@@ -1,6 +1,6 @@
 package com.codingapi.springboot.persistence.jdbc.schema;
 
-import com.codingapi.springboot.persistence.property.Property;
+import com.codingapi.springboot.persistence.property.BeanProperty;
 import com.codingapi.springboot.persistence.schema.SaveSchema;
 import com.codingapi.springboot.persistence.schema.Schema;
 
@@ -16,13 +16,13 @@ public String saveSchema(boolean hasId) {
         sql.append("INSERT INTO ");
         sql.append(property.getSchemaName());
         sql.append(" (");
-        for (Property property : property.getProperties(hasId)) {
-            sql.append(property.getName());
+        for (BeanProperty beanProperty : property.getProperties(hasId)) {
+            sql.append(beanProperty.getName());
             sql.append(", ");
         }
         sql.delete(sql.length() - 2, sql.length());
         sql.append(") VALUES (");
-        for (Property property : property.getProperties(hasId)) {
+        for (BeanProperty beanProperty : property.getProperties(hasId)) {
             sql.append("?, ");
         }
         sql.delete(sql.length() - 2, sql.length());
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
@@ -1,9 +1,6 @@
 package com.codingapi.springboot.persistence.jdbc.schema;
 
-import com.codingapi.springboot.persistence.schema.BuildSchema;
-import com.codingapi.springboot.persistence.schema.SaveSchema;
-import com.codingapi.springboot.persistence.schema.Schema;
-import com.codingapi.springboot.persistence.schema.SearchSchema;
+import com.codingapi.springboot.persistence.schema.*;
 
 public class JdbcSchema extends Schema {
 
@@ -25,4 +22,14 @@ public SaveSchema insertSchema() {
     public SearchSchema getById() {
         return new JdbcSearchSchema(this);
     }
+
+    @Override
+    public DeleteSchema deleteSchema() {
+        return new JdbcDeleteSchema(this);
+    }
+
+    @Override
+    public UpdateSchema updateSchema() {
+        return new JdbcUpdateSchema(this);
+    }
 }
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
@@ -0,0 +1,25 @@
+package com.codingapi.springboot.persistence.jdbc.schema;
+
+import com.codingapi.springboot.persistence.property.BeanProperty;
+import com.codingapi.springboot.persistence.schema.Schema;
+import com.codingapi.springboot.persistence.schema.UpdateSchema;
+
+public class JdbcUpdateSchema extends UpdateSchema {
+
+    public JdbcUpdateSchema(Schema schema) {
+        super(schema);
+    }
+
+    @Override
+    public String updateSchema() {
+        StringBuilder sql = new StringBuilder();
+        sql.append("UPDATE ").append(property.getSchemaName()).append(" SET ");
+        for (BeanProperty property : property.getProperties(false)) {
+            sql.append(property.getName()).append(" = ?, ");
+        }
+        sql.delete(sql.length() - 2, sql.length());
+        sql.append(" WHERE id = ?");
+        return sql.toString();
+    }
+
+}
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/property/BeanProperty.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/property/BeanProperty.java
@@ -1,13 +1,14 @@
 package com.codingapi.springboot.persistence.property;
 
 import lombok.extern.slf4j.Slf4j;
+import org.yaml.snakeyaml.introspector.Property;
 
 @Slf4j
-public class Property {
+public class BeanProperty {
     
-    private final org.yaml.snakeyaml.introspector.Property property;
+    private final Property property;
 
-    public Property(org.yaml.snakeyaml.introspector.Property property) {
+    public BeanProperty(Property property) {
         this.property = property;
     }
     
diff --git a/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/property/SchemaProperty.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/property/SchemaProperty.java
@@ -9,41 +9,41 @@
 
 public class SchemaProperty {
 
-    private final List<Property> properties;
+    private final List<BeanProperty> properties;
     @Getter
     private final String schemaName;
     @Getter
-    private final Property idProperty;
+    private final BeanProperty idBeanProperty;
 
     public SchemaProperty(Class<?> domainClazz) {
         PropertyUtils propertyUtils = new PropertyUtils();
         propertyUtils.setSkipMissingProperties(true);
         this.properties = propertyUtils.getProperties(domainClazz).stream()
-                .map(Property::new).collect(Collectors.toList());
-        this.idProperty = new Property(propertyUtils.getProperty(domainClazz, "id"));
+                .map(BeanProperty::new).collect(Collectors.toList());
+        this.idBeanProperty = new BeanProperty(propertyUtils.getProperty(domainClazz, "id"));
         this.schemaName = domainClazz.getSimpleName();
     }
 
 
-    public List<Property> getProperties(boolean hasId) {
+    public List<BeanProperty> getProperties(boolean hasId) {
         if(hasId){
             return properties;
         }else{
             return properties.stream()
-                    .filter(property -> !property.getName().equals("id"))
+                    .filter(beanProperty -> !beanProperty.getName().equals("id"))
                     .collect(Collectors.toList());
         }
     }
 
-    public List<Property> getProperties() {
+    public List<BeanProperty> getProperties() {
         return getProperties(true);
     }
 
     public boolean hasIdValue(Object domain) {
-        return idProperty.hasIdValue(domain);
+        return idBeanProperty.hasIdValue(domain);
     }
 
     public void setIdValue(Object domain, Number key) {
-        idProperty.setIdValue(domain, key);
+        idBeanProperty.setIdValue(domain, key);
     }
 }
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
@@ -0,0 +1,14 @@
+package com.codingapi.springboot.persistence.schema;
+
+import com.codingapi.springboot.persistence.property.SchemaProperty;
+
+public abstract class DeleteSchema {
+
+    public abstract String deleteSchema();
+
+    protected final SchemaProperty property;
+
+    public DeleteSchema(Schema schema) {
+        this.property = schema.getSchemaProperty();
+    }
+}
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
@@ -1,6 +1,6 @@
 package com.codingapi.springboot.persistence.schema;
 
-import com.codingapi.springboot.persistence.property.Property;
+import com.codingapi.springboot.persistence.property.BeanProperty;
 import com.codingapi.springboot.persistence.property.SchemaProperty;
 import lombok.Getter;
 
@@ -25,8 +25,8 @@ public String saveSchema() {
 
     public Object[] getSaveValues(Object object, boolean hasId) {
         List<Object> values = new ArrayList<>();
-        for (Property property : property.getProperties(hasId)) {
-            values.add(property.get(object));
+        for (BeanProperty beanProperty : property.getProperties(hasId)) {
+            values.add(beanProperty.get(object));
         }
         return values.toArray();
     }
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
@@ -26,6 +26,10 @@ public Schema(Class<?> domainClass) {
 
     public abstract SearchSchema getById();
 
+    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/SearchSchema.java b/springboot-starter-persistence/src/main/java/com/codingapi/springboot/persistence/schema/SearchSchema.java
@@ -15,7 +15,7 @@ public SearchSchema(Schema schema) {
     public abstract String getById();
 
     public Object getByIdValue(Object domain) {
-        return property.getIdProperty().get(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
@@ -0,0 +1,29 @@
+package com.codingapi.springboot.persistence.schema;
+
+import com.codingapi.springboot.persistence.property.BeanProperty;
+import com.codingapi.springboot.persistence.property.SchemaProperty;
+
+public abstract class UpdateSchema {
+
+    public abstract String updateSchema();
+
+    protected final SchemaProperty property;
+
+    public UpdateSchema(Schema schema) {
+        this.property = schema.getSchemaProperty();
+    }
+
+    public Object[] getUpdateValues(Object object) {
+        BeanProperty idBeanProperty = property.getIdBeanProperty();
+        Object[] values = new Object[property.getProperties(true).size()];
+        int i = 0;
+        for (BeanProperty beanProperty : property.getProperties(false)) {
+            values[i] = beanProperty.get(object);
+            i++;
+        }
+        values[i] = idBeanProperty.get(object);
+        return values;
+    }
+
+
+}
diff --git a/springboot-starter-persistence/src/test/java/com/example/demo/repository/DemoRepository.java b/springboot-starter-persistence/src/test/java/com/example/demo/repository/DemoRepository.java
@@ -21,4 +21,12 @@ public Demo get(int id) {
         return domainPersistence.get(Demo.class, id);
     }
 
+    public void delete(int id) {
+        domainPersistence.delete(Demo.class,id);
+    }
+
+    public void update(Demo demo) {
+        domainPersistence.update(demo);
+    }
+
 }
diff --git a/springboot-starter-persistence/src/test/java/com/example/demo/repository/DemoRepositoryTests.java b/springboot-starter-persistence/src/test/java/com/example/demo/repository/DemoRepositoryTests.java
@@ -38,4 +38,17 @@ void get() {
         log.info("demo: {}", demo);
     }
 
+    @Test
+    void delete() {
+        demoRepository.delete(100);
+    }
+
+
+    @Test
+    void update() {
+        Demo demo = new Demo();
+        demo.setId(100);
+        demo.setName("123456");
+        demoRepository.update(demo);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,7 @@ public interface DomainPersistence {`
`6`	`6`
`7`	`7`	`<T> T get(Class<T> domainClass, Object id);`
`8`	`8`
	`9`	`+ void delete(Class<?> domainClass,Object id);`
	`10`	`+`
	`11`	`+ void update(Object domain);`
`9`	`12`	`}`