refactoring: added DeclarationModel base class

vojtechhabarta · vojtechhabarta · commit 10a64d923610 · 2016-06-01T22:55:56.000+02:00
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/compiler/ModelCompiler.java
@@ -71,7 +71,7 @@ private TsModel processModel(SymbolTable symbolTable, Model model) {
     }
 
     private TsBeanModel processBean(SymbolTable symbolTable, BeanModel bean) {
-        final TsType beanType = typeFromJava(symbolTable, bean.getBeanClass());
+        final TsType beanType = typeFromJava(symbolTable, bean.getOrigin());
         TsType parentType = typeFromJava(symbolTable, bean.getParent());
         if (parentType != null && parentType.equals(TsType.Any)) {
             parentType = null;
@@ -87,18 +87,18 @@ private TsBeanModel processBean(SymbolTable symbolTable, BeanModel bean) {
         for (PropertyModel property : bean.getProperties()) {
             properties.add(processProperty(symbolTable, bean, property));
         }
-        return new TsBeanModel(bean.getBeanClass(), beanType, parentType, interfaces, properties, bean.getComments());
+        return new TsBeanModel(bean.getOrigin(), beanType, parentType, interfaces, properties, bean.getComments());
     }
 
     private TsPropertyModel processProperty(SymbolTable symbolTable, BeanModel bean, PropertyModel property) {
-        final TsType type = typeFromJava(symbolTable, property.getType(), property.getName(), bean.getBeanClass());
+        final TsType type = typeFromJava(symbolTable, property.getType(), property.getName(), bean.getOrigin());
         final TsType tsType = property.isOptional() ? type.optional() : type;
         return new TsPropertyModel(property.getName(), tsType, property.getComments());
     }
 
     private TsEnumModel processEnum(SymbolTable symbolTable, EnumModel enumModel) {
-        final TsType enumType = typeFromJava(symbolTable, enumModel.getEnumClass());
-        return new TsEnumModel(enumModel.getEnumClass(), enumType, enumModel.getComments(), new ArrayList<>(enumModel.getValues()));
+        final TsType enumType = typeFromJava(symbolTable, enumModel.getOrigin());
+        return new TsEnumModel(enumModel.getOrigin(), enumType, enumModel.getComments(), new ArrayList<>(enumModel.getValues()));
     }
 
     private TsType typeFromJava(SymbolTable symbolTable, Type javaType) {
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/BeanModel.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/BeanModel.java
@@ -5,28 +5,21 @@
 import java.util.List;
 
 
-public class BeanModel {
+public class BeanModel extends DeclarationModel {
 
-    private final Class<?> beanClass;
     private final Type parent;
     private final List<Type> interfaces;
     private final List<PropertyModel> properties;
-    private final List<String> comments;
 
-    public BeanModel(Class<?> beanClass, Type parent, List<Type> interfaces, List<PropertyModel> properties) {
-        this(beanClass, parent, interfaces, properties, null);
+    public BeanModel(Class<?> origin, Type parent, List<Type> interfaces, List<PropertyModel> properties) {
+        this(origin, parent, interfaces, properties, null);
     }
 
-    public BeanModel(Class<?> beanClass, Type parent, List<Type> interfaces, List<PropertyModel> properties, List<String> comments) {
-        this.beanClass = beanClass;
+    public BeanModel(Class<?> origin, Type parent, List<Type> interfaces, List<PropertyModel> properties, List<String> comments) {
+        super (origin, comments);
         this.parent = parent;
         this.interfaces = interfaces;
         this.properties = properties;
-        this.comments = comments;
-    }
-
-    public Class<?> getBeanClass() {
-        return beanClass;
     }
 
     public Type getParent() {
@@ -41,13 +34,9 @@ public List<PropertyModel> getProperties() {
         return properties;
     }
 
-    public List<String> getComments() {
-        return comments;
-    }
-
     @Override
     public String toString() {
-        return "BeanModel{" + "beanClass=" + beanClass + ", properties=" + properties + '}';
+        return "BeanModel{" + "origin=" + getOrigin() + ", properties=" + properties + '}';
     }
 
 }
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/DeclarationModel.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/DeclarationModel.java
@@ -0,0 +1,25 @@
+
+package cz.habarta.typescript.generator.parser;
+
+import java.util.List;
+
+
+public class DeclarationModel {
+
+    private final Class<?> origin;
+    private final List<String> comments;
+
+    public DeclarationModel(Class<?> origin, List<String> comments) {
+        this.origin = origin;
+        this.comments = comments;
+    }
+
+    public Class<?> getOrigin() {
+        return origin;
+    }
+
+    public List<String> getComments() {
+        return comments;
+    }
+
+}
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/EnumModel.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/EnumModel.java
@@ -4,28 +4,17 @@
 import java.util.*;
 
 
-public class EnumModel {
+public class EnumModel extends DeclarationModel {
     
-    private final Class<?> enumClass;
     private final List<String> values;
-    private final List<String> comments;
 
-    public EnumModel(Class<?> enumClass, List<String> values, List<String> comments) {
-        this.enumClass = enumClass;
+    public EnumModel(Class<?> origin, List<String> values, List<String> comments) {
+        super (origin, comments);
         this.values = values;
-        this.comments = comments;
-    }
-
-    public Class<?> getEnumClass() {
-        return enumClass;
     }
 
     public List<String> getValues() {
         return values;
     }
 
-    public List<String> getComments() {
-        return comments;
-    }
-
 }
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Javadoc.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Javadoc.java
@@ -51,13 +51,13 @@ public Model enrichModel(Model model) {
     }
 
     private BeanModel enrichBean(BeanModel bean) {
-        if (bean.getBeanClass().isInterface()) {
-            final Interface dInterface = findJavadocInterface(bean.getBeanClass(), dRoots);
+        if (bean.getOrigin().isInterface()) {
+            final Interface dInterface = findJavadocInterface(bean.getOrigin(), dRoots);
             if (dInterface != null) {
                 return enrichBean(bean, dInterface.getComment(), dInterface.getTag(), dInterface.getField(), dInterface.getMethod());
             }
         } else {
-            final Class dClass = findJavadocClass(bean.getBeanClass(), dRoots);
+            final Class dClass = findJavadocClass(bean.getOrigin(), dRoots);
             if (dClass != null) {
                 return enrichBean(bean, dClass.getComment(), dClass.getTag(), dClass.getField(), dClass.getMethod());
             }
@@ -71,7 +71,7 @@ private BeanModel enrichBean(BeanModel bean, String beanComment, List<TagInfo> t
             final PropertyModel enrichedProperty = enrichProperty(property, dFields, dMethods);
             enrichedProperties.add(enrichedProperty);
         }
-        return new BeanModel(bean.getBeanClass(), bean.getParent(), bean.getInterfaces(), enrichedProperties, concat(getComments(beanComment, tags), bean.getComments()));
+        return new BeanModel(bean.getOrigin(), bean.getParent(), bean.getInterfaces(), enrichedProperties, concat(getComments(beanComment, tags), bean.getComments()));
     }
 
     private PropertyModel enrichProperty(PropertyModel property, List<Field> dFields, List<Method> dMethods) {
@@ -94,10 +94,10 @@ private PropertyModel enrichProperty(PropertyModel property, List<Field> dFields
     }
 
     private EnumModel enrichEnum(EnumModel enumModel) {
-        final Enum dEnum = findJavadocEnum(enumModel.getEnumClass(), dRoots);
+        final Enum dEnum = findJavadocEnum(enumModel.getOrigin(), dRoots);
         final String enumComment = dEnum != null ? dEnum.getComment() : null;
         final List<TagInfo> tags = dEnum != null ? dEnum.getTag() : null;
-        return new EnumModel(enumModel.getEnumClass(), enumModel.getValues(), concat(getComments(enumComment, tags), enumModel.getComments()));
+        return new EnumModel(enumModel.getOrigin(), enumModel.getValues(), concat(getComments(enumComment, tags), enumModel.getComments()));
     }
 
     // finders
diff --git a/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/Jackson1ParserTest.java b/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/Jackson1ParserTest.java
@@ -16,7 +16,7 @@ public void test() {
         Assert.assertTrue(model.getBeans().size() > 0);
         final BeanModel beanModel = model.getBeans().get(0);
         System.out.println("beanModel: " + beanModel);
-        Assert.assertEquals("DummyBean", beanModel.getBeanClass().getSimpleName());
+        Assert.assertEquals("DummyBean", beanModel.getOrigin().getSimpleName());
         Assert.assertTrue(beanModel.getProperties().size() > 0);
         Assert.assertEquals("firstProperty", beanModel.getProperties().get(0).getName());
     }
diff --git a/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/Jackson2ParserTest.java b/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/Jackson2ParserTest.java
@@ -16,7 +16,7 @@ public void test() {
         final Model model = jacksonParser.parseModel(bean);
         Assert.assertTrue(model.getBeans().size() > 0);
         final BeanModel beanModel = model.getBeans().get(0);
-        Assert.assertEquals("DummyBean", beanModel.getBeanClass().getSimpleName());
+        Assert.assertEquals("DummyBean", beanModel.getOrigin().getSimpleName());
         Assert.assertTrue(beanModel.getProperties().size() > 0);
         Assert.assertEquals("firstProperty", beanModel.getProperties().get(0).getName());
     }
@@ -27,7 +27,7 @@ public void testChangedNameProperty() {
         final Model model = jacksonParser.parseModel(DummyBeanJackson2.class);
         Assert.assertTrue(model.getBeans().size() > 0);
         final BeanModel beanModel = model.getBeans().get(0);
-        Assert.assertEquals("DummyBeanJackson2", beanModel.getBeanClass().getSimpleName());
+        Assert.assertEquals("DummyBeanJackson2", beanModel.getOrigin().getSimpleName());
         Assert.assertTrue(beanModel.getProperties().size() > 0);
         Assert.assertEquals("changedNameProperty", beanModel.getProperties().get(0).getName());
     }
diff --git a/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/JaxrsApplicationScannerTest.java b/typescript-generator-core/src/test/java/cz/habarta/typescript/generator/JaxrsApplicationScannerTest.java
@@ -52,7 +52,7 @@ private void testWithParsing(String applicationClass) {
         final Model model = new TypeScriptGenerator(TestUtils.settings()).getModelParser().parseModel(types);
         final ArrayList<Class<?>> classes = new ArrayList<>();
         for (BeanModel beanModel : model.getBeans()) {
-            classes.add(beanModel.getBeanClass());
+            classes.add(beanModel.getOrigin());
         }
         final List<Class<?>> expectedClasses = Arrays.asList(
                 A.class,

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private TsModel processModel(SymbolTable symbolTable, Model model) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`private TsBeanModel processBean(SymbolTable symbolTable, BeanModel bean) {`
`74`		`- final TsType beanType = typeFromJava(symbolTable, bean.getBeanClass());`
	`74`	`+ final TsType beanType = typeFromJava(symbolTable, bean.getOrigin());`
`75`	`75`	`TsType parentType = typeFromJava(symbolTable, bean.getParent());`
`76`	`76`	`if (parentType != null && parentType.equals(TsType.Any)) {`
`77`	`77`	`parentType = null;`
`@@ -87,18 +87,18 @@ private TsBeanModel processBean(SymbolTable symbolTable, BeanModel bean) {`
`87`	`87`	`for (PropertyModel property : bean.getProperties()) {`
`88`	`88`	`properties.add(processProperty(symbolTable, bean, property));`
`89`	`89`	`}`
`90`		`- return new TsBeanModel(bean.getBeanClass(), beanType, parentType, interfaces, properties, bean.getComments());`
	`90`	`+ return new TsBeanModel(bean.getOrigin(), beanType, parentType, interfaces, properties, bean.getComments());`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`private TsPropertyModel processProperty(SymbolTable symbolTable, BeanModel bean, PropertyModel property) {`
`94`		`- final TsType type = typeFromJava(symbolTable, property.getType(), property.getName(), bean.getBeanClass());`
	`94`	`+ final TsType type = typeFromJava(symbolTable, property.getType(), property.getName(), bean.getOrigin());`
`95`	`95`	`final TsType tsType = property.isOptional() ? type.optional() : type;`
`96`	`96`	`return new TsPropertyModel(property.getName(), tsType, property.getComments());`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`private TsEnumModel processEnum(SymbolTable symbolTable, EnumModel enumModel) {`
`100`		`- final TsType enumType = typeFromJava(symbolTable, enumModel.getEnumClass());`
`101`		`- return new TsEnumModel(enumModel.getEnumClass(), enumType, enumModel.getComments(), new ArrayList<>(enumModel.getValues()));`
	`100`	`+ final TsType enumType = typeFromJava(symbolTable, enumModel.getOrigin());`
	`101`	`+ return new TsEnumModel(enumModel.getOrigin(), enumType, enumModel.getComments(), new ArrayList<>(enumModel.getValues()));`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`private TsType typeFromJava(SymbolTable symbolTable, Type javaType) {`
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,13 @@ public Model enrichModel(Model model) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`private BeanModel enrichBean(BeanModel bean) {`
`54`		`- if (bean.getBeanClass().isInterface()) {`
`55`		`- final Interface dInterface = findJavadocInterface(bean.getBeanClass(), dRoots);`
	`54`	`+ if (bean.getOrigin().isInterface()) {`
	`55`	`+ final Interface dInterface = findJavadocInterface(bean.getOrigin(), dRoots);`
`56`	`56`	`if (dInterface != null) {`
`57`	`57`	`return enrichBean(bean, dInterface.getComment(), dInterface.getTag(), dInterface.getField(), dInterface.getMethod());`
`58`	`58`	`}`
`59`	`59`	`} else {`
`60`		`- final Class dClass = findJavadocClass(bean.getBeanClass(), dRoots);`
	`60`	`+ final Class dClass = findJavadocClass(bean.getOrigin(), dRoots);`
`61`	`61`	`if (dClass != null) {`
`62`	`62`	`return enrichBean(bean, dClass.getComment(), dClass.getTag(), dClass.getField(), dClass.getMethod());`
`63`	`63`	`}`
`@@ -71,7 +71,7 @@ private BeanModel enrichBean(BeanModel bean, String beanComment, List<TagInfo> t`
`71`	`71`	`final PropertyModel enrichedProperty = enrichProperty(property, dFields, dMethods);`
`72`	`72`	`enrichedProperties.add(enrichedProperty);`
`73`	`73`	`}`
`74`		`- return new BeanModel(bean.getBeanClass(), bean.getParent(), bean.getInterfaces(), enrichedProperties, concat(getComments(beanComment, tags), bean.getComments()));`
	`74`	`+ return new BeanModel(bean.getOrigin(), bean.getParent(), bean.getInterfaces(), enrichedProperties, concat(getComments(beanComment, tags), bean.getComments()));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`private PropertyModel enrichProperty(PropertyModel property, List<Field> dFields, List<Method> dMethods) {`
`@@ -94,10 +94,10 @@ private PropertyModel enrichProperty(PropertyModel property, List<Field> dFields`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`private EnumModel enrichEnum(EnumModel enumModel) {`
`97`		`- final Enum dEnum = findJavadocEnum(enumModel.getEnumClass(), dRoots);`
	`97`	`+ final Enum dEnum = findJavadocEnum(enumModel.getOrigin(), dRoots);`
`98`	`98`	`final String enumComment = dEnum != null ? dEnum.getComment() : null;`
`99`	`99`	`final List<TagInfo> tags = dEnum != null ? dEnum.getTag() : null;`
`100`		`- return new EnumModel(enumModel.getEnumClass(), enumModel.getValues(), concat(getComments(enumComment, tags), enumModel.getComments()));`
	`100`	`+ return new EnumModel(enumModel.getOrigin(), enumModel.getValues(), concat(getComments(enumComment, tags), enumModel.getComments()));`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// finders`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public void test() {`
`16`	`16`	`Assert.assertTrue(model.getBeans().size() > 0);`
`17`	`17`	`final BeanModel beanModel = model.getBeans().get(0);`
`18`	`18`	`System.out.println("beanModel: " + beanModel);`
`19`		`- Assert.assertEquals("DummyBean", beanModel.getBeanClass().getSimpleName());`
	`19`	`+ Assert.assertEquals("DummyBean", beanModel.getOrigin().getSimpleName());`
`20`	`20`	`Assert.assertTrue(beanModel.getProperties().size() > 0);`
`21`	`21`	`Assert.assertEquals("firstProperty", beanModel.getProperties().get(0).getName());`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private void testWithParsing(String applicationClass) {`
`52`	`52`	`final Model model = new TypeScriptGenerator(TestUtils.settings()).getModelParser().parseModel(types);`
`53`	`53`	`final ArrayList<Class<?>> classes = new ArrayList<>();`
`54`	`54`	`for (BeanModel beanModel : model.getBeans()) {`
`55`		`- classes.add(beanModel.getBeanClass());`
	`55`	`+ classes.add(beanModel.getOrigin());`
`56`	`56`	`}`
`57`	`57`	`final List<Class<?>> expectedClasses = Arrays.asList(`
`58`	`58`	`A.class,`