重写equals方法

Author: zxcvbnmzsedr

apidoc-core/src/main/java/com/ztianzeng/apidoc/ModelConverters.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.thoughtworks.qdox.model.JavaClass;
-import com.thoughtworks.qdox.model.JavaType;
 import com.ztianzeng.apidoc.converter.AnnotatedType;
 import com.ztianzeng.apidoc.converter.ModelConverter;
 import com.ztianzeng.apidoc.converter.ModelConverterContextImpl;
@@ -41,9 +40,13 @@ public Map<String, Schema> read(Type type) {
         return read(new AnnotatedType().type(type));
     }
 
+    public Map<String, Schema> read(JavaClass type) {
+        return read(new AnnotatedType().javaClass(type));
+    }
+
     public Map<String, Schema> read(AnnotatedType type) {
         Map<String, Schema> modelMap = new HashMap<>();
-        if (shouldProcess(type.getType())) {
+        if (shouldProcess(type.getJavaClass())) {
             ModelConverterContextImpl context = new ModelConverterContextImpl(
                     converters);
             Schema resolve = context.resolve(type);

apidoc-core/src/main/java/com/ztianzeng/apidoc/ModelResolver.java

@@ -34,10 +34,7 @@ public class ModelResolver implements ModelConverter {
     private JavaProjectBuilder builder;
 
 
-//    protected ObjectMapper mapper;
-
     public ModelResolver(ObjectMapper mapper, SourceBuilder sourceBuilder) {
-//        this.mapper = mapper;
         this.sourceBuilder = sourceBuilder;
         builder = sourceBuilder.getBuilder();
     }

apidoc-core/src/main/java/com/ztianzeng/apidoc/converter/AnnotatedType.java

@@ -230,6 +230,10 @@ public boolean equals(Object o) {
         if (type != null && that.type != null && !type.equals(that.type)) {
             return false;
         }
+
+        if (javaClass != null && that.javaClass != null && !javaClass.equals(that.javaClass)) {
+            return false;
+        }
         return Arrays.equals(this.ctxAnnotations, that.ctxAnnotations);
     }
 

apidoc-core/src/test/java/com/ztianzeng/apidoc/test/ModelConverterTest.java

@@ -29,10 +29,12 @@ public void readModel() throws IOException {
 
     @Test
     public void convertModel() throws IOException {
-        assertEqualsToJson(read(Person.class), "Person.json");
+        JavaClass classByName = TestBase.builder.getClassByName(Person.class.getName());
+
+        assertEqualsToJson(read(classByName), "Person.json");
     }
 
-    private Map<String, Schema> read(Type type) {
+    private Map<String, Schema> read(JavaClass type) {
         return ModelConverters.getInstance().read(type);
     }