diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/ApiDoc.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/ApiDoc.java similarity index 91% rename from apidoc-core/src/main/java/com/kim/apidoc/core/ApiDoc.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/ApiDoc.java index 6984ddd728c27663a4b7f0ff0beb6e8af2542674..6ac3d4236c6ee05eaa1e2d8445d84717f1739f82 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/ApiDoc.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/ApiDoc.java @@ -1,11 +1,11 @@ -package com.kim.apidoc.core; - -import com.kim.apidoc.core.common.helper.StringHelper; -import com.kim.apidoc.core.parser.ParserStrategy; -import com.kim.apidoc.core.parser.VisitorParser; -import com.kim.apidoc.core.render.ProjectRender; -import com.kim.apidoc.core.resolver.TypeResolvers; -import com.kim.apidoc.core.schema.Project; +package com.github.fengyuchenglun.apidoc.core; + +import com.github.fengyuchenglun.apidoc.core.common.helper.StringHelper; +import com.github.fengyuchenglun.apidoc.core.parser.ParserStrategy; +import com.github.fengyuchenglun.apidoc.core.parser.VisitorParser; +import com.github.fengyuchenglun.apidoc.core.render.ProjectRender; +import com.github.fengyuchenglun.apidoc.core.resolver.TypeResolvers; +import com.github.fengyuchenglun.apidoc.core.schema.Project; import com.github.javaparser.ParseResult; import com.github.javaparser.ParserConfiguration; import com.github.javaparser.ast.CompilationUnit; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/Context.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/Context.java similarity index 87% rename from apidoc-core/src/main/java/com/kim/apidoc/core/Context.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/Context.java index bb58954d4a3088eb21f9b5d8553b48c6c4af5266..44d11ada2ac54d75462ecf0ad697d6d90baea3b0 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/Context.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/Context.java @@ -1,10 +1,11 @@ -package com.kim.apidoc.core; +package com.github.fengyuchenglun.apidoc.core; +import com.github.fengyuchenglun.apidoc.core.common.Constants; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.kim.apidoc.core.common.helper.FileHelper; -import com.kim.apidoc.core.render.MarkdownRender; -import com.kim.apidoc.core.render.ProjectRender; +import com.github.fengyuchenglun.apidoc.core.common.helper.FileHelper; +import com.github.fengyuchenglun.apidoc.core.render.MarkdownRender; +import com.github.fengyuchenglun.apidoc.core.render.ProjectRender; import lombok.Getter; import lombok.Setter; @@ -13,8 +14,6 @@ import java.nio.file.Paths; import java.util.List; import java.util.Map; -import static com.kim.apidoc.core.common.Constants.MARKDOWN_TEMPLATE; - /** * The type Context. * @@ -109,7 +108,7 @@ public class Context { * markdown模版文件路径 */ @Setter - private String markdownTemplate = MARKDOWN_TEMPLATE; + private String markdownTemplate = Constants.MARKDOWN_TEMPLATE; /** * 自定义扩展参数 diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/Assert.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/Assert.java similarity index 91% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/Assert.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/Assert.java index ea8bcb297fd2a3d6116b167136249e2a2d9208bb..b0b887efa2331b6ef56a07804568f7c32a01ea9f 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/Assert.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/Assert.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common; +package com.github.fengyuchenglun.apidoc.core.common; import com.google.common.base.Strings; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/Constants.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/Constants.java similarity index 89% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/Constants.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/Constants.java index a28605a47ca83d8c9b1e24fc2c1b5b4c743061a5..622d0e8543b52f2503da488be638fe508ca7e6f6 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/Constants.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/Constants.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common; +package com.github.fengyuchenglun.apidoc.core.common; import java.nio.charset.StandardCharsets; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/ObjectMappers.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/ObjectMappers.java similarity index 95% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/ObjectMappers.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/ObjectMappers.java index d8fa44b2cccefdcbe6f3c031fd058860cabd2342..6e4d36e13b29ea87d361b7239cddcdfabb1fb64b 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/ObjectMappers.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/ObjectMappers.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common; +package com.github.fengyuchenglun.apidoc.core.common; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/QueryStringBuilder.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/QueryStringBuilder.java similarity index 94% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/QueryStringBuilder.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/QueryStringBuilder.java index a5886cbcfa00bbe40073d4784eb079b058463263..9210614469f26ddac2b015a6c5b8e915a806046d 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/QueryStringBuilder.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/QueryStringBuilder.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common; +package com.github.fengyuchenglun.apidoc.core.common; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/URI.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/URI.java similarity index 91% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/URI.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/URI.java index 3ae00f58f2d7cf892527ffadfbc70ac3c0115100..d70d1ebbdbc7ca7e0d35b2ebdb92597c2b54243d 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/URI.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/URI.java @@ -1,6 +1,6 @@ -package com.kim.apidoc.core.common; +package com.github.fengyuchenglun.apidoc.core.common; -import com.kim.apidoc.core.common.helper.StringHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.StringHelper; import com.google.common.collect.Lists; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/ArrayTypeDescription.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/ArrayTypeDescription.java similarity index 93% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/description/ArrayTypeDescription.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/ArrayTypeDescription.java index 4b05db07b9a97fbe8adda9d8b908a5b9487fc3e9..d4cebc35e60e7931d2193b422bb0dec3f446b382 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/ArrayTypeDescription.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/ArrayTypeDescription.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.common.description; +package com.github.fengyuchenglun.apidoc.core.common.description; -import com.kim.apidoc.core.schema.Row; -import com.kim.apidoc.core.common.ObjectMappers; +import com.github.fengyuchenglun.apidoc.core.common.ObjectMappers; +import com.github.fengyuchenglun.apidoc.core.schema.Row; import com.fasterxml.jackson.databind.node.ArrayNode; import java.util.ArrayList; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/ObjectTypeDescription.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/ObjectTypeDescription.java similarity index 95% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/description/ObjectTypeDescription.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/ObjectTypeDescription.java index 8aba8aae0dc16984bad0f6bb2acfcb4a929f389a..4b6fd05141f9be488ab85763287338f4fa348a40 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/ObjectTypeDescription.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/ObjectTypeDescription.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.common.description; +package com.github.fengyuchenglun.apidoc.core.common.description; -import com.kim.apidoc.core.schema.Row; -import com.kim.apidoc.core.common.ObjectMappers; +import com.github.fengyuchenglun.apidoc.core.common.ObjectMappers; +import com.github.fengyuchenglun.apidoc.core.schema.Row; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.Lists; import lombok.Getter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/PrimitiveTypeDescription.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/PrimitiveTypeDescription.java similarity index 97% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/description/PrimitiveTypeDescription.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/PrimitiveTypeDescription.java index 84e53a53108836a0cd597e2881ac6936154fd801..71d36d2264abf9eda06d6b8b33b8f9314f0a9fea 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/PrimitiveTypeDescription.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/PrimitiveTypeDescription.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.description; +package com.github.fengyuchenglun.apidoc.core.common.description; import com.github.javaparser.resolution.types.ResolvedPrimitiveType; import com.github.javaparser.resolution.types.ResolvedReferenceType; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/StringTypeDescription.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/StringTypeDescription.java similarity index 87% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/description/StringTypeDescription.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/StringTypeDescription.java index 021bd952847c1fe2894038c9aa66535e25184d1c..597be892c0e5f8440839321a0c5d9d0056819c7d 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/StringTypeDescription.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/StringTypeDescription.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.description; +package com.github.fengyuchenglun.apidoc.core.common.description; /** * 字符串类型 diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/TypeDescription.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/TypeDescription.java similarity index 94% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/description/TypeDescription.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/TypeDescription.java index 0727e22e15469b20bc6a4de103d0035c783a7996..690c3f74748234858999220915b1060c3d8b31c4 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/TypeDescription.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/TypeDescription.java @@ -1,11 +1,11 @@ -package com.kim.apidoc.core.common.description; +package com.github.fengyuchenglun.apidoc.core.common.description; +import com.github.fengyuchenglun.apidoc.core.common.helper.CommentHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.StringHelper; +import com.github.fengyuchenglun.apidoc.core.schema.Row; import com.github.javaparser.ast.comments.Comment; import com.github.javaparser.javadoc.Javadoc; import com.google.common.collect.Lists; -import com.kim.apidoc.core.common.helper.CommentHelper; -import com.kim.apidoc.core.common.helper.StringHelper; -import com.kim.apidoc.core.schema.Row; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/UnAvailableTypeDescription.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/UnAvailableTypeDescription.java similarity index 78% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/description/UnAvailableTypeDescription.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/UnAvailableTypeDescription.java index a2941211598b7b3ae657564818a9e3f4880cd851..4261239d4d6e5a66837d170e6fdcaf63434cdfa6 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/description/UnAvailableTypeDescription.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/description/UnAvailableTypeDescription.java @@ -1,6 +1,6 @@ -package com.kim.apidoc.core.common.description; +package com.github.fengyuchenglun.apidoc.core.common.description; -import com.kim.apidoc.core.schema.Row; +import com.github.fengyuchenglun.apidoc.core.schema.Row; import java.util.Collection; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/FileMatcher.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/FileMatcher.java similarity index 98% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/FileMatcher.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/FileMatcher.java index 14031b8d23e658b0e63341f6ba94b2ecbb2c5246..753a331b6835ca38e8590595c144cc4064fa546e 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/FileMatcher.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/FileMatcher.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.diff; +package com.github.fengyuchenglun.apidoc.core.common.diff; import com.google.common.base.Charsets; import lombok.Getter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/FileSystem.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/FileSystem.java similarity index 96% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/FileSystem.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/FileSystem.java index 0f6115f5c8e50e2e648fbaad44c3525f78513d19..c4d97cd5c9a53cdec71a9adca06bb896779e3402 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/FileSystem.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/FileSystem.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.diff; +package com.github.fengyuchenglun.apidoc.core.common.diff; import java.awt.*; import java.io.File; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/MatchPatcher.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/MatchPatcher.java similarity index 99% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/MatchPatcher.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/MatchPatcher.java index 311bf40b66a4f66c43aa8609389969fb97465090..ce88a3d5e5dac422eb83a4fadf9289a188ac4ad8 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/diff/MatchPatcher.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/diff/MatchPatcher.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.kim.apidoc.core.common.diff; +package com.github.fengyuchenglun.apidoc.core.common.diff; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/AnnotationHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/AnnotationHelper.java similarity index 96% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/AnnotationHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/AnnotationHelper.java index a5393650a378e9ff884507fb52d36d8f4d4ef278..3c3559ef8d1b55c7582550c77f3567e01872f0e9 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/AnnotationHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/AnnotationHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.ast.expr.*; import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ClassDeclarationHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ClassDeclarationHelper.java similarity index 97% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ClassDeclarationHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ClassDeclarationHelper.java index 3ea0d10bc02960da5803104b0f806dc2baecdd9e..4cae23516d0d0cecb03d9f74fb095b33e5186736 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ClassDeclarationHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ClassDeclarationHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.type.ClassOrInterfaceType; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/CommentHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/CommentHelper.java similarity index 97% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/CommentHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/CommentHelper.java index 86e8f7ea5441c0a7f08f1bc3c97adb3930e679f5..67b652247a31d0fdb4264853dabb4bcdd8ead25f 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/CommentHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/CommentHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.ast.body.FieldDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/CompilationUnitHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/CompilationUnitHelper.java similarity index 89% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/CompilationUnitHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/CompilationUnitHelper.java index dbb34bf41c31ec73aaa8ac2ea14a18ddbde66857..b88c4afb2630a484b901be7f3d41754138c78af1 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/CompilationUnitHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/CompilationUnitHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.Node; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/EnumHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/EnumHelper.java similarity index 93% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/EnumHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/EnumHelper.java index 558b268b2db799c7a03287845f60c08af1375f47..a98abc52341f5e4d195f1fe8e83b4259c8d1d38d 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/EnumHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/EnumHelper.java @@ -1,11 +1,11 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; +import com.github.fengyuchenglun.apidoc.core.schema.Cell; import com.github.javaparser.ast.body.EnumConstantDeclaration; import com.github.javaparser.ast.body.EnumDeclaration; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.resolution.declarations.ResolvedEnumConstantDeclaration; import com.github.javaparser.resolution.declarations.ResolvedEnumDeclaration; -import com.kim.apidoc.core.schema.Cell; import java.util.ArrayList; import java.util.List; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ExpressionHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ExpressionHelper.java similarity index 98% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ExpressionHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ExpressionHelper.java index a20830915d594f531d4b7111bee381363f102f8c..dc7e0cdcf8ba362c947b785fefde1301b4c58b17 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ExpressionHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ExpressionHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.expr.*; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/FieldHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/FieldHelper.java similarity index 95% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/FieldHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/FieldHelper.java index c098eded5f86aa5f76b7ea1232467f0ee181f3ff..c3afa256b780466a4aa5345a23d68aa81065f049 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/FieldHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/FieldHelper.java @@ -1,13 +1,12 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; +import com.github.fengyuchenglun.apidoc.core.schema.Cell; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.FieldDeclaration; import com.github.javaparser.ast.body.VariableDeclarator; -import com.github.javaparser.ast.comments.Comment; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.resolution.declarations.ResolvedFieldDeclaration; import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserFieldDeclaration; -import com.kim.apidoc.core.schema.Cell; import java.util.ArrayList; import java.util.List; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/FileHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/FileHelper.java similarity index 95% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/FileHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/FileHelper.java index 59247b8302795e5f55c636dfc44d67dd63906dcf..f4ac61f09518e209d8a91363e3dcbc3305a2c884 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/FileHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/FileHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/JsonPropertyHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/JsonPropertyHelper.java similarity index 96% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/JsonPropertyHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/JsonPropertyHelper.java index 447b79da1ecbb2db6f366946cdf1adb0a4feceb7..1ae4e221280ca7f81cac912e303b233175e4efed 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/JsonPropertyHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/JsonPropertyHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.ast.body.FieldDeclaration; import com.github.javaparser.ast.expr.AnnotationExpr; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/OptionalHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/OptionalHelper.java similarity index 84% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/OptionalHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/OptionalHelper.java index 8aab28beac65d8e1b613747f0a509f60ff10a4e7..d7a58d97196f5bb1560dcd2341d0b5858d0fcde0 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/OptionalHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/OptionalHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import java.util.Optional; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ReferenceContext.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ReferenceContext.java similarity index 92% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ReferenceContext.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ReferenceContext.java index 8ef8fcdd10b8977d351096238518d2784b3ac56f..625fad437e7658ce03a06bc46655b4d452681f35 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ReferenceContext.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ReferenceContext.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.google.common.collect.Sets; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/StringHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/StringHelper.java similarity index 94% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/StringHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/StringHelper.java index 14f9f4e7d1f54a4f79eb292436ab526338b8f908..f71b5dfc2325a1df911af67c0781b7dc7a01291c 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/StringHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/StringHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.google.common.base.Strings; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/TypeNameHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/TypeNameHelper.java similarity index 96% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/TypeNameHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/TypeNameHelper.java index 64fef127a6f9e7d749f6c5a753a326a4ecc70caf..90e5c1011545419fca2ae3e0919809609e0c545a 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/TypeNameHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/TypeNameHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.ast.CompilationUnit; import com.github.javaparser.ast.ImportDeclaration; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/TypeParameterHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/TypeParameterHelper.java similarity index 97% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/TypeParameterHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/TypeParameterHelper.java index 42ad047dab77db349e184d65ca97a84e4cbc9e10..3412991f0c313ae6029a7786bcede15de1ef6e7f 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/TypeParameterHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/TypeParameterHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.resolution.declarations.ResolvedTypeParameterDeclaration; import com.github.javaparser.resolution.types.ResolvedReferenceType; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ValidationHelper.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ValidationHelper.java similarity index 96% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ValidationHelper.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ValidationHelper.java index 44f849bc465598f3b20ca57863189e527e2edd35..b66b5c1696fd1aa06e1b3f48781194929a404cb3 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/helper/ValidationHelper.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/helper/ValidationHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.helper; +package com.github.fengyuchenglun.apidoc.core.common.helper; import com.github.javaparser.ast.body.FieldDeclaration; import com.github.javaparser.ast.expr.AnnotationExpr; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/MarkupBuilder.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/MarkupBuilder.java similarity index 96% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/MarkupBuilder.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/MarkupBuilder.java index 629ef8f45992864752c9923df370435aab897771..c391c8eedb44b8c24247489cef17eac4a3b09b6b 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/MarkupBuilder.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/MarkupBuilder.java @@ -1,6 +1,6 @@ -package com.kim.apidoc.core.common.markup; +package com.github.fengyuchenglun.apidoc.core.common.markup; -import com.kim.apidoc.core.common.markup.asciidoc.AsciiDocBuilder; +import com.github.fengyuchenglun.apidoc.core.common.markup.asciidoc.AsciiDocBuilder; import java.util.List; import java.util.function.Consumer; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/AsciiDoc.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/AsciiDoc.java similarity index 96% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/AsciiDoc.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/AsciiDoc.java index c114e5ea3c7c186284e7805d7b91f7f4a4883228..d86e0c6e407a668634187eebba5e14eec5d3e2b7 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/AsciiDoc.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/AsciiDoc.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.markup.asciidoc; +package com.github.fengyuchenglun.apidoc.core.common.markup.asciidoc; public enum AsciiDoc implements CharSequence { EXTENSION(".adoc"), diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/AsciiDocBuilder.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/AsciiDocBuilder.java similarity index 97% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/AsciiDocBuilder.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/AsciiDocBuilder.java index 9642f9aef5fae1bcd22c20b764ebbefbd0cf61a9..dbac7014298f4b55b20cbc62c6df5146b1d3244c 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/AsciiDocBuilder.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/AsciiDocBuilder.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.common.markup.asciidoc; +package com.github.fengyuchenglun.apidoc.core.common.markup.asciidoc; -import com.kim.apidoc.core.common.markup.MarkupBuilder; -import com.kim.apidoc.core.common.Assert; +import com.github.fengyuchenglun.apidoc.core.common.Assert; +import com.github.fengyuchenglun.apidoc.core.common.markup.MarkupBuilder; import com.google.common.base.Strings; import java.util.List; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/Color.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/Color.java similarity index 93% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/Color.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/Color.java index b7ca387286535527ab11937c0321c7b5297ab7e7..64e0e76a77134a025ef6214879bead8e86c46946 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/asciidoc/Color.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/asciidoc/Color.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.markup.asciidoc; +package com.github.fengyuchenglun.apidoc.core.common.markup.asciidoc; /** * https://en.wikipedia.org/wiki/Web_colors#HTML_color_names diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/markdown/Markdown.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/markdown/Markdown.java similarity index 95% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/markdown/Markdown.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/markdown/Markdown.java index 8fdb93f53ea61e7dc011180d474b6bfeaaad601e..f7ede24ec1abcfe29c2746a9ec5c4767689c5996 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/markdown/Markdown.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/markdown/Markdown.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.markup.markdown; +package com.github.fengyuchenglun.apidoc.core.common.markup.markdown; public enum Markdown implements CharSequence { EXTENSION(".md"), diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/markdown/MarkdownBuilder.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/markdown/MarkdownBuilder.java similarity index 97% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/markdown/MarkdownBuilder.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/markdown/MarkdownBuilder.java index 1c80669a90cc8e4f24a898b7d1e70610d9cb6b52..882ddc42b2e4610aba3a8c84d9bae5abf009a6b8 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/markup/markdown/MarkdownBuilder.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/markup/markdown/MarkdownBuilder.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.common.markup.markdown; +package com.github.fengyuchenglun.apidoc.core.common.markup.markdown; -import com.kim.apidoc.core.common.markup.MarkupBuilder; -import com.kim.apidoc.core.common.Assert; +import com.github.fengyuchenglun.apidoc.core.common.Assert; +import com.github.fengyuchenglun.apidoc.core.common.markup.MarkupBuilder; import com.google.common.base.Strings; import java.util.List; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Body.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Body.java similarity index 81% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Body.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Body.java index b3a32fe1654965a7601709bc91fd3b54ce2c82ea..03a90d4d4c6fe51296b9b797be9a90bb45c297b9 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Body.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Body.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/BodyMode.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/BodyMode.java similarity index 61% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/BodyMode.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/BodyMode.java index 3972bd9604353f36456fb89d58ac55765044e78f..7102cbe0bae0decf622720ae845a853ca7eb160d 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/BodyMode.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/BodyMode.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; /** * 对应postman定义的mode diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Folder.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Folder.java similarity index 83% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Folder.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Folder.java index be112fb94449485d9fd5538e1d6d8a2361479b8e..afd838ed9810cf3ce121fe796b7dbe13f4507461 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Folder.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Folder.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Getter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Info.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Info.java similarity index 80% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Info.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Info.java index 32ea847f0d21fb5d7dc9c329118507682fde4362..77b94cacfadd07c801425f3b758217b180e1a0a2 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Info.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Info.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Item.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Item.java similarity index 85% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Item.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Item.java index 9cd90f5fe38947f39fd5e0aa262f83470561d364..9af48e7912a4aee2e1644f51fe7fa0b25a4be039 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Item.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Item.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Parameter.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Parameter.java similarity index 80% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Parameter.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Parameter.java index 26f8aaa040f1327d3a7bb4e4514d68e78c75d4cd..d8e2c12caa73f6878770f5d980ed5e7881abc548 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Parameter.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Parameter.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; -import com.kim.apidoc.core.schema.Row; +import com.github.fengyuchenglun.apidoc.core.schema.Row; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Postman.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Postman.java similarity index 84% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Postman.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Postman.java index 1d6be5db89f241dfe7fde49aaf918f44f3d69b51..03738d52046c59e13cba318f94e1d9acce23d50d 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Postman.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Postman.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Request.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Request.java similarity index 60% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Request.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Request.java index e54cbcb5291835771db69233ba75c6839207d430..b226aab8d9f40b5c60b6252f7702c1dc272b96e0 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Request.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Request.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; -import com.kim.apidoc.core.schema.Header; -import com.kim.apidoc.core.schema.Method; +import com.github.fengyuchenglun.apidoc.core.schema.Header; +import com.github.fengyuchenglun.apidoc.core.schema.Method; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Response.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Response.java similarity index 73% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Response.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Response.java index b8ef7390653b6e49f90af5581ba40d8184fa563b..ff0e3c3587be06f80f2718418f14e4960c8d52a8 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Response.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Response.java @@ -1,6 +1,6 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; -import com.kim.apidoc.core.schema.Header; +import com.github.fengyuchenglun.apidoc.core.schema.Header; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Url.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Url.java similarity index 82% rename from apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Url.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Url.java index 3cb84e055a4bdeb23977dc4ea06726ba1e194924..a0bf2237bdeaf56ada2acbf310cf14673f0977cb 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/common/postman/Url.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/common/postman/Url.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.common.postman; +package com.github.fengyuchenglun.apidoc.core.common.postman; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/parser/ParserStrategy.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/parser/ParserStrategy.java similarity index 85% rename from apidoc-core/src/main/java/com/kim/apidoc/core/parser/ParserStrategy.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/parser/ParserStrategy.java index f7e3331b1e43b5b01940667535f8603bd886aad0..2bb507569136483615282daa4bc77f1f72c515e9 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/parser/ParserStrategy.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/parser/ParserStrategy.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.parser; +package com.github.fengyuchenglun.apidoc.core.parser; -import com.kim.apidoc.core.schema.Chapter; -import com.kim.apidoc.core.schema.Section; +import com.github.fengyuchenglun.apidoc.core.schema.Chapter; +import com.github.fengyuchenglun.apidoc.core.schema.Section; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/parser/VisitorParser.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/parser/VisitorParser.java similarity index 95% rename from apidoc-core/src/main/java/com/kim/apidoc/core/parser/VisitorParser.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/parser/VisitorParser.java index f3a00bb8b785f2a430e9046968435eb798830605..7472041481fd30e5a4c8e74c556e91d7117e2823 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/parser/VisitorParser.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/parser/VisitorParser.java @@ -1,13 +1,13 @@ -package com.kim.apidoc.core.parser; +package com.github.fengyuchenglun.apidoc.core.parser; +import com.github.fengyuchenglun.apidoc.core.schema.*; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.EnumDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.visitor.VoidVisitorAdapter; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.helper.OptionalHelper; -import com.kim.apidoc.core.schema.*; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.helper.OptionalHelper; /** diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/render/AsciiDocRender.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/AsciiDocRender.java similarity index 91% rename from apidoc-core/src/main/java/com/kim/apidoc/core/render/AsciiDocRender.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/AsciiDocRender.java index 491dc2ea260268b21a18114333e5def5b329477d..07f25e9365812b0f050050e37585bf7a4b97d308 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/render/AsciiDocRender.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/AsciiDocRender.java @@ -1,12 +1,12 @@ -package com.kim.apidoc.core.render; +package com.github.fengyuchenglun.apidoc.core.render; +import com.github.fengyuchenglun.apidoc.core.schema.*; import com.google.common.collect.Lists; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.helper.FileHelper; -import com.kim.apidoc.core.common.helper.StringHelper; -import com.kim.apidoc.core.common.markup.MarkupBuilder; -import com.kim.apidoc.core.common.markup.asciidoc.AsciiDoc; -import com.kim.apidoc.core.schema.*; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.helper.FileHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.StringHelper; +import com.github.fengyuchenglun.apidoc.core.common.markup.MarkupBuilder; +import com.github.fengyuchenglun.apidoc.core.common.markup.asciidoc.AsciiDoc; import lombok.extern.slf4j.Slf4j; import org.asciidoctor.Asciidoctor; import org.asciidoctor.AttributesBuilder; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/render/MarkdownRender.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/MarkdownRender.java similarity index 83% rename from apidoc-core/src/main/java/com/kim/apidoc/core/render/MarkdownRender.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/MarkdownRender.java index 49435274b6fc222d17fde2a218e07bbc0a5196b1..6e95f2a931dfecba635397e3144e9472af652d18 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/render/MarkdownRender.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/MarkdownRender.java @@ -1,16 +1,13 @@ -package com.kim.apidoc.core.render; +package com.github.fengyuchenglun.apidoc.core.render; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.Constants; -import com.kim.apidoc.core.common.ObjectMappers; -import com.kim.apidoc.core.common.helper.FileHelper; -import com.kim.apidoc.core.schema.Project; +import com.github.fengyuchenglun.apidoc.core.common.Constants; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.helper.FileHelper; +import com.github.fengyuchenglun.apidoc.core.schema.Project; import freemarker.template.Configuration; import freemarker.template.Template; import lombok.extern.slf4j.Slf4j; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; import java.io.StringWriter; import java.nio.file.Path; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/render/PostmanRender.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/PostmanRender.java similarity index 91% rename from apidoc-core/src/main/java/com/kim/apidoc/core/render/PostmanRender.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/PostmanRender.java index 325add5b80981953b01835b6f06739aa7cd8b802..538ec81aca5a2ebb3656daf6f0297d951c5cae74 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/render/PostmanRender.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/PostmanRender.java @@ -1,11 +1,11 @@ -package com.kim.apidoc.core.render; +package com.github.fengyuchenglun.apidoc.core.render; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.ObjectMappers; -import com.kim.apidoc.core.common.helper.FileHelper; -import com.kim.apidoc.core.common.postman.*; -import com.kim.apidoc.core.schema.*; +import com.github.fengyuchenglun.apidoc.core.common.ObjectMappers; +import com.github.fengyuchenglun.apidoc.core.common.postman.*; +import com.github.fengyuchenglun.apidoc.core.schema.*; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.helper.FileHelper; import lombok.extern.slf4j.Slf4j; import java.nio.file.Path; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/render/ProjectRender.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/ProjectRender.java similarity index 64% rename from apidoc-core/src/main/java/com/kim/apidoc/core/render/ProjectRender.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/ProjectRender.java index c2c36614085fd56a5dbd5abb4e388194a0f8f5a6..4c9d3c62f338269aea2336b34f22617cc0b60f56 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/render/ProjectRender.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/render/ProjectRender.java @@ -1,6 +1,6 @@ -package com.kim.apidoc.core.render; +package com.github.fengyuchenglun.apidoc.core.render; -import com.kim.apidoc.core.schema.Project; +import com.github.fengyuchenglun.apidoc.core.schema.Project; /** * The interface Project render. diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/ArrayTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/ArrayTypeResolver.java similarity index 60% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/ArrayTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/ArrayTypeResolver.java index 76f2296902ca52a688a0c1028faae3faf3b98753..afd569924bed1d190ee6764162d3cea0af42025f 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/ArrayTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/ArrayTypeResolver.java @@ -1,8 +1,8 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.description.ArrayTypeDescription; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.ArrayTypeDescription; import com.github.javaparser.resolution.types.ResolvedType; public class ArrayTypeResolver implements TypeResolver { diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/CollectionTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/CollectionTypeResolver.java similarity index 73% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/CollectionTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/CollectionTypeResolver.java index f08cc10600e58f4f2d8af1ad7d0288d17b2588be..6acb9d155c0f034805a5ddc07f2730760a0e981b 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/CollectionTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/CollectionTypeResolver.java @@ -1,10 +1,10 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.helper.TypeParameterHelper; -import com.kim.apidoc.core.common.description.ArrayTypeDescription; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.description.UnAvailableTypeDescription; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.helper.TypeParameterHelper; +import com.github.fengyuchenglun.apidoc.core.common.description.ArrayTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.UnAvailableTypeDescription; import com.github.javaparser.resolution.types.ResolvedType; import com.google.common.collect.ImmutableList; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/DateTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/DateTypeResolver.java similarity index 79% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/DateTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/DateTypeResolver.java index 9c9f20ddbee5bf1f7379c80ee79e8005f5fb88fa..c6355e94f2172d195a6562b604031deb0b2d98ad 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/DateTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/DateTypeResolver.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.description.StringTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.StringTypeDescription; import com.github.javaparser.resolution.types.ResolvedType; import com.google.common.collect.ImmutableList; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/EnumTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/EnumTypeResolver.java similarity index 80% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/EnumTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/EnumTypeResolver.java index 306f27cef3860c58b87896b9c9462ac8a63f72a3..47b417c3da4633a597877b5e2646acc0db26c2de 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/EnumTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/EnumTypeResolver.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.StringTypeDescription; -import com.kim.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.StringTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; import com.github.javaparser.resolution.declarations.ResolvedEnumConstantDeclaration; import com.github.javaparser.resolution.declarations.ResolvedEnumDeclaration; import com.github.javaparser.resolution.types.ResolvedType; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/MapTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/MapTypeResolver.java similarity index 80% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/MapTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/MapTypeResolver.java index 8118dab205e1efde3dd6aaf45722c0aa9f11c878..cf63d34017f6acd392f59f5aea79022ec2b193bf 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/MapTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/MapTypeResolver.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.description.UnAvailableTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.UnAvailableTypeDescription; import com.github.javaparser.resolution.types.ResolvedType; import com.google.common.collect.ImmutableList; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/ObjectTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/ObjectTypeResolver.java similarity index 91% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/ObjectTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/ObjectTypeResolver.java index 8a9bf3786a868f0bbc024a066ed1e89c43363143..b77c04284a6e7af92706aa110f6814fe20e5cb96 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/ObjectTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/ObjectTypeResolver.java @@ -1,13 +1,13 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; +import com.github.fengyuchenglun.apidoc.core.common.helper.*; import com.github.javaparser.resolution.declarations.ResolvedFieldDeclaration; import com.github.javaparser.resolution.types.ResolvedReferenceType; import com.github.javaparser.resolution.types.ResolvedType; import com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.description.ObjectTypeDescription; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.helper.*; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.description.ObjectTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; import java.util.Optional; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/PrimitiveTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/PrimitiveTypeResolver.java similarity index 82% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/PrimitiveTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/PrimitiveTypeResolver.java index fde1fe2c8f605609fb9c3f660f05cbc5845d8c0f..ca7cfced9c8344320b6e7303c746728cfbbf46e6 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/PrimitiveTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/PrimitiveTypeResolver.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.PrimitiveTypeDescription; -import com.kim.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.PrimitiveTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; import com.github.javaparser.resolution.types.ResolvedType; import com.google.common.collect.ImmutableList; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/StringTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/StringTypeResolver.java similarity index 77% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/StringTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/StringTypeResolver.java index 295444449d4c7551ff50ff2ec92d28c6f1362bf1..a4e48e4ec334598ccd55a51f8ba292049ca16e0f 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/StringTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/StringTypeResolver.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.description.StringTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.StringTypeDescription; import com.github.javaparser.resolution.types.ResolvedType; import com.google.common.collect.ImmutableList; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/SystemObjectTypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/SystemObjectTypeResolver.java similarity index 74% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/SystemObjectTypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/SystemObjectTypeResolver.java index da8ffb333119857b14b42e431ad4fd04019af5e5..fa9997f2aa210ea291f7f7d860669292940206af 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/SystemObjectTypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/SystemObjectTypeResolver.java @@ -1,7 +1,7 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.description.UnAvailableTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.UnAvailableTypeDescription; import com.github.javaparser.resolution.types.ResolvedType; public class SystemObjectTypeResolver implements TypeResolver { diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeNameResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeNameResolver.java similarity index 53% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeNameResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeNameResolver.java index 92efd8e9f2b3a9b9e5baed20f28088949fd62cb8..b8f4a48e05df5748fa2103c320e414616b51f188 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeNameResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeNameResolver.java @@ -1,6 +1,6 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; import com.github.javaparser.ast.type.Type; public interface TypeNameResolver { diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeResolver.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeResolver.java similarity index 57% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeResolver.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeResolver.java index 3d9a3c742bd353c36781925b29603a3993d3f83c..bdc2079a34b8c91d7e7ab316d18167c2529537f8 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeResolver.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeResolver.java @@ -1,6 +1,6 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; import com.github.javaparser.resolution.types.ResolvedType; public interface TypeResolver { diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeResolvers.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeResolvers.java similarity index 89% rename from apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeResolvers.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeResolvers.java index 485847832bad4e4c406dd5ef8dbdeffff2d3dc73..a6abcd02555f3c32dd08705fac2a5d6af5261d13 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/resolver/TypeResolvers.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/resolver/TypeResolvers.java @@ -1,8 +1,8 @@ -package com.kim.apidoc.core.resolver; +package com.github.fengyuchenglun.apidoc.core.resolver; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.helper.TypeNameHelper; -import com.kim.apidoc.core.common.description.UnAvailableTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.helper.TypeNameHelper; +import com.github.fengyuchenglun.apidoc.core.common.description.UnAvailableTypeDescription; import com.github.javaparser.ast.type.Type; import com.github.javaparser.resolution.UnsolvedSymbolException; import com.github.javaparser.resolution.types.ResolvedType; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Appendix.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Appendix.java similarity index 90% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Appendix.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Appendix.java index b2148ff3a4a454e895b646bdfd26ffc8c11f98ce..058765d779ce971454a18001febb9c38474633f0 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Appendix.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Appendix.java @@ -1,11 +1,10 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import com.github.javaparser.ast.body.BodyDeclaration; import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.ast.nodeTypes.NodeWithSimpleName; -import com.kim.apidoc.core.common.helper.EnumHelper; -import com.kim.apidoc.core.common.helper.FieldHelper; -import com.kim.apidoc.core.common.helper.FileHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.EnumHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.FieldHelper; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Book.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Book.java similarity index 90% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Book.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Book.java index dfd2da2e0ae5f304c6d67c2a417270df8bc69ea7..20045d3bb21451b4c70fdc41cfea0ee5b27ea5b9 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Book.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Book.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Cell.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Cell.java similarity index 97% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Cell.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Cell.java index 91739e0fcbbfb55532591bb491d644fdeed69fb6..b2fee045f936731539b3217daeffdfb5af174948 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Cell.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Cell.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import com.google.common.collect.Lists; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Chapter.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Chapter.java similarity index 88% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Chapter.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Chapter.java index 99b7e64c8e2f0173ec990913d32c5fb7c00da6e0..9b7da8eaaef07574938b23ad038366d1661b344c 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Chapter.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Chapter.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Header.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Header.java similarity index 96% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Header.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Header.java index cd99d6402470ea8337f30a1bd713e0f41b1759c2..481bb49d39a64908abe9851621b75cc78150f849 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Header.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Header.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Method.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Method.java similarity index 94% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Method.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Method.java index 31c09d71a307bcb80dae904c61f1edd38e05d336..a1e9c02413e0c577170c0df9b2e24403b1fe770a 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Method.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Method.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import lombok.extern.slf4j.Slf4j; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Node.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Node.java similarity index 93% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Node.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Node.java index 63d628cef324fdfa5c1e82a7e67a870b57780914..aeaf8ea45d468f38bfd1637b06230f545e1a1d7f 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Node.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Node.java @@ -1,10 +1,10 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; +import com.github.fengyuchenglun.apidoc.core.Context; import com.github.javaparser.ast.comments.Comment; import com.github.javaparser.javadoc.Javadoc; -import com.kim.apidoc.core.Context; -import com.kim.apidoc.core.common.helper.CommentHelper; -import com.kim.apidoc.core.common.helper.StringHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.CommentHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.StringHelper; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Project.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Project.java similarity index 95% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Project.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Project.java index ae219b6a62add410d48a7649943635bb83b8d8fd..43609d4ffef2a02b86fc52e4271e478bbf297116 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Project.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Project.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import lombok.Getter; diff --git a/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/RequestParameterType.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/RequestParameterType.java new file mode 100644 index 0000000000000000000000000000000000000000..98c3315bb009150db6a7e947529cbf5cf12739ca --- /dev/null +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/RequestParameterType.java @@ -0,0 +1,52 @@ +package com.github.fengyuchenglun.apidoc.core.schema; + +/** + * 请求参数枚举类型 + * + * @author duanledexianxianxian + * @date 2020 /3/29 0:37 + * @since 1.0.0 + */ +public enum RequestParameterType { + /** + * 查询参数. + */ + QUERY("QUERY", "查询参数"), + /** + * 路径参数. + */ + PATH("PATH", "路径参数"), + /** + * 请求参数体. + */ + BODY("BODY", "请求体"); + /** + * 编码 + */ + private String code; + /** + * 信息 + */ + private String msg; + + RequestParameterType(String code, String msg) { + this.code = code; + this.msg = msg; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } +} diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Row.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Row.java similarity index 93% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Row.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Row.java index 9d3a51b30779eac3b17dfedc7fd4e7c391d0e4ac..13adc2446f58bc0223edbb4c47eb66afd9d1d490 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Row.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Row.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import lombok.*; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Section.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Section.java similarity index 94% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Section.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Section.java index dcbd1e5134f6e85c303432c92b6c7825e8f5b0da..6d6937490d93e286cbbda28faaf48a4cfa3260cd 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Section.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Section.java @@ -1,8 +1,8 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; -import com.kim.apidoc.core.common.ObjectMappers; -import com.kim.apidoc.core.common.QueryStringBuilder; -import com.kim.apidoc.core.common.helper.StringHelper; +import com.github.fengyuchenglun.apidoc.core.common.ObjectMappers; +import com.github.fengyuchenglun.apidoc.core.common.QueryStringBuilder; +import com.github.fengyuchenglun.apidoc.core.common.helper.StringHelper; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import lombok.Getter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Tag.java b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Tag.java similarity index 93% rename from apidoc-core/src/main/java/com/kim/apidoc/core/schema/Tag.java rename to apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Tag.java index 899ed6247901b02313239669503977b703a2698f..51223322f163a8eff4fc71b3c9b0217ad1128098 100644 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/Tag.java +++ b/apidoc-core/src/main/java/com/github/fengyuchenglun/apidoc/core/schema/Tag.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.core.schema; +package com.github.fengyuchenglun.apidoc.core.schema; import lombok.Getter; import lombok.Setter; diff --git a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/RequestParameterType.java b/apidoc-core/src/main/java/com/kim/apidoc/core/schema/RequestParameterType.java deleted file mode 100644 index dc17e8a10859ed9bff5ce170e92855bdbb57ce56..0000000000000000000000000000000000000000 --- a/apidoc-core/src/main/java/com/kim/apidoc/core/schema/RequestParameterType.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.kim.apidoc.core.schema; - -/** - * 请求参数枚举类型 - * - * @author duanledexianxianxian - * @date 2020 /3/29 0:37 - * @since 1.0.0 - */ -public enum RequestParameterType { - /** - * 查询参数. - */ - QUERY, - /** - * 路径参数. - */ - PATH, - /** - * 请求参数体. - */ - BODY -} diff --git a/apidoc-core/src/main/resources/templates/markdown.ftl b/apidoc-core/src/main/resources/templates/markdown.ftl index 814d6dd2cbd8a53edab904069881280b711debd7..bfe474cc4fd8b46dc772b42b02bf005302d0fdb1 100644 --- a/apidoc-core/src/main/resources/templates/markdown.ftl +++ b/apidoc-core/src/main/resources/templates/markdown.ftl @@ -1,8 +1,6 @@ [TOC] - - <#-- ---------- BEGIN 循环遍历book ----------> <#if books??> <#list books as bookKey,bookValue> diff --git a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/ParameterHelper.java b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/ParameterHelper.java similarity index 97% rename from apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/ParameterHelper.java rename to apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/ParameterHelper.java index 43901de731715a00e5167adb1fe4d85a6f5e038c..dc997968b1f55ff3104d3fad528e5c1015768f3e 100644 --- a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/ParameterHelper.java +++ b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/ParameterHelper.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.springmvc; +package com.github.fengyuchenglun.apidoc.springmvc; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.Parameter; diff --git a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/RequestMappingHelper.java b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/RequestMappingHelper.java similarity index 95% rename from apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/RequestMappingHelper.java rename to apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/RequestMappingHelper.java index e1624c3f3b7b21f60385522f5172e17db99a595a..cb204ecd00c00f38ba4ae4c6c3aa118b045a1543 100644 --- a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/RequestMappingHelper.java +++ b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/RequestMappingHelper.java @@ -1,10 +1,10 @@ -package com.kim.apidoc.springmvc; +package com.github.fengyuchenglun.apidoc.springmvc; -import com.kim.apidoc.core.common.URI; -import com.kim.apidoc.core.common.helper.AnnotationHelper; -import com.kim.apidoc.core.common.helper.ClassDeclarationHelper; -import com.kim.apidoc.core.common.helper.ExpressionHelper; -import com.kim.apidoc.core.schema.Method; +import com.github.fengyuchenglun.apidoc.core.common.URI; +import com.github.fengyuchenglun.apidoc.core.common.helper.AnnotationHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.ClassDeclarationHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.ExpressionHelper; +import com.github.fengyuchenglun.apidoc.core.schema.Method; import com.github.javaparser.ast.Node; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; diff --git a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/SpringMVCContext.java b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/SpringMVCContext.java similarity index 94% rename from apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/SpringMVCContext.java rename to apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/SpringMVCContext.java index 53b65a9de081a34f2b38ca9aec499fe483f03a93..3dc79652836c64c91738e42a5c20cb0bfb276869 100644 --- a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/SpringMVCContext.java +++ b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/SpringMVCContext.java @@ -1,6 +1,6 @@ -package com.kim.apidoc.springmvc; +package com.github.fengyuchenglun.apidoc.springmvc; -import com.kim.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; import com.google.common.collect.Lists; import lombok.Data; diff --git a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/SpringParser.java b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/SpringParser.java similarity index 90% rename from apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/SpringParser.java rename to apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/SpringParser.java index e80c81ad5d44b1c4943e4a31ca064c33cf4361fa..6a634900e3b4e2c546075ae010219ef1e06c7081 100644 --- a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/SpringParser.java +++ b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/SpringParser.java @@ -1,27 +1,30 @@ -package com.kim.apidoc.springmvc; +package com.github.fengyuchenglun.apidoc.springmvc; +import com.github.fengyuchenglun.apidoc.core.common.helper.AnnotationHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.ClassDeclarationHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.ExpressionHelper; +import com.github.fengyuchenglun.apidoc.core.common.helper.StringHelper; import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; import com.github.javaparser.ast.body.MethodDeclaration; import com.github.javaparser.ast.body.Parameter; import com.github.javaparser.ast.expr.AnnotationExpr; import com.github.javaparser.ast.expr.Expression; import com.github.javaparser.ast.type.ClassOrInterfaceType; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.URI; -import com.kim.apidoc.core.common.description.ObjectTypeDescription; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.helper.*; -import com.kim.apidoc.core.parser.ParserStrategy; -import com.kim.apidoc.core.schema.Chapter; -import com.kim.apidoc.core.schema.Header; -import com.kim.apidoc.core.schema.Row; -import com.kim.apidoc.core.schema.Section; -import com.kim.apidoc.springmvc.resovler.SpringComponentTypeResolver; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.URI; +import com.github.fengyuchenglun.apidoc.core.common.description.ObjectTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.parser.ParserStrategy; +import com.github.fengyuchenglun.apidoc.core.schema.Chapter; +import com.github.fengyuchenglun.apidoc.core.schema.Header; +import com.github.fengyuchenglun.apidoc.core.schema.Row; +import com.github.fengyuchenglun.apidoc.core.schema.Section; +import com.github.fengyuchenglun.apidoc.springmvc.resovler.SpringComponentTypeResolver; import java.util.List; import java.util.Optional; -import static com.kim.apidoc.core.schema.RequestParameterType.*; +import static com.github.fengyuchenglun.apidoc.core.schema.RequestParameterType.*; /** @@ -157,7 +160,7 @@ public class SpringParser implements ParserStrategy { if (ParameterHelper.isPathVariable(parameter)) { section.getPathVariable().put(parameter.getNameAsString(), ""); Row row = new Row(); - row.setRequestParameterType(PATH.name()); + row.setRequestParameterType(PATH.getMsg()); row.setKey(parameter.getNameAsString()); row.setType(parameter.getType().toString()); // 路径参数必填 @@ -236,7 +239,7 @@ public class SpringParser implements ParserStrategy { } else if (description.isObject()) { section.setParameter(description.asObject().getValue()); } - section.addRequestRows(description.rows(BODY.name())); + section.addRequestRows(description.rows(BODY.getMsg())); } break; } @@ -295,11 +298,11 @@ public class SpringParser implements ParserStrategy { } } section.setParameter(objectTypeDescription.getValue()); - section.addRequestRows(objectTypeDescription.rows(QUERY.name())); + section.addRequestRows(objectTypeDescription.rows(QUERY.getMsg())); } /** - * 解析方法返回参 数 + * 解析方法返回参数 * * @param n the n * @param chapter the chapter diff --git a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/resovler/SpringComponentTypeResolver.java b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/resovler/SpringComponentTypeResolver.java similarity index 76% rename from apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/resovler/SpringComponentTypeResolver.java rename to apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/resovler/SpringComponentTypeResolver.java index 62780943ca1dec72f5e89d4e0ac6458c84f1573f..1ccde1684dc2c81dd31f054e2e62a8539d83dbb8 100644 --- a/apidoc-springmvc/src/main/java/com/kim/apidoc/springmvc/resovler/SpringComponentTypeResolver.java +++ b/apidoc-springmvc/src/main/java/com/github/fengyuchenglun/apidoc/springmvc/resovler/SpringComponentTypeResolver.java @@ -1,11 +1,11 @@ -package com.kim.apidoc.springmvc.resovler; - -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.common.description.TypeDescription; -import com.kim.apidoc.core.common.description.UnAvailableTypeDescription; -import com.kim.apidoc.core.common.helper.TypeParameterHelper; -import com.kim.apidoc.core.resolver.TypeNameResolver; -import com.kim.apidoc.core.resolver.TypeResolver; +package com.github.fengyuchenglun.apidoc.springmvc.resovler; + +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.common.description.TypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.description.UnAvailableTypeDescription; +import com.github.fengyuchenglun.apidoc.core.common.helper.TypeParameterHelper; +import com.github.fengyuchenglun.apidoc.core.resolver.TypeNameResolver; +import com.github.fengyuchenglun.apidoc.core.resolver.TypeResolver; import com.github.javaparser.ast.NodeList; import com.github.javaparser.ast.type.Type; import com.github.javaparser.resolution.types.ResolvedType; diff --git a/apidoc-springmvc/src/main/resources/META-INF/services/com.github.fengyuchenglun.apidoc.core.parser.ParserStrategy b/apidoc-springmvc/src/main/resources/META-INF/services/com.github.fengyuchenglun.apidoc.core.parser.ParserStrategy new file mode 100644 index 0000000000000000000000000000000000000000..636dab1c8d4faff0c69b65c2f8b16bdbf7450849 --- /dev/null +++ b/apidoc-springmvc/src/main/resources/META-INF/services/com.github.fengyuchenglun.apidoc.core.parser.ParserStrategy @@ -0,0 +1 @@ +com.github.fengyuchenglun.apidoc.springmvc.SpringParser \ No newline at end of file diff --git a/apidoc-springmvc/src/main/resources/META-INF/services/com.kim.apidoc.core.parser.ParserStrategy b/apidoc-springmvc/src/main/resources/META-INF/services/com.kim.apidoc.core.parser.ParserStrategy deleted file mode 100644 index 18677454c50ec7a16e8b924404f73f4572f4a7ce..0000000000000000000000000000000000000000 --- a/apidoc-springmvc/src/main/resources/META-INF/services/com.kim.apidoc.core.parser.ParserStrategy +++ /dev/null @@ -1 +0,0 @@ -com.kim.apidoc.springmvc.SpringParser \ No newline at end of file diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/springmvc/SpringTest.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/apidoc/springmvc/SpringTest.java similarity index 88% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/springmvc/SpringTest.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/apidoc/springmvc/SpringTest.java index 23b6e0d983d6a4de9e38c0b0e3ec12366c68f807..8b719c88f5c56f8013522d23cb5af27f8c1f44de 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/springmvc/SpringTest.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/apidoc/springmvc/SpringTest.java @@ -1,8 +1,8 @@ -package com.kim.apidoc.springmvc; +package com.github.fengyuchenglun.apidoc.springmvc; -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.Context; -import com.kim.apidoc.core.common.diff.FileMatcher; +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.Context; +import com.github.fengyuchenglun.apidoc.core.common.diff.FileMatcher; import org.junit.Test; import java.io.IOException; @@ -17,7 +17,7 @@ public class SpringTest { Context context = new Context(); context.setId("test"); context.setName("测试项目"); - context.addSource(Paths.get("K:\\@project-dianli@\\tool\\apidoc\\apidoc-springmvc\\src\\test\\java")); + context.addSource(Paths.get("F:\\@project@\\@dianli@\\tool\\apidoc\\apidoc-springmvc\\src\\test\\java")); // context.setCss("https://darshandsoni.com/asciidoctor-skins/css/monospace.css"); ApiDoc apigcc = new ApiDoc(context); diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/ApigccTest.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/ApigccTest.java similarity index 83% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/ApigccTest.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/ApigccTest.java index f9046ea1193519308284904f351ecc97b422e795..2354b96f47909f2d985ee6a3db6e3bccc3ffe1e8 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/ApigccTest.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/ApigccTest.java @@ -1,33 +1,33 @@ -package com.kim.apidoc.example; - - -import com.kim.apidoc.core.ApiDoc; -import com.kim.apidoc.core.Context; -import org.junit.Test; - -import java.nio.file.Paths; - -/** - * @title Apigcc示例文档 - * @description 通过javadoc设置文档描述信息 - * 优先级大于通过Environment.description()设置的值 - * @readme 所有接口均使用Https调用 - * /app路径下的接口为app专用 - * /mini路径下的接口为小程序专用 - */ -public class ApigccTest { - - @Test - public void testApigcc() { - Context context = new Context(); - context.setId("test"); - context.setName("测试项目"); - context.addSource(Paths.get("D:/apigcc/apigcc-demo-spring")); - //context.setCss("https://darshandsoni.com/asciidoctor-skins/css/monospace.css"); - - ApiDoc apigcc = new ApiDoc(context); - apigcc.parse(); - apigcc.render(); - } - +package com.github.fengyuchenglun.example; + + +import com.github.fengyuchenglun.apidoc.core.ApiDoc; +import com.github.fengyuchenglun.apidoc.core.Context; +import org.junit.Test; + +import java.nio.file.Paths; + +/** + * @title Apigcc示例文档 + * @description 通过javadoc设置文档描述信息 + * 优先级大于通过Environment.description()设置的值 + * @readme 所有接口均使用Https调用 + * /app路径下的接口为app专用 + * /mini路径下的接口为小程序专用 + */ +public class ApigccTest { + + @Test + public void testApigcc() { + Context context = new Context(); + context.setId("test"); + context.setName("测试项目"); + context.addSource(Paths.get("D:/apigcc/apigcc-demo-spring")); + //context.setCss("https://darshandsoni.com/asciidoctor-skins/css/monospace.css"); + + ApiDoc apigcc = new ApiDoc(context); + apigcc.parse(); + apigcc.render(); + } + } \ No newline at end of file diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/annotation/KimController.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/annotation/KimController.java similarity index 93% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/annotation/KimController.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/annotation/KimController.java index 1b39ec982539a836b2f25f3389ac5829ab3d2f3b..42c8314adacc0c98e8f2849c0d45d31d03082094 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/annotation/KimController.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/annotation/KimController.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.example.annotation; +package com.github.fengyuchenglun.example.annotation; import org.springframework.stereotype.Controller; import java.lang.annotation.ElementType; diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/annotation/KimResponseBody.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/annotation/KimResponseBody.java similarity index 88% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/annotation/KimResponseBody.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/annotation/KimResponseBody.java index ae1dd6400e1c3ddce9d0be7ea6404966d78b90b4..9b581a5765ef0f98ea49c43f62c107322f1f98ad 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/annotation/KimResponseBody.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/annotation/KimResponseBody.java @@ -1,4 +1,4 @@ -package com.kim.apidoc.example.annotation; +package com.github.fengyuchenglun.example.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Code.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Code.java similarity index 80% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Code.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Code.java index 2e75f78fadd266f37515166198f07f98fa6a087f..b336e87c3bffd4f7e2462dd87c23da370ad04972 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Code.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Code.java @@ -1,19 +1,19 @@ -package com.kim.apidoc.example.common; - -/** - * @code - */ -public enum Code{ - - OK(0,"ok"), - ERROR(-1,"error"), - NoAuth(1,"no auth"); - - private int code; - private String text; - - Code(int code, String text) { - this.code = code; - this.text = text; - } +package com.github.fengyuchenglun.example.common; + +/** + * @code + */ +public enum Code{ + + OK(0,"ok"), + ERROR(-1,"error"), + NoAuth(1,"no auth"); + + private int code; + private String text; + + Code(int code, String text) { + this.code = code; + this.text = text; + } } \ No newline at end of file diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Menu.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Menu.java similarity index 74% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Menu.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Menu.java index 6d0a68522361970d14acf9e53f3dd8ec42e7e769..d25b4f48a2512fee763de6a864a54e0d7dd9d89e 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Menu.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Menu.java @@ -1,16 +1,16 @@ -package com.kim.apidoc.example.common; - -import lombok.Getter; -import lombok.Setter; - -import java.util.List; - -@Getter -@Setter -public class Menu { - - int id; - String name; - List menus; - -} +package com.github.fengyuchenglun.example.common; + +import lombok.Getter; +import lombok.Setter; + +import java.util.List; + +@Getter +@Setter +public class Menu { + + int id; + String name; + List menus; + +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Page.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Page.java similarity index 88% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Page.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Page.java index 5a467ee17b5848b3d7d2087b625d6785169e3073..6ce38f70ede8e1cbe63a22d9bd6f22bc10fcc40f 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Page.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Page.java @@ -1,26 +1,26 @@ -package com.kim.apidoc.example.common; - -import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.google.gson.annotations.SerializedName; -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class Page extends Query { - - /** - * 第几页 - */ - @JsonProperty - int page = 1; - /* 每页条数 */ - @JSONField(name = "limit") - int sizs = 20; - @SerializedName("totalPage") - int total = 0; - @JsonProperty("max") - int maxPage = 0; - -} +package com.github.fengyuchenglun.example.common; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.gson.annotations.SerializedName; +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class Page extends Query { + + /** + * 第几页 + */ + @JsonProperty + int page = 1; + /* 每页条数 */ + @JSONField(name = "limit") + int sizs = 20; + @SerializedName("totalPage") + int total = 0; + @JsonProperty("max") + int maxPage = 0; + +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Query.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Query.java similarity index 80% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Query.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Query.java index 81ab609bd0f8152d50ff7b407350a8101ffe808d..c71b8055b9629ac4a3d86a007be9c0e6cb0425e4 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Query.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Query.java @@ -1,20 +1,20 @@ -package com.kim.apidoc.example.common; - -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class Query { - - /** - * static will be ignore - */ - public static final String CONSTANS = ""; - - /** - * 查询关键字 - */ - String q = "123"; - -} +package com.github.fengyuchenglun.example.common; + +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class Query { + + /** + * static will be ignore + */ + public static final String CONSTANS = ""; + + /** + * 查询关键字 + */ + String q = "123"; + +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/ResultData.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/ResultData.java similarity index 90% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/ResultData.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/ResultData.java index bfeb26b10bf4c42c08a633fbcddaff1f376fe6b8..ff9d0bcd2b507c0e0abc35f8076dd5cf38af25ff 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/ResultData.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/ResultData.java @@ -1,57 +1,57 @@ -package com.kim.apidoc.example.common; - -import lombok.Getter; -import lombok.Setter; - -/** - * The type Result data. - * - * @param the type parameter - * @author fengyuchenglun - * @version 1.0.0 - * @resultData - */ -@Setter -@Getter -public class ResultData { - - /** - * 返回码 - */ - int code; - /** - * The Msg. - */ -//返回信息 - String msg; - /** - * The Data. - */ - T data; - - /** - * Ok result data. - * - * @param the type parameter - * @return the result data - */ - public static ResultData ok(){ - return ok(null); - } - - /** - * Ok result data. - * - * @param the type parameter - * @param data the data - * @return the result data - */ - public static ResultData ok(T data){ - ResultData resultData = new ResultData<>(); - resultData.code = 0; - resultData.msg = "ok"; - resultData.data = data; - return resultData; - } - -} +package com.github.fengyuchenglun.example.common; + +import lombok.Getter; +import lombok.Setter; + +/** + * The type Result data. + * + * @param the type parameter + * @author fengyuchenglun + * @version 1.0.0 + * @resultData + */ +@Setter +@Getter +public class ResultData { + + /** + * 返回码 + */ + int code; + /** + * The Msg. + */ +//返回信息 + String msg; + /** + * The Data. + */ + T data; + + /** + * Ok result data. + * + * @param the type parameter + * @return the result data + */ + public static ResultData ok(){ + return ok(null); + } + + /** + * Ok result data. + * + * @param the type parameter + * @param data the data + * @return the result data + */ + public static ResultData ok(T data){ + ResultData resultData = new ResultData<>(); + resultData.code = 0; + resultData.msg = "ok"; + resultData.data = data; + return resultData; + } + +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Role.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Role.java similarity index 84% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Role.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Role.java index 22b450ed7abac2b3191d8987e1a1c2da2044aa2a..6832940834c433e7128785b0cf69b02572987108 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Role.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Role.java @@ -1,36 +1,36 @@ -package com.kim.apidoc.example.common; - -/** - * 用户角色 - * - * @code - */ -public enum Role { - - /** - * Admin role. - */ - ADMIN("管理员"), - /** - * User role. - */ - USER("用户"), - /** - * Vip role. - */ - VIP("会员"); - - /** - * The Text. - */ - String text; - - /** - * Instantiates a new Role. - * - * @param text the text - */ - Role(String text) { - this.text = text; - } -} +package com.github.fengyuchenglun.example.common; + +/** + * 用户角色 + * + * @code + */ +public enum Role { + + /** + * Admin role. + */ + ADMIN("管理员"), + /** + * User role. + */ + USER("用户"), + /** + * Vip role. + */ + VIP("会员"); + + /** + * The Text. + */ + String text; + + /** + * Instantiates a new Role. + * + * @param text the text + */ + Role(String text) { + this.text = text; + } +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/StaticFinalCode.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/StaticFinalCode.java similarity index 77% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/StaticFinalCode.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/StaticFinalCode.java index 38c34d4ba684ca57c20ac34dcc9147d6c081a1d9..b6849c709cc63a91c06ce98472a9b1c8ab6def58 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/StaticFinalCode.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/StaticFinalCode.java @@ -1,17 +1,17 @@ -package com.kim.apidoc.example.common; - -/** - * @code - */ -public class StaticFinalCode { - - /** - * 成功 - */ - public static final int SUCCESS = 1; - /** - * 失败 - */ - public static final int ERROR = -1; - -} +package com.github.fengyuchenglun.example.common; + +/** + * @code + */ +public class StaticFinalCode { + + /** + * 成功 + */ + public static final int SUCCESS = 1; + /** + * 失败 + */ + public static final int ERROR = -1; + +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/User.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/User.java similarity index 89% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/User.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/User.java index 9724a8f4f4903982853cd260b60922bea6c29059..7565d08be99e7293509cad09dbc2a001c87177b3 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/User.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/User.java @@ -1,48 +1,48 @@ -package com.kim.apidoc.example.common; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.Date; - -/** - * 用户对象 - * - * @author fengyuchenglun - * @version 1.0.0 - */ -@Setter -@Getter -public class User { - - /** - * 用户编号. - */ - int id; - /** - * 用户名称. - */ - @NotBlank - String name; - /** - * 用户年龄. - */ - @Min(1) - @NotNull - Integer age; - /** - * 创建时间. - */ - Date createAt; - /** - * 性别. - */ - @NotBlank - @JsonProperty("Sex") - String sex; - -} +package com.github.fengyuchenglun.example.common; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +/** + * 用户对象 + * + * @author fengyuchenglun + * @version 1.0.0 + */ +@Setter +@Getter +public class User { + + /** + * 用户编号. + */ + int id; + /** + * 用户名称. + */ + @NotBlank + String name; + /** + * 用户年龄. + */ + @Min(1) + @NotNull + Integer age; + /** + * 创建时间. + */ + Date createAt; + /** + * 性别. + */ + @NotBlank + @JsonProperty("Sex") + String sex; + +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserDTO.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserDTO.java similarity index 89% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserDTO.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserDTO.java index cf56289851367c899e7013fdea6bb41374fa1ac6..3e7c24a76c4884c9e9fef2a723cb2d22a6949317 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserDTO.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserDTO.java @@ -1,49 +1,49 @@ -package com.kim.apidoc.example.common; - -import lombok.Getter; -import lombok.Setter; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import java.util.Date; -import java.util.List; -import java.util.Map; - -@Setter -@Getter -public class UserDTO { - - /** - * 编号 - */ - Integer id; - /*姓名*/ - @Size(min = 5, max = 20) - @NotEmpty - String name; - //年龄 - @Min(1) - int age; - /** - * 生日，还是推荐使用javadoc - */ - @NotNull - Date birthday; - /** - * 用户标签 - */ - @Size(min = 1, max = 2) - List tags; - - List data; - /** - * 用户图标 - */ - String[] icons; - - Map attrs; - - -} +package com.github.fengyuchenglun.example.common; + +import lombok.Getter; +import lombok.Setter; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@Setter +@Getter +public class UserDTO { + + /** + * 编号 + */ + Integer id; + /*姓名*/ + @Size(min = 5, max = 20) + @NotEmpty + String name; + //年龄 + @Min(1) + int age; + /** + * 生日，还是推荐使用javadoc + */ + @NotNull + Date birthday; + /** + * 用户标签 + */ + @Size(min = 1, max = 2) + List tags; + + List data; + /** + * 用户图标 + */ + String[] icons; + + Map attrs; + + +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserDetails.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserDetails.java similarity index 77% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserDetails.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserDetails.java index fdc15d35a7cd80eb4ba7a1c5760c86be3970ed16..4b238ea190de8d80b0c3714e1d550b6a800efa13 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserDetails.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserDetails.java @@ -1,8 +1,8 @@ -package com.kim.apidoc.example.common; - -/** - * 某些用户信息框架，如spring security的用户登录信息 - * 此处只是模拟，真实的将调用security中的类 - */ -public class UserDetails { -} +package com.github.fengyuchenglun.example.common; + +/** + * 某些用户信息框架，如spring security的用户登录信息 + * 此处只是模拟，真实的将调用security中的类 + */ +public class UserDetails { +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserQuery.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserQuery.java similarity index 75% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserQuery.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserQuery.java index 401ad9d759721b1fd151c13a6554554da08cd633..3c96d057ac43cb0836034ce34eb65c570199019a 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/UserQuery.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/UserQuery.java @@ -1,16 +1,16 @@ -package com.kim.apidoc.example.common; - -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class UserQuery extends Page { - - /** - * 名称 - * @value apigcc - */ - String name; - -} +package com.github.fengyuchenglun.example.common; + +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class UserQuery extends Page { + + /** + * 名称 + * @value apigcc + */ + String name; + +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Wrapper.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Wrapper.java similarity index 70% rename from apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Wrapper.java rename to apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Wrapper.java index f6127400bce4a1b14f23f7772e35dc0047374552..4b4d96dd05e7734e680a17a749b63aae3cc253ff 100644 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/common/Wrapper.java +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/common/Wrapper.java @@ -1,14 +1,14 @@ -package com.kim.apidoc.example.common; - -import lombok.Getter; -import lombok.Setter; - -@Setter -@Getter -public class Wrapper { - - String wrapper; - - T data; - -} +package com.github.fengyuchenglun.example.common; + +import lombok.Getter; +import lombok.Setter; + +@Setter +@Getter +public class Wrapper { + + String wrapper; + + T data; + +} diff --git a/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/spring/advanced/UserController.java b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/spring/advanced/UserController.java new file mode 100644 index 0000000000000000000000000000000000000000..ab2765b4c5bed97c234538db0be970119b9f4464 --- /dev/null +++ b/apidoc-springmvc/src/test/java/com/github/fengyuchenglun/example/spring/advanced/UserController.java @@ -0,0 +1,95 @@ +package com.github.fengyuchenglun.example.spring.advanced; + +import com.github.fengyuchenglun.example.annotation.KimController; +import com.github.fengyuchenglun.example.common.Query; +import com.github.fengyuchenglun.example.common.User; +import lombok.Data; +import org.springframework.web.bind.annotation.*; + +import java.io.Serializable; + +/** + * 用户接口. + * + * @author duanledexianxianxian + * @version 1.0.0 + * @date 2020 /3/25 1:00 + * @index 20 + * @since 1.0.0 + */ +@KimController +@RequestMapping("/api/v1/users") +public class UserController { + + + /** + * 查看用户详情 + * + * @param userId 用户编号 + * @param query 过滤条件 + * @return 用户对象 user + */ + @GetMapping(value = "/{userId}") + public User detail(@PathVariable String userId, Query query) { + User user = new User(); + return user; + } + + /** + * 查看用户详情 + * + * @param query 过滤条件 + * @return 用户对象 user + */ + @GetMapping(value = "/detail1") + public User detail1( Query query) { + User user = new User(); + return user; + } + + /** + * 查看用户详情 + * + * @param query 过滤条件 + * @return 用户对象 user + */ + @GetMapping(value = "/detail3") + public User detail3(@RequestParam Query query) { + User user = new User(); + return user; + } + + /** + * 用户表单对象. + * + * @author duanledexianxianxian + */ + @Data + public static class UserForm implements Serializable { + + private static final long serialVersionUID = 5681371348688016281L; + /** + * 用户名 + */ + private String userName; + /** + * 地址 + */ + private String address; + /** + * 年龄 + */ + private Integer age; + } + + /** + * 添加用户 + * + * @param form 用户表单对象 + * @return integer integer + */ + @PostMapping + public Integer add(@RequestBody UserForm form) { + return null; + } +} diff --git a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/spring/advanced/UserController.java b/apidoc-springmvc/src/test/java/com/kim/apidoc/example/spring/advanced/UserController.java deleted file mode 100644 index d7d4c685e5baaa467f7cbaeb0db28a793dabb022..0000000000000000000000000000000000000000 --- a/apidoc-springmvc/src/test/java/com/kim/apidoc/example/spring/advanced/UserController.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.kim.apidoc.example.spring.advanced; - -import com.kim.apidoc.example.annotation.KimController; -import com.kim.apidoc.example.common.Query; -import com.kim.apidoc.example.common.User; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -/** - * The type Kim user controller. - * - * @author duanledexianxianxian - * @version 1.0.0 - * @date 2020 /3/25 1:00 - * @index 20 - * @since 1.0.0 - */ -@KimController -@RequestMapping("/api/v1") -public class UserController { - - - /** - * 查看用户详情 - * - * @param userId 用户编号 - * @param query 过滤条件 - * @return 用户对象 user - */ - @GetMapping(value = "/{userId}") - public User detail(@PathVariable String userId, Query query) { - User user = new User(); - return user; - } - - - /** - * Add integer. - * - * @return integer integer - */ - @PostMapping - public Integer add() { - return null; - } -} diff --git a/build.gradle b/build.gradle index f3d4228adc1783de05ddfed1140970269efc84e3..4857fc6052f4334f63afdf6648f9374921f1058e 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ allprojects { apply plugin: 'maven' apply plugin: 'com.novoda.bintray-release' - group 'com.apidoc' - version '1.7.0' + group 'com.github.fengyuchenglun' + version '1.0.0' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -28,8 +28,8 @@ allprojects { ext { DESCRIPTION = 'A rest document generator with parse the source code.' - SITE_URL = 'https://github.com/apigcc/apigcc' - GIT_URL = 'https://github.com/apigcc/apigcc.git' + SITE_URL = 'http://platform.kuopu.net:9999/gitlab/duanledexianxianxian/apidoc' + GIT_URL = 'http://platform.kuopu.net:9999/gitlab/duanledexianxianxian/apidoc.git' LICENSE = 'MIT License'