Refactor rename to ControllerReader

Author: rbygrave

src/main/java/io/dinject/javalin/generator/FormBeanReader.java renamed to src/main/java/io/dinject/javalin/generator/BeanParamReader.java

@@ -8,7 +8,7 @@
 import java.util.Map;
 import java.util.Set;
 
-class FormBeanReader {
+class BeanParamReader {
 
   private final ProcessingContext ctx;
   private final String beanVarName;
@@ -21,7 +21,7 @@ class FormBeanReader {
 
   private final Map<String, FieldReader> fieldMap = new LinkedHashMap<>();
 
-  FormBeanReader(ProcessingContext ctx, TypeElement beanType, String beanVarName, String beanShortType, ParamType defaultParamType) {
+  BeanParamReader(ProcessingContext ctx, TypeElement beanType, String beanVarName, String beanShortType, ParamType defaultParamType) {
     this.ctx = ctx;
     this.beanType = beanType;
     this.beanVarName = beanVarName;

src/main/java/io/dinject/javalin/generator/BeanReader.java renamed to src/main/java/io/dinject/javalin/generator/ControllerReader.java

@@ -16,7 +16,7 @@
 /**
  * Reads the type information for the Controller (bean).
  */
-class BeanReader {
+class ControllerReader {
 
   private final ProcessingContext ctx;
 
@@ -30,7 +30,7 @@ class BeanReader {
 
   private final Set<String> importTypes = new TreeSet<>();
 
-  BeanReader(TypeElement beanType, ProcessingContext ctx) {
+  ControllerReader(TypeElement beanType, ProcessingContext ctx) {
     this.beanType = beanType;
     this.ctx = ctx;
     this.roles = Util.findRoles(beanType);

src/main/java/io/dinject/javalin/generator/ControllerRouteWriter.java

@@ -7,7 +7,7 @@
 
 class ControllerRouteWriter {
 
-  private final BeanReader reader;
+  private final ControllerReader reader;
 
   private final ProcessingContext ctx;
 
@@ -17,7 +17,7 @@ class ControllerRouteWriter {
   private String packageName;
   private final String fullName;
 
-  ControllerRouteWriter(BeanReader reader, ProcessingContext ctx) {
+  ControllerRouteWriter(ControllerReader reader, ProcessingContext ctx) {
     this.reader = reader;
     this.ctx = ctx;
 

src/main/java/io/dinject/javalin/generator/ElementReader.java

@@ -127,7 +127,7 @@ private String derivePathParam(Set<String> pathParams) {
     return null;
   }
 
-  void addImports(BeanReader bean) {
+  void addImports(ControllerReader bean) {
     if (typeHandler != null) {
       String importType = typeHandler.getImportType();
       if (importType != null) {
@@ -209,7 +209,7 @@ private void writeForm(Append writer, String shortType, String varName, ParamTyp
 
     TypeElement formBeanType = ctx.getTypeElement(rawType);
 
-    FormBeanReader form = new FormBeanReader(ctx, formBeanType, varName, shortType, defaultParamType);
+    BeanParamReader form = new BeanParamReader(ctx, formBeanType, varName, shortType, defaultParamType);
     form.write(writer);
   }
 }

src/main/java/io/dinject/javalin/generator/MethodParam.java

@@ -16,7 +16,7 @@ void buildCtxGet(Append writer, Set<String> pathParams) {
     elementParam.writeCtxGet(writer, pathParams);
   }
 
-  void addImports(BeanReader bean) {
+  void addImports(ControllerReader bean) {
     elementParam.addImports(bean);
   }
 

src/main/java/io/dinject/javalin/generator/MethodReader.java

@@ -17,7 +17,7 @@
 class MethodReader {
 
   private final ProcessingContext ctx;
-  private final BeanReader bean;
+  private final ControllerReader bean;
   private final ExecutableElement element;
 
   private final boolean isVoid;
@@ -32,7 +32,7 @@ class MethodReader {
    */
   private final List<String> methodRoles;
 
-  MethodReader(BeanReader bean, ExecutableElement element, ProcessingContext ctx) {
+  MethodReader(ControllerReader bean, ExecutableElement element, ProcessingContext ctx) {
     this.ctx = ctx;
     this.bean = bean;
     this.beanPath = bean.getPath();

src/main/java/io/dinject/javalin/generator/Processor.java

@@ -47,7 +47,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
   private void writeControllerAdapter(Element controller) {
     if (controller instanceof TypeElement) {
-      BeanReader reader = new BeanReader((TypeElement) controller, processingContext);
+      ControllerReader reader = new ControllerReader((TypeElement) controller, processingContext);
       reader.read();
       try {
         ControllerRouteWriter writer = new ControllerRouteWriter(reader, processingContext);