Rename annotationFilters to includePropertyAnnotations

ZeroErrors · ZeroErrors · commit 6624efe1621c · 2016-05-23T11:45:33.000+09:30
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/Settings.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/Settings.java
@@ -38,7 +38,7 @@ public class Settings {
     public boolean noFileComment = false;
     public List<File> javadocXmlFiles = null;
     public List<EmitterExtension> extensions = new ArrayList<>();
-    public List<Class<? extends Annotation>> annotationFilters = new ArrayList<>();
+    public List<Class<? extends Annotation>> includePropertyAnnotations = new ArrayList<>();
     public List<Class<? extends Annotation>> optionalAnnotations = new ArrayList<>();
     public boolean experimentalInlineEnums = false;
     public boolean displaySerializerWarning = true;
@@ -56,9 +56,9 @@ public void loadExtensions(ClassLoader classLoader, List<String> extensions) {
         }
     }
 
-    public void loadAnnotationFilters(ClassLoader classLoader, List<String> annotationFilters) {
-        if (annotationFilters != null) {
-            this.annotationFilters = loadClasses(classLoader, annotationFilters, Annotation.class);
+    public void loadIncludePropertyAnnotations(ClassLoader classLoader, List<String> includePropertyAnnotations) {
+        if (includePropertyAnnotations != null) {
+            this.includePropertyAnnotations = loadClasses(classLoader, includePropertyAnnotations, Annotation.class);
         }
     }
 
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson1Parser.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson1Parser.java
@@ -45,16 +45,16 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
                     if (propertyType == JsonNode.class) {
                         propertyType = Object.class;
                     }
-                    boolean isInAnnotationFilter = settings.annotationFilters.isEmpty();
+                    boolean isInAnnotationFilter = settings.includePropertyAnnotations.isEmpty();
                     if (!isInAnnotationFilter) {
-                        for (Class<? extends Annotation> optionalAnnotation : settings.annotationFilters) {
+                        for (Class<? extends Annotation> optionalAnnotation : settings.includePropertyAnnotations) {
                             if (beanPropertyWriter.getAnnotation(optionalAnnotation) != null) {
                                 isInAnnotationFilter = true;
                                 break;
                             }
                         }
                         if (!isInAnnotationFilter) {
-                            System.out.println("Skipping " + sourceClass.type + "." + beanPropertyWriter.getName() + " because it is missing an annotation from annotationFilters!");
+                            System.out.println("Skipping " + sourceClass.type + "." + beanPropertyWriter.getName() + " because it is missing an annotation from includePropertyAnnotations!");
                             continue;
                         }
                     }
diff --git a/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java b/typescript-generator-core/src/main/java/cz/habarta/typescript/generator/parser/Jackson2Parser.java
@@ -32,16 +32,16 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {
                     if (propertyType == JsonNode.class) {
                         propertyType = Object.class;
                     }
-                    boolean isInAnnotationFilter = settings.annotationFilters.isEmpty();
+                    boolean isInAnnotationFilter = settings.includePropertyAnnotations.isEmpty();
                     if (!isInAnnotationFilter) {
-                        for (Class<? extends Annotation> optionalAnnotation : settings.annotationFilters) {
+                        for (Class<? extends Annotation> optionalAnnotation : settings.includePropertyAnnotations) {
                             if (beanPropertyWriter.getAnnotation(optionalAnnotation) != null) {
                                 isInAnnotationFilter = true;
                                 break;
                             }
                         }
                         if (!isInAnnotationFilter) {
-                            System.out.println("Skipping " + sourceClass.type + "." + beanPropertyWriter.getName() + " because it is missing an annotation from annotationFilters!");
+                            System.out.println("Skipping " + sourceClass.type + "." + beanPropertyWriter.getName() + " because it is missing an annotation from includePropertyAnnotations!");
                             continue;
                         }
                     }
diff --git a/typescript-generator-gradle-plugin/src/main/java/cz/habarta/typescript/generator/gradle/GenerateTask.java b/typescript-generator-gradle-plugin/src/main/java/cz/habarta/typescript/generator/gradle/GenerateTask.java
@@ -22,7 +22,7 @@ public class GenerateTask extends DefaultTask {
     public String classesFromJaxrsApplication;
     public boolean classesFromAutomaticJaxrsApplication;
     public List<String> excludeClasses;
-    public List<String> annotationFilters;
+    public List<String> includePropertyAnnotations;
     public JsonLibrary jsonLibrary;
     public boolean declarePropertiesAsOptional;
     public String removeTypeNamePrefix;
@@ -93,7 +93,7 @@ public void generate() throws Exception {
         settings.noFileComment = noFileComment;
         settings.javadocXmlFiles = javadocXmlFiles;
         settings.loadExtensions(classLoader, extensionClasses);
-        settings.loadAnnotationFilters(classLoader, annotationFilters);
+        settings.loadIncludePropertyAnnotations(classLoader, includePropertyAnnotations);
         settings.loadOptionalAnnotations(classLoader, optionalAnnotations);
         settings.experimentalInlineEnums = experimentalInlineEnums;
         settings.displaySerializerWarning = displaySerializerWarning;
diff --git a/typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java b/typescript-generator-maven-plugin/src/main/java/cz/habarta/typescript/generator/maven/GenerateMojo.java
@@ -99,7 +99,7 @@ public class GenerateMojo extends AbstractMojo {
      * methods with one of the annotations defined in this list
      */
     @Parameter
-    private List<String> annotationFilters;
+    private List<String> includePropertyAnnotations;
 
     /**
      * Library used in JSON classes.
@@ -291,7 +291,7 @@ public void execute() {
             settings.noFileComment = noFileComment;
             settings.javadocXmlFiles = javadocXmlFiles;
             settings.loadExtensions(classLoader, extensions);
-            settings.loadAnnotationFilters(classLoader, annotationFilters);
+            settings.loadIncludePropertyAnnotations(classLoader, includePropertyAnnotations);
             settings.loadOptionalAnnotations(classLoader, optionalAnnotations);
             settings.experimentalInlineEnums = experimentalInlineEnums;
             settings.displaySerializerWarning = displaySerializerWarning;

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public class Settings {`
`38`	`38`	`public boolean noFileComment = false;`
`39`	`39`	`public List<File> javadocXmlFiles = null;`
`40`	`40`	`public List<EmitterExtension> extensions = new ArrayList<>();`
`41`		`- public List<Class<? extends Annotation>> annotationFilters = new ArrayList<>();`
	`41`	`+ public List<Class<? extends Annotation>> includePropertyAnnotations = new ArrayList<>();`
`42`	`42`	`public List<Class<? extends Annotation>> optionalAnnotations = new ArrayList<>();`
`43`	`43`	`public boolean experimentalInlineEnums = false;`
`44`	`44`	`public boolean displaySerializerWarning = true;`
`@@ -56,9 +56,9 @@ public void loadExtensions(ClassLoader classLoader, List<String> extensions) {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- public void loadAnnotationFilters(ClassLoader classLoader, List<String> annotationFilters) {`
`60`		`- if (annotationFilters != null) {`
`61`		`- this.annotationFilters = loadClasses(classLoader, annotationFilters, Annotation.class);`
	`59`	`+ public void loadIncludePropertyAnnotations(ClassLoader classLoader, List<String> includePropertyAnnotations) {`
	`60`	`+ if (includePropertyAnnotations != null) {`
	`61`	`+ this.includePropertyAnnotations = loadClasses(classLoader, includePropertyAnnotations, Annotation.class);`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -45,16 +45,16 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {`
`45`	`45`	`if (propertyType == JsonNode.class) {`
`46`	`46`	`propertyType = Object.class;`
`47`	`47`	`}`
`48`		`- boolean isInAnnotationFilter = settings.annotationFilters.isEmpty();`
	`48`	`+ boolean isInAnnotationFilter = settings.includePropertyAnnotations.isEmpty();`
`49`	`49`	`if (!isInAnnotationFilter) {`
`50`		`- for (Class<? extends Annotation> optionalAnnotation : settings.annotationFilters) {`
	`50`	`+ for (Class<? extends Annotation> optionalAnnotation : settings.includePropertyAnnotations) {`
`51`	`51`	`if (beanPropertyWriter.getAnnotation(optionalAnnotation) != null) {`
`52`	`52`	`isInAnnotationFilter = true;`
`53`	`53`	`break;`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`	`if (!isInAnnotationFilter) {`
`57`		`- System.out.println("Skipping " + sourceClass.type + "." + beanPropertyWriter.getName() + " because it is missing an annotation from annotationFilters!");`
	`57`	`+ System.out.println("Skipping " + sourceClass.type + "." + beanPropertyWriter.getName() + " because it is missing an annotation from includePropertyAnnotations!");`
`58`	`58`	`continue;`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,16 +32,16 @@ protected BeanModel parseBean(SourceType<Class<?>> sourceClass) {`
`32`	`32`	`if (propertyType == JsonNode.class) {`
`33`	`33`	`propertyType = Object.class;`
`34`	`34`	`}`
`35`		`- boolean isInAnnotationFilter = settings.annotationFilters.isEmpty();`
	`35`	`+ boolean isInAnnotationFilter = settings.includePropertyAnnotations.isEmpty();`
`36`	`36`	`if (!isInAnnotationFilter) {`
`37`		`- for (Class<? extends Annotation> optionalAnnotation : settings.annotationFilters) {`
	`37`	`+ for (Class<? extends Annotation> optionalAnnotation : settings.includePropertyAnnotations) {`
`38`	`38`	`if (beanPropertyWriter.getAnnotation(optionalAnnotation) != null) {`
`39`	`39`	`isInAnnotationFilter = true;`
`40`	`40`	`break;`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`if (!isInAnnotationFilter) {`
`44`		`- System.out.println("Skipping " + sourceClass.type + "." + beanPropertyWriter.getName() + " because it is missing an annotation from annotationFilters!");`
	`44`	`+ System.out.println("Skipping " + sourceClass.type + "." + beanPropertyWriter.getName() + " because it is missing an annotation from includePropertyAnnotations!");`
`45`	`45`	`continue;`
`46`	`46`	`}`
`47`	`47`	`}`