I guess Files.lines doesn't work

Author: SentryMan

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

@@ -65,9 +65,9 @@ void loadProvidedFiles(Filer filer) {
               .toUri()
               .toString()
               .replace("/target/classes", "");
-      try (var lines = Files.lines(Paths.get(new URI(resource)))) {
-        lines.forEach(pluginFileProvided::add);
-      }
+
+      Files.readAllLines(Paths.get(new URI(resource))).forEach(pluginFileProvided::add);
+
     } catch (final Exception e) {
       // could not find avaje-plugin-provides.txt
     }
@@ -79,17 +79,16 @@ void loadProvidedFiles(Filer filer) {
               .toUri()
               .toString()
               .replace("/target/classes", "");
-      try (var lines = Files.lines(Paths.get(new URI(resource)))) {
-        lines.forEach(pluginFileProvided::add);
-      }
+      Files.readAllLines(Paths.get(new URI(resource))).forEach(pluginFileProvided::add);
+
     } catch (final Exception e2) {
       // could not find avaje-module-provides.txt
     }
   }
 
   /**
-   * 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.
+   * 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.
    */
   private void registerPluginProvidedTypes() {
     for (final Plugin plugin : ServiceLoader.load(Plugin.class, Processor.class.getClassLoader())) {
@@ -102,7 +101,7 @@ private void registerPluginProvidedTypes() {
 
   @Override
   public Set<String> getSupportedAnnotationTypes() {
-    Set<String> annotations = new LinkedHashSet<>();
+    final Set<String> annotations = new LinkedHashSet<>();
     annotations.add(InjectModule.class.getCanonicalName());
     annotations.add(Factory.class.getCanonicalName());
     annotations.add(Singleton.class.getCanonicalName());
@@ -123,7 +122,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     }
     readChangedBeans(roundEnv.getElementsAnnotatedWith(Component.class), false);
     readChangedBeans(roundEnv.getElementsAnnotatedWith(Prototype.class), false);
-    TypeElement typeElement = elementUtils.getTypeElement(Constants.CONTROLLER);
+    final var typeElement = elementUtils.getTypeElement(Constants.CONTROLLER);
     if (typeElement != null) {
       readChangedBeans(roundEnv.getElementsAnnotatedWith(typeElement), false);
     }
@@ -135,78 +134,66 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
   }
 
   private void readScopes(Set<? extends Element> scopes) {
-    for (Element element : scopes) {
-      if (element.getKind() == ElementKind.ANNOTATION_TYPE) {
-        if (element instanceof TypeElement) {
-          TypeElement type = (TypeElement) element;
-          allScopes.addScopeAnnotation(type);
-        }
+    for (final Element element : scopes) {
+      if ((element.getKind() == ElementKind.ANNOTATION_TYPE) && (element instanceof TypeElement)) {
+        final var type = (TypeElement) element;
+        allScopes.addScopeAnnotation(type);
       }
     }
     addTestScope();
   }
 
-  /**
-   * Add built-in test scope for <code>@TestScope</code> if available.
-   */
+  /** Add built-in test scope for <code>@TestScope</code> if available. */
   private void addTestScope() {
-    TypeElement testScopeType = elementUtils.getTypeElement(Constants.TESTSCOPE);
+    final var testScopeType = elementUtils.getTypeElement(Constants.TESTSCOPE);
     if (testScopeType != null) {
       allScopes.addScopeAnnotation(testScopeType);
     }
   }
 
-  /**
-   * Read the beans that have changed.
-   */
+  /** Read the beans that have changed. */
   private void readChangedBeans(Set<? extends Element> beans, boolean factory) {
-    for (Element element : beans) {
+    for (final Element element : beans) {
       // ignore methods (e.g. factory methods with @Prototype on them)
       if (element instanceof TypeElement) {
-        TypeElement typeElement = (TypeElement) element;
-        final ScopeInfo scope = findScope(typeElement);
+        final var typeElement = (TypeElement) element;
+        final var scope = findScope(typeElement);
         if (!factory) {
           // will be found via custom scope so effectively ignore additional @Singleton
           if (scope == null) {
             defaultScope.read(typeElement, false);
           }
+        } else if (scope != null) {
+          // context.logWarn("Adding factory to custom scope "+element+" scope: "+scope);
+          scope.read(typeElement, true);
         } else {
-          if (scope != null) {
-            // context.logWarn("Adding factory to custom scope "+element+" scope: "+scope);
-            scope.read(typeElement, true);
-          } else {
-            defaultScope.read(typeElement, true);
-          }
+          defaultScope.read(typeElement, true);
         }
       }
     }
   }
 
-  /**
-   * Find the scope if the Factory has a scope annotation.
-   */
+  /** Find the scope if the Factory has a scope annotation. */
   private ScopeInfo findScope(Element element) {
-    for (AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
-      final ScopeInfo scopeInfo = allScopes.get(annotationMirror.getAnnotationType().toString());
+    for (final AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
+      final var scopeInfo = allScopes.get(annotationMirror.getAnnotationType().toString());
       if (scopeInfo != null) {
         return scopeInfo;
       }
     }
     return null;
   }
 
-  /**
-   * Read the existing meta data from InjectModule (if found) and the factory bean (if exists).
-   */
+  /** Read the existing meta data from InjectModule (if found) and the factory bean (if exists). */
   private void readModule(RoundEnvironment roundEnv) {
     if (readModuleInfo) {
       // only read the module meta data once
       return;
     }
     readModuleInfo = true;
-    String factory = context.loadMetaInfServices();
+    final var factory = context.loadMetaInfServices();
     if (factory != null) {
-      TypeElement moduleType = elementUtils.getTypeElement(factory);
+      final var moduleType = elementUtils.getTypeElement(factory);
       if (moduleType != null) {
         defaultScope.readModuleMetaData(moduleType);
       }
@@ -215,21 +202,18 @@ private void readModule(RoundEnvironment roundEnv) {
     readInjectModule(roundEnv);
   }
 
-  /**
-   * Read InjectModule for things like package-info etc (not for custom scopes)
-   */
+  /** Read InjectModule for things like package-info etc (not for custom scopes) */
   private void readInjectModule(RoundEnvironment roundEnv) {
     // read other that are annotated with InjectModule
-    for (Element element : roundEnv.getElementsAnnotatedWith(InjectModule.class)) {
-      Scope scope = element.getAnnotation(Scope.class);
+    for (final Element element : roundEnv.getElementsAnnotatedWith(InjectModule.class)) {
+      final var scope = element.getAnnotation(Scope.class);
       if (scope == null) {
         // it it not a custom scope annotation
-        InjectModule annotation = element.getAnnotation(InjectModule.class);
+        final var annotation = element.getAnnotation(InjectModule.class);
         if (annotation != null) {
           defaultScope.details(annotation.name(), element);
         }
       }
     }
   }
-
 }