Refactoring of AnnotationProcessor