avaje-prisms 1.1, format whitespace

Author: rbygrave

inject-generator/pom.xml

@@ -25,7 +25,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-prisms</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
@@ -55,7 +55,7 @@
             <path>
               <groupId>io.avaje</groupId>
               <artifactId>avaje-prisms</artifactId>
-              <version>1.0</version>
+              <version>1.1</version>
             </path>
           </annotationProcessorPaths>
         </configuration>

inject-generator/src/main/java/io/avaje/inject/generator/ExternalProvider.java

@@ -24,20 +24,17 @@ private static boolean moduleCP() {
       Class.forName(Constants.MODULE);
       return true;
     } catch (final ClassNotFoundException e) {
-
       return false;
     }
   }
 
-  public static void registerModuleProvidedTypes(Set<String> providedTypes) {
-
-    if (!injectAvailable) return;
-
-    Iterator<Module> iterator =
-        ServiceLoader.load(Module.class, ExternalProvider.class.getClassLoader()).iterator();
+  static void registerModuleProvidedTypes(Set<String> providedTypes) {
+    if (!injectAvailable) {
+      return;
+    }
 
+    Iterator<Module> iterator = ServiceLoader.load(Module.class, ExternalProvider.class.getClassLoader()).iterator();
     while (iterator.hasNext()) {
-
       try {
         Module module = iterator.next();
         for (final Class<?> provide : module.provides()) {
@@ -58,13 +55,11 @@ public static void registerModuleProvidedTypes(Set<String> providedTypes) {
   /**
    * Register types provided by the plugin so no compiler error when we have a dependency on these
    * types and the only thing providing them is the plugin.
-   *
-   * @param defaultScope
    */
-  public static void registerPluginProvidedTypes(ScopeInfo defaultScope) {
-
-    if (!injectAvailable) return;
-
+  static void registerPluginProvidedTypes(ScopeInfo defaultScope) {
+    if (!injectAvailable) {
+      return;
+    }
     for (final Plugin plugin : ServiceLoader.load(Plugin.class, Processor.class.getClassLoader())) {
       for (final Class<?> provide : plugin.provides()) {
         defaultScope.pluginProvided(provide.getCanonicalName());

inject-generator/src/main/java/io/avaje/inject/generator/ProcessingContext.java

@@ -42,7 +42,6 @@ final class ProcessingContext {
     this.typeUtils = processingEnv.getTypeUtils();
 
     ExternalProvider.registerModuleProvidedTypes(providedTypes);
-
     providedTypes.addAll(moduleFileProvided);
   }
 

inject-generator/src/main/java/io/avaje/inject/generator/Processor.java

@@ -63,9 +63,8 @@ public synchronized void init(ProcessingEnvironment processingEnv) {
 
   /** Loads provider files generated by avaje-inject-maven-plugin */
   void loadProvidedFiles(Filer filer) {
-    targetProvidesLines(filer, "target/avaje-plugin-provides.txt").forEach(pluginFileProvided::add);
-
-    targetProvidesLines(filer, "target/avaje-module-provides.txt").forEach(moduleFileProvided::add);
+    pluginFileProvided.addAll(targetProvidesLines(filer, "target/avaje-plugin-provides.txt"));
+    moduleFileProvided.addAll(targetProvidesLines(filer, "target/avaje-module-provides.txt"));
   }
 
   private static List<String> targetProvidesLines(Filer filer, String relativeName) {
@@ -82,26 +81,22 @@ private static List<String> targetProvidesLines(Filer filer, String relativeName
 
   private static String targetProvides(Filer filer, String relativeName) throws IOException {
     return filer
-        .getResource(StandardLocation.CLASS_OUTPUT, "", relativeName)
-        .toUri()
-        .toString()
-        .replace("/target/classes", "");
+      .getResource(StandardLocation.CLASS_OUTPUT, "", relativeName)
+      .toUri()
+      .toString()
+      .replace("/target/classes", "");
   }
 
   @Override
   public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
     readModule(roundEnv);
     readScopes(roundEnv.getElementsAnnotatedWith(context.element(Constants.SCOPE)));
-    readChangedBeans(
-        roundEnv.getElementsAnnotatedWith(context.element(Constants.FACTORY)), true);
+    readChangedBeans(roundEnv.getElementsAnnotatedWith(context.element(Constants.FACTORY)), true);
     if (defaultScope.includeSingleton()) {
-      readChangedBeans(
-          roundEnv.getElementsAnnotatedWith(context.element(Constants.SINGLETON)), false);
+      readChangedBeans(roundEnv.getElementsAnnotatedWith(context.element(Constants.SINGLETON)), false);
     }
-    readChangedBeans(
-        roundEnv.getElementsAnnotatedWith(context.element(Constants.COMPONENT)), false);
-    readChangedBeans(
-        roundEnv.getElementsAnnotatedWith(context.element(Constants.PROTOTYPE)), false);
+    readChangedBeans(roundEnv.getElementsAnnotatedWith(context.element(Constants.COMPONENT)), false);
+    readChangedBeans(roundEnv.getElementsAnnotatedWith(context.element(Constants.PROTOTYPE)), false);
     final var typeElement = elementUtils.getTypeElement(Constants.CONTROLLER);
     if (typeElement != null) {
       readChangedBeans(roundEnv.getElementsAnnotatedWith(typeElement), false);
@@ -186,11 +181,9 @@ private void readModule(RoundEnvironment roundEnv) {
   private void readInjectModule(RoundEnvironment roundEnv) {
     // read other that are annotated with InjectModule
     for (final Element element : roundEnv.getElementsAnnotatedWith(context.element(Constants.INJECTMODULE))) {
-
       final var scope = ScopePrism.getInstanceOn(element);
       if (scope == null) {
         // it it not a custom scope annotation
-
         final var annotation = InjectModulePrism.getInstanceOn(element);
         if (annotation != null) {
           defaultScope.details(annotation.name(), element);

inject-generator/src/main/java/io/avaje/inject/generator/TypeAnnotationReader.java

@@ -4,8 +4,6 @@
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.type.DeclaredType;
-
-
 import java.util.ArrayList;
 import java.util.List;