Merge pull request #542 from shalousun/master

release 2.7.2
TongchengOpenSource · Jul 8, 2023 · 76608d3 · 76608d3
2 parents 8d46cff + 3b48aad
commit 76608d3
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
   2. 修复[2.6.9, 2.7.1]版本dubbo rpc重复生成接口文档bug。[#531](https://github.com/smart-doc-group/smart-doc/issues/531)
   3. 修改不通类方法接口同名时归档错误问题，[#531](https://github.com/smart-doc-group/smart-doc/issues/534)
   4. torna增加version推送，[#535](https://github.com/smart-doc-group/smart-doc/issues/535)
+  5. 删除自定义@required tag，@ignore tag不在支持字段忽略。使用jsr规则替代。
 
 ### 版本号：2.7.1
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>smart-doc</artifactId>
     <packaging>jar</packaging>
-    <version>2.7.1</version>
+    <version>2.7.2</version>
 
     <name>smart-doc</name>
     <url>https://github.com/smart-doc-group/smart-doc.git</url>

diff --git a/src/main/java/com/power/doc/constants/DocTags.java b/src/main/java/com/power/doc/constants/DocTags.java
@@ -32,11 +32,6 @@ public interface DocTags {
      */
     String SINCE = "since";
 
-    /**
-     * java required tag
-     */
-    String REQUIRED = "required";
-
     /**
      * java param tag
      */

diff --git a/src/main/java/com/power/doc/helper/FormDataBuildHelper.java b/src/main/java/com/power/doc/helper/FormDataBuildHelper.java
@@ -118,9 +118,6 @@ public static List<FormData> getFormData(String className, Map<String, String> r
                 fieldName = StringUtil.camelToUnderline(fieldName);
             }
             Map<String, String> tagsMap = DocUtil.getFieldTagsValue(field, docField);
-            if (tagsMap.containsKey(DocTags.IGNORE)) {
-                continue;
-            }
             String typeSimpleName = field.getType().getSimpleName();
             if (JavaClassValidateUtil.isMap(subTypeName)) {
                 continue;

diff --git a/src/main/java/com/power/doc/helper/ParamsBuildHelper.java b/src/main/java/com/power/doc/helper/ParamsBuildHelper.java
@@ -248,11 +248,7 @@ public static List<ApiParam> buildParams(String className, String pre, int level
                 }
                 comment.append(JavaFieldUtil.getJsrComment(javaAnnotations));
                 String fieldValue = BaseHelper.getFieldValueFromMock(subTypeName, tagsMap, typeSimpleName);
-                if (annotationCounter < 1) {
-                    if (tagsMap.containsKey(DocTags.REQUIRED)) {
-                        strRequired = true;
-                    }
-                }
+
 
                 // cover response value
                 if (Objects.nonNull(customResponseField) && isResp && Objects.nonNull(customResponseField.getValue())