Move "api-boot-plugin-http-convert" to "api-boot"

hengboy · hengboy · commit 2ddf20d3a02a · 2020-07-17T21:28:08.000+08:00
diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml
@@ -34,6 +34,8 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <scope>compile</scope>
+            <optional>true</optional>
         </dependency>
         <!--fastjson-->
         <dependency>
diff --git a/api-boot-project/api-boot-dependencies/pom.xml b/api-boot-project/api-boot-dependencies/pom.xml
@@ -91,12 +91,6 @@
             </dependency>
 
             <!--ApiBoot Converter-->
-            <dependency>
-                <groupId>org.minbox.framework</groupId>
-                <artifactId>api-boot-plugin-http-converter</artifactId>
-                <version>${project.version}</version>
-                <optional>true</optional>
-            </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-http-converter</artifactId>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-http-converter/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-http-converter/pom.xml
diff --git a/api-boot-project/api-boot-plugins/pom.xml b/api-boot-project/api-boot-plugins/pom.xml
@@ -23,7 +23,6 @@
         <module>api-boot-plugin-oauth</module>
         <module>api-boot-plugin-quartz</module>
         <module>api-boot-plugin-resource-load</module>
-        <module>api-boot-plugin-http-converter</module>
         <module>api-boot-plugin-message-push</module>
         <module>api-boot-plugin-rate-limiter</module>
         <module>api-boot-plugin-sequence</module>
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-http-converter/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-http-converter/pom.xml
@@ -32,10 +32,6 @@
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-plugin-http-converter</artifactId>
-        </dependency>
         <!--fastJson-->
         <dependency>
             <groupId>com.alibaba</groupId>
diff --git a/api-boot-project/api-boot-starters/api-boot-starter/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter/pom.xml
@@ -30,5 +30,10 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/DecimalAccuracyFilter.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/DecimalAccuracyFilter.java
@@ -15,10 +15,10 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.http.converter.filter;
+package org.minbox.framework.api.boot.convert;
 
 import com.alibaba.fastjson.serializer.ValueFilter;
-import org.minbox.framework.api.boot.plugin.http.converter.filter.annotation.ApiBootDecimalAccuracy;
+import org.minbox.framework.api.boot.convert.annotation.ApiBootDecimalAccuracy;
 import org.springframework.util.ReflectionUtils;
 
 import java.lang.reflect.Field;
diff --git a/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/ValueHideFilter.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/ValueHideFilter.java
@@ -15,10 +15,11 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.http.converter.filter;
+package org.minbox.framework.api.boot.convert;
 
 import com.alibaba.fastjson.serializer.ValueFilter;
-import org.minbox.framework.api.boot.plugin.http.converter.filter.annotation.ApiBootValueHide;
+import org.minbox.framework.api.boot.convert.annotation.ApiBootValueHide;
+import org.minbox.framework.api.boot.convert.enums.ValueHidePositionEnum;
 
 import java.lang.reflect.Field;
 
diff --git a/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/annotation/ApiBootDecimalAccuracy.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/annotation/ApiBootDecimalAccuracy.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.http.converter.filter.annotation;
+package org.minbox.framework.api.boot.convert.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/annotation/ApiBootValueHide.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/annotation/ApiBootValueHide.java
@@ -15,9 +15,9 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.http.converter.filter.annotation;
+package org.minbox.framework.api.boot.convert.annotation;
 
-import org.minbox.framework.api.boot.plugin.http.converter.filter.enums.ValueHidePositionEnum;
+import org.minbox.framework.api.boot.convert.enums.ValueHidePositionEnum;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/enums/ValueHidePositionEnum.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/convert/enums/ValueHidePositionEnum.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.http.converter.filter.enums;
+package org.minbox.framework.api.boot.convert.enums;
 
 /**
  * Enumeration of hidden locations
diff --git a/api-boot-samples/api-boot-sample-http-converter/pom.xml b/api-boot-samples/api-boot-sample-http-converter/pom.xml
@@ -29,7 +29,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.2.2.RELEASE</version>
+                <version>${api-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/api-boot-samples/api-boot-sample-http-converter/src/main/java/org/minbox/framework/api/boot/sample/ApiBootHttpConverterApplication.java b/api-boot-samples/api-boot-sample-http-converter/src/main/java/org/minbox/framework/api/boot/sample/ApiBootHttpConverterApplication.java
@@ -34,7 +34,7 @@ public static void main(String[] args) {
         logger.info("「「「「「ApiBoot Http Converter Sample 启动完成.」」」」」");
     }
 
-    @GetMapping(value = "/")
+    @GetMapping
     public ApiBootResult jsonResult() {
         SampleEntity sampleEntity = new SampleEntity();
         sampleEntity.setDecimalValue(new BigDecimal(23.55));
diff --git a/api-boot-samples/api-boot-sample-http-converter/src/main/resources/application.yml b/api-boot-samples/api-boot-sample-http-converter/src/main/resources/application.yml
@@ -4,6 +4,6 @@ spring:
   # 配置使用fastJson来处理json数据的格式化驱动
   # 该配置缺省时，默认值为：fastJson
   # 如需修改，参考值：gson、jackson、jsonb
-  http:
-    converters:
-      preferred-json-mapper: fastJson
+  mvc:
+      converters:
+          preferred-json-mapper: fastJson

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-package org.minbox.framework.api.boot.plugin.http.converter.filter.annotation;`
	`18`	`+package org.minbox.framework.api.boot.convert.annotation;`
`19`	`19`
`20`	`20`	`import java.lang.annotation.ElementType;`
`21`	`21`	`import java.lang.annotation.Retention;`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@`
`15`	`15`	`*`
`16`	`16`	`*/`
`17`	`17`
`18`		`-package org.minbox.framework.api.boot.plugin.http.converter.filter.annotation;`
	`18`	`+package org.minbox.framework.api.boot.convert.annotation;`
`19`	`19`
`20`		`-import org.minbox.framework.api.boot.plugin.http.converter.filter.enums.ValueHidePositionEnum;`
	`20`	`+import org.minbox.framework.api.boot.convert.enums.ValueHidePositionEnum;`
`21`	`21`
`22`	`22`	`import java.lang.annotation.ElementType;`
`23`	`23`	`import java.lang.annotation.Retention;`