Merge pull request #9 from OpenMetaInfo/starters

Upgrade to V0.2.0
OpenMetaInfo · Jul 22, 2024 · b708bcc · b708bcc
2 parents 3ad15d4 + 5054f87
commit b708bcc
Show file tree

Hide file tree

Showing 110 changed files with 3,461 additions and 107 deletions.
diff --git a/apps/demo-app/pom.xml b/apps/demo-app/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>apps</artifactId>
         <groupId>info.openmeta</groupId>
-        <version>0.1.8</version>
+        <version>0.2.0</version>
     </parent>
 
     <artifactId>demo-app</artifactId>
@@ -15,8 +15,8 @@
     <dependencies>
         <dependency>
             <groupId>info.openmeta</groupId>
-            <artifactId>web</artifactId>
-            <version>${project.version}</version>
+            <artifactId>metadata-starter</artifactId>
+            <version>0.2.0</version>
         </dependency>
 
     </dependencies>

diff --git a/apps/demo-app/src/main/resources/application-dev.yml b/apps/demo-app/src/main/resources/application-dev.yml
@@ -35,17 +35,17 @@ spring:
 #    index:
 #      changelog: demo_dev_changelog
 
-#rocketmq:
-#  name-server: 127.0.0.1:9876
-#  producer:
-#    group: my-producer-group
-#    send-message-timeout: 3000
-#  consumer:
-#    group: my-consumer-group
-#  topics:
-#    cron-task:
-#    change-log:
-#    flow-async-task:
-#    flow-event:
-#    common-log:
-#    reload-metadata:
+rocketmq:
+  name-server: 127.0.0.1:9876
+  producer:
+    group: my-producer-group
+    send-message-timeout: 3000
+  consumer:
+    group: my-consumer-group
+  topics:
+    cron-task:
+    change-log:
+    flow-async-task:
+    flow-event:
+    common-log:
+    reload-metadata:
diff --git a/apps/pom.xml b/apps/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>openmeta</artifactId>
         <groupId>info.openmeta</groupId>
-        <version>0.1.8</version>
+        <version>0.2.0</version>
     </parent>
 
     <artifactId>apps</artifactId>

diff --git a/framework/base/pom.xml b/framework/base/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>info.openmeta</groupId>
         <artifactId>framework</artifactId>
-        <version>0.1.8</version>
+        <version>0.2.0</version>
     </parent>
 
     <artifactId>base</artifactId>

diff --git a/framework/orm/pom.xml b/framework/orm/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>info.openmeta</groupId>
         <artifactId>framework</artifactId>
-        <version>0.1.8</version>
+        <version>0.2.0</version>
     </parent>
 
     <artifactId>orm</artifactId>
@@ -61,10 +61,6 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.alibaba</groupId>
-                    <artifactId>fastjson</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.google.protobuf</groupId>
                     <artifactId>protobuf-java-util</artifactId>

diff --git a/framework/orm/src/main/java/info/openmeta/framework/orm/constant/ModelConstant.java b/framework/orm/src/main/java/info/openmeta/framework/orm/constant/ModelConstant.java
@@ -1,26 +1,15 @@
 package info.openmeta.framework.orm.constant;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 
 import java.time.LocalDate;
