refactoring

Author: h908714124

compiler/src/main/java/io/jbock/simple/processor/binding/InjectBindingFactory.java

@@ -16,7 +16,7 @@
 import java.util.stream.Collectors;
 
 import static io.jbock.simple.processor.util.Printing.INDENT;
-import static io.jbock.simple.processor.util.Printing.elementToString;
+import static io.jbock.simple.processor.util.Printing.bindingElementToString;
 import static io.jbock.simple.processor.util.Visitors.EXECUTABLE_ELEMENT_VISITOR;
 import static io.jbock.simple.processor.util.Visitors.TYPE_ELEMENT_VISITOR;
 
@@ -53,7 +53,7 @@ public Map<Key, InjectBinding> injectBindings(TypeElement typeElement) {
             if (previous != null) {
                 throw new ValidationFailure("This binding clashes with:\n"
                         + INDENT
-                        + elementToString(previous.element())
+                        + bindingElementToString(previous.element())
                         + ".\n"
                         + "Consider a (different) qualifier", b.element());
             }

compiler/src/main/java/io/jbock/simple/processor/graph/CyclePrinter.java

@@ -12,7 +12,7 @@
 
 import static io.jbock.simple.processor.util.Printing.DOUBLE_INDENT;
 import static io.jbock.simple.processor.util.Printing.INDENT;
-import static io.jbock.simple.processor.util.Printing.elementToString;
+import static io.jbock.simple.processor.util.Printing.bindingElementToString;
 
 final class CyclePrinter {
 
@@ -55,11 +55,11 @@ private String cycleMessage(List<Edge> cycle) {
             if (destination instanceof ProviderBinding) {
                 ProviderBinding b = (ProviderBinding) destination;
                 message.add(INDENT + edge.source().key().typeName() + " is injected at");
-                message.add(DOUBLE_INDENT + elementToString(b.sourceBinding().element()));
+                message.add(DOUBLE_INDENT + bindingElementToString(b.sourceBinding().element()));
                 continue;
             }
             message.add(INDENT + edge.source().key().typeName() + " is injected at");
-            message.add(DOUBLE_INDENT + elementToString(destination.element()));
+            message.add(DOUBLE_INDENT + bindingElementToString(destination.element()));
         }
         return String.join("\n", message);
     }

compiler/src/main/java/io/jbock/simple/processor/graph/MissingBindingPrinter.java

@@ -11,7 +11,7 @@
 
 import static io.jbock.simple.processor.util.Printing.DOUBLE_INDENT;
 import static io.jbock.simple.processor.util.Printing.INDENT;
-import static io.jbock.simple.processor.util.Printing.elementToString;
+import static io.jbock.simple.processor.util.Printing.bindingElementToString;
 
 public final class MissingBindingPrinter {
 
@@ -47,6 +47,6 @@ private String format(DependencyRequest request, String verb) {
                 + verb
                 + " at\n"
                 + DOUBLE_INDENT
-                + elementToString(request.requestElement());
+                + bindingElementToString(request.requestElement());
     }
 }

compiler/src/main/java/io/jbock/simple/processor/step/InjectStep.java

@@ -10,12 +10,14 @@
 import javax.annotation.processing.Messager;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.VariableElement;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import static javax.lang.model.util.ElementFilter.constructorsIn;
+import static javax.lang.model.util.ElementFilter.fieldsIn;
 import static javax.lang.model.util.ElementFilter.methodsIn;
 
 public class InjectStep implements Step {
@@ -58,9 +60,17 @@ public Set<? extends Element> process(Map<String, Set<Element>> elementsByAnnota
                 executableElementValidator.validate(method);
                 validator.validateStaticMethod(method);
             }
+            checkFields(elements);
         } catch (ValidationFailure f) {
             f.writeTo(messager);
         }
         return Set.of();
     }
+
+    private void checkFields(List<Element> elements) {
+        List<VariableElement> fields = fieldsIn(elements);
+        for (VariableElement field : fields) {
+            throw new ValidationFailure("Field injection is not supported", field);
+        }
+    }
 }

compiler/src/main/java/io/jbock/simple/processor/util/Printing.java

@@ -15,7 +15,7 @@ public final class Printing {
     public static final String INDENT = "    ";
     public static final String DOUBLE_INDENT = INDENT + INDENT;
 
-    public static String elementToString(Element element) {
+    public static String bindingElementToString(Element element) {
         if (element.getKind() == ElementKind.PARAMETER) {
             return Visitors.PARAMETER_VISITOR.visit(element).getSimpleName().toString();
         }