[maven-tool] 对于默认的参数值，若为空，不添加该值

Author: surpercodehang

framework/fel/java/maven-plugins/tool-maven-plugin/src/main/java/modelengine/fel/maven/complie/parser/ByteBuddySchemaParser.java

@@ -21,9 +21,7 @@
 
 import static modelengine.fitframework.inspection.Validation.notNull;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -79,7 +77,9 @@ private static Map<String, Object> getStringObjectMap(ReturnPropertyEntity retur
         if (returnPropertyEntity.getConvertor() != null) {
             returnProperty.put("convertor", returnPropertyEntity.getConvertor());
         }
-        returnProperty.put("examples", returnPropertyEntity.getExamples());
+        if (returnPropertyEntity.getExamples() != null) {
+            returnProperty.put("examples", returnPropertyEntity.getExamples());
+        }
         return returnProperty;
     }
 
@@ -92,7 +92,7 @@ private static ParameterEntity parseParameter(MethodDescription methodDescriptio
             String methodName = parameterDescription.getName();
             PropertyEntity property = parseProperty(parameterDescription);
             properties.put(methodName, property);
-            if (property.isNeed()) {
+            if (property.isRequired()) {
                 required.add(methodName);
             }
         }
@@ -112,9 +112,15 @@ private static PropertyEntity parseProperty(ParameterDescription parameterDescri
         if (paramAnnotation != null) {
             Property property = paramAnnotation.load();
             entity.setDescription(property.description());
-            entity.setNeed(property.required());
-            entity.setDefaultValue(property.defaultValue());
-            entity.setExamples(Collections.singletonList(property.example()));
+            entity.setRequired(property.required());
+            // 只有当 defaultValue 不为空字符串时才设置
+            if (!property.defaultValue().isEmpty()) {
+                entity.setDefaultValue(property.defaultValue());
+            }
+            // 只有当 example 不为空字符串时才设置
+            if (!property.example().isEmpty()) {
+                entity.setExamples(property.example());
+            }
         }
         return entity;
     }
@@ -127,7 +133,10 @@ private static ReturnPropertyEntity parseReturnProperty(MethodDescription method
             Property property = returnAnnotation.load();
             returnPropertyEntity.setName(property.name());
             returnPropertyEntity.setDescription(property.description());
-            returnPropertyEntity.setExamples(Collections.singletonList(property.example()));
+            // 只有当 example 不为空字符串时才设置
+            if (!property.example().isEmpty()) {
+                returnPropertyEntity.setExamples(property.example());
+            }
         }
         notNull(methodDescription.getReturnType(), "The return type cannot be null.");
         JsonNode jsonNode = JacksonTypeParser.getParameterSchema(methodDescription.getReturnType());
@@ -142,6 +151,8 @@ private static ReturnPropertyEntity parseReturnProperty(MethodDescription method
 
     private static void setPropertyType(PropertyEntity returnPropertyEntity, JsonNode jsonNode) {
         returnPropertyEntity.setType(jsonNode.get("type").asText());
+        returnPropertyEntity.setItems(null);
+        returnPropertyEntity.setProperties(null);
         if (Objects.equals(returnPropertyEntity.getType(), "array")) {
             returnPropertyEntity.setItems(jsonNode.get("items"));
         }

framework/fel/java/maven-plugins/tool-maven-plugin/src/test/resources/weather-tools.json

@@ -13,6 +13,7 @@
           "type" : "object",
           "properties" : {
             "location" : {
+              "defaultValue" : "Shanghai",
               "description" : "查询地点",
               "name" : "location",
               "type" : "string",