-import java.util.Map;
 import java.util.Set;
 
 /**
  * Model constant
  */
 public interface ModelConstant {
 
-    /** Version control model mapping relationship between design state and runtime state */
-    Map<String, String> VERSION_CONTROL_MODELS = ImmutableMap.<String, String>builder()
-            .put("DesignModel", "MetaModel")
-            .put("DesignField", "MetaField")
-            .put("DesignModelIndex", "SysModelIndex")
-            .put("DesignMenu", "SysMenu")
-            .put("DesignView", "SysView")
-            .build();
-
     /** Model attribute constants */
     String ID = "id";
     String UUID = "uuid";

diff --git a/framework/pom.xml b/framework/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>info.openmeta</groupId>
         <artifactId>openmeta</artifactId>
-        <version>0.1.8</version>
+        <version>0.2.0</version>
     </parent>
 
     <artifactId>framework</artifactId>

diff --git a/framework/web/pom.xml b/framework/web/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>info.openmeta</groupId>
         <artifactId>framework</artifactId>
-        <version>0.1.8</version>
+        <version>0.2.0</version>
     </parent>
 
     <artifactId>web</artifactId>

diff --git a/framework/web/src/main/java/info/openmeta/framework/web/config/RestTemplateConfig.java b/framework/web/src/main/java/info/openmeta/framework/web/config/RestTemplateConfig.java
@@ -0,0 +1,13 @@
+package info.openmeta.framework.web.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.client.RestTemplate;
+
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}
+
diff --git a/framework/web/src/main/java/info/openmeta/framework/web/constant/WebConstant.java b/framework/web/src/main/java/info/openmeta/framework/web/constant/WebConstant.java
diff --git a/framework/web/src/main/java/info/openmeta/framework/web/controller/vo/ModelField.java b/framework/web/src/main/java/info/openmeta/framework/web/controller/vo/ModelField.java
@@ -1,10 +1,9 @@
 package info.openmeta.framework.web.controller.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import jakarta.validation.constraints.NotEmpty;
-
 /**
  * Simple VO of a modelName and a fieldName
  */
@@ -13,11 +12,11 @@
 public class ModelField {
 
     @Schema(description = "Model name")
-    @NotEmpty(message = "The model name cannot be empty!")
+    @NotBlank(message = "The model name cannot be empty!")
     private String model;
 
     @Schema(description = "Field name")
-    @NotEmpty(message = "The field name cannot be empty!")
+    @NotBlank(message = "The field name cannot be empty!")
     private String field;
 
 }
diff --git a/framework/web/src/main/java/info/openmeta/framework/web/controller/vo/ModelFields.java b/framework/web/src/main/java/info/openmeta/framework/web/controller/vo/ModelFields.java
@@ -1,9 +1,9 @@
 package info.openmeta.framework.web.controller.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import jakarta.validation.constraints.NotEmpty;
 import java.util.Set;
 
 /**
@@ -14,7 +14,7 @@
 public class ModelFields {
 
     @Schema(description = "Model name")
-    @NotEmpty(message = "The model name cannot be empty!")
+    @NotBlank(message = "The model name cannot be empty!")
     private String model;
 
     @Schema(description = "Field names. If it is empty, all fields meet the conditions by default.")

diff --git a/framework/web/src/main/java/info/openmeta/framework/web/dto/FileInfo.java b/framework/web/src/main/java/info/openmeta/framework/web/dto/FileInfo.java
@@ -0,0 +1,17 @@
+package info.openmeta.framework.web.dto;
+
+import info.openmeta.framework.orm.enums.FileType;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileInfo {
+
+    private FileType fileType;
+
+    private String content;
+
+}
diff --git a/...framework/web/bo/UpgradeModelPackage.java → ...ework/web/dto/MetadataUpgradePackage.java b/...framework/web/bo/UpgradeModelPackage.java → ...ework/web/dto/MetadataUpgradePackage.java
@@ -1,4 +1,4 @@
-package info.openmeta.framework.web.bo;
+package info.openmeta.framework.web.dto;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,15 +10,20 @@
 import java.util.Map;
 
 /**
- * Runtime model upgrade package
+ * Metadata upgrade package
  */
 @Data
 @NoArgsConstructor
-public class UpgradeModelPackage implements Serializable {
+public class MetadataUpgradePackage implements Serializable {
+
     @Serial
     private static final long serialVersionUID = 1L;
+
     private String modelName;
+
     private List<Map<String, Object>> createRows = new ArrayList<>();
+
     private List<Map<String, Object>> updateRows = new ArrayList<>();
-    private List<String> deleteCodes = new ArrayList<>();
+
+    private List<Serializable> deleteCodes = new ArrayList<>();
 }