wanjia950611
/
smart-doc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix controller advice

This commit is contained in:
oppofind 2019-10-12 15:56:20 +08:00
parent 6e9852da78
commit f00dafd1b0
1 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/main/java/com/power/doc/builder/SourceBuilder.java
View File

@ -16,7 +16,6 @@ import com.thoughtworks.qdox.model.expression.AnnotationValue;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import java.io.File; import java.io.File;
import java.rmi.UnexpectedException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -37,7 +36,7 @@ public class SourceBuilder {
private static final String REQUEST_BODY = "RequestBody"; private static final String REQUEST_BODY = "RequestBody";
private static final String REQUEST_HERDER="RequestHeader"; private static final String REQUEST_HERDER = "RequestHeader";
private static final String REQUEST_PARAM = "RequestParam"; private static final String REQUEST_PARAM = "RequestParam";
@ -178,7 +177,7 @@ public class SourceBuilder {
List<ApiMethodDoc> methodDocList = new ArrayList<>(methods.size()); List<ApiMethodDoc> methodDocList = new ArrayList<>(methods.size());
int methodOrder = 0; int methodOrder = 0;
for (JavaMethod method : methods) { for (JavaMethod method : methods) {
List<ApiReqHeader> apiReqHeaders = new ArrayList<>(); List<ApiReqHeader> apiReqHeaders = new ArrayList<>();
if (StringUtil.isEmpty(method.getComment()) && isStrict) { if (StringUtil.isEmpty(method.getComment()) && isStrict) {
throw new RuntimeException("Unable to find comment for method " + method.getName() + " in " + cls.getCanonicalName()); throw new RuntimeException("Unable to find comment for method " + method.getName() + " in " + cls.getCanonicalName());
} }
@ -221,27 +220,27 @@ public class SourceBuilder {
} }
} }
for(JavaParameter javaParameter : method.getParameters()){ for (JavaParameter javaParameter : method.getParameters()) {
List<JavaAnnotation> javaAnnotations = javaParameter.getAnnotations(); List<JavaAnnotation> javaAnnotations = javaParameter.getAnnotations();
for(JavaAnnotation annotation : javaAnnotations){ for (JavaAnnotation annotation : javaAnnotations) {
String annotationName = annotation.getType().getName(); String annotationName = annotation.getType().getName();
if (REQUEST_HERDER.equals(annotationName)) { if (REQUEST_HERDER.equals(annotationName)) {
ApiReqHeader apiReqHeader = new ApiReqHeader(); ApiReqHeader apiReqHeader = new ApiReqHeader();
Map<String,Object> requestHeaderMap = annotation.getNamedParameterMap(); Map<String, Object> requestHeaderMap = annotation.getNamedParameterMap();
if( requestHeaderMap.get("value")!=null){ if (requestHeaderMap.get("value") != null) {
apiReqHeader.setName((String) requestHeaderMap.get("value")); apiReqHeader.setName((String) requestHeaderMap.get("value"));
}
if( requestHeaderMap.get("defaultValue")!=null){
apiReqHeader.setDesc((String) requestHeaderMap.get("defaultValue"));
}
if( requestHeaderMap.get("required")!=null){
apiReqHeader.setRequired(!"false".equals(requestHeaderMap.get("required")));
}
apiReqHeader.setType(javaParameter.getType().getValue());
apiReqHeaders.add(apiReqHeader);
break;
} }
if (requestHeaderMap.get("defaultValue") != null) {
apiReqHeader.setDesc((String) requestHeaderMap.get("defaultValue"));
}
if (requestHeaderMap.get("required") != null) {
apiReqHeader.setRequired(!"false".equals(requestHeaderMap.get("required")));
}
apiReqHeader.setType(javaParameter.getType().getValue());
apiReqHeaders.add(apiReqHeader);
break;
} }
}
} }
apiMethodDoc.setRequestHeaders(apiReqHeaders); apiMethodDoc.setRequestHeaders(apiReqHeaders);
if (methodCounter > 0) { if (methodCounter > 0) {
@ -267,13 +266,11 @@ public class SourceBuilder {
//reduce create in template //reduce create in template
apiMethodDoc.setHeaders(createHeaders(this.headers, this.isAdoc)); apiMethodDoc.setHeaders(createHeaders(this.headers, this.isAdoc));
List<ApiReqHeader> allApiReqHeaders; List<ApiReqHeader> allApiReqHeaders;
if(this.headers!=null){ if (this.headers != null) {
allApiReqHeaders = Stream.of(this.headers,apiReqHeaders) allApiReqHeaders = Stream.of(this.headers, apiReqHeaders)
.flatMap(Collection::stream) .flatMap(Collection::stream)
.collect(Collectors.toList()); .collect(Collectors.toList());
} } else {
else
{
allApiReqHeaders = apiReqHeaders; allApiReqHeaders = apiReqHeaders;
} }
@ -503,7 +500,7 @@ public class SourceBuilder {
comment = field.getComment(); comment = field.getComment();
} }
if (StringUtil.isNotEmpty(comment)) { if (StringUtil.isNotEmpty(comment)) {
comment = comment.replace("\r\n","<br>"); comment = comment.replace("\r\n", "<br>");
comment = comment.replace("\n", "<br>"); comment = comment.replace("\n", "<br>");
} }
if (DocClassUtil.isPrimitive(subTypeName)) { if (DocClassUtil.isPrimitive(subTypeName)) {
@ -925,11 +922,11 @@ public class SourceBuilder {
return buildJson(typeName, gicTypeName, this.fieldMap, false); return buildJson(typeName, gicTypeName, this.fieldMap, false);
} }
} }
if (REQUEST_HERDER.equals(annotationName)){ if (REQUEST_HERDER.equals(annotationName)) {
paraName =null; paraName = null;
} }
} }
if (requestBodyCounter < 1 && paraName !=null) { if (requestBodyCounter < 1 && paraName != null) {
paramsMap.put(paraName, DocUtil.getValByTypeAndFieldName(simpleTypeName, paraName, paramsMap.put(paraName, DocUtil.getValByTypeAndFieldName(simpleTypeName, paraName,
true)); true));
} }
@ -1044,7 +1041,7 @@ public class SourceBuilder {
required = annotationValue.toString(); required = annotationValue.toString();
} }
String annotationName = annotation.getType().getName(); String annotationName = annotation.getType().getName();
if(REQUEST_HERDER.equals(annotationName)){ if (REQUEST_HERDER.equals(annotationName)) {
continue; continue;
} }
if (REQUEST_BODY.equals(annotationName)) { if (REQUEST_BODY.equals(annotationName)) {
@ -1138,7 +1135,7 @@ public class SourceBuilder {
List<JavaAnnotation> classAnnotations = cls.getAnnotations(); List<JavaAnnotation> classAnnotations = cls.getAnnotations();
for (JavaAnnotation annotation : classAnnotations) { for (JavaAnnotation annotation : classAnnotations) {
String annotationName = annotation.getType().getName(); String annotationName = annotation.getType().getName();
if (annotationName.contains(DocAnnotationConstants.SHORT_CONTROLLER) if (DocAnnotationConstants.SHORT_CONTROLLER.equals(annotationName)
|| DocAnnotationConstants.SHORT_REST_CONTROLLER.equals(annotationName) || DocAnnotationConstants.SHORT_REST_CONTROLLER.equals(annotationName)
|| DocGlobalConstants.REST_CONTROLLER_FULLY.equals(annotationName) || DocGlobalConstants.REST_CONTROLLER_FULLY.equals(annotationName)
|| DocGlobalConstants.CONTROLLER_FULLY.equals(annotationName) || DocGlobalConstants.CONTROLLER_FULLY.equals(annotationName)