fixed minor code issues (jooby-project#1170)

feffi · jknack · commit 8c03f35b5a7c · 2018-06-25T12:51:09.000-03:00
(cherry picked from commit 6cd8e98)
diff --git a/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/AssetTask.java b/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/AssetTask.java
@@ -305,10 +305,8 @@ public void process() throws Throwable {
       String env = getEnv();
       this.assetFile = new File(getOutput(), "assets." + env + ".conf");
       new JoobyContainer(getProject())
-          .run(getMainClassName(), (app, conf) -> {
-            compile(getLogger(), app.getClass().getClassLoader(), env, getMaxAge(), getOutput(),
-                assetFile, getAssemblyOutput(), conf);
-          }, env);
+          .run(getMainClassName(), (app, conf) -> compile(getLogger(), app.getClass().getClassLoader(), env, getMaxAge(), getOutput(),
+              assetFile, getAssemblyOutput(), conf), env);
     } catch (CompilationDone ex) {
       // done
     }
@@ -364,7 +362,7 @@ private static void compile(final Logger logger, final ClassLoader loader,
 
       // move output to fixed location required by zip/war dist
       List<File> files = fileset.values().stream()
-          .flatMap(it -> it.stream())
+          .flatMap(Collection::stream)
           .collect(Collectors.toList());
 
       for (File from : files) {
diff --git a/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyContainer.java b/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyContainer.java
@@ -232,7 +232,7 @@
  */
 public class JoobyContainer {
 
-  private JoobyProject project;
+  private final JoobyProject project;
 
   public JoobyContainer(final Project project) {
     this.project = new JoobyProject(project);
diff --git a/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyProject.java b/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyProject.java
@@ -234,7 +234,7 @@
 
 public class JoobyProject {
 
-  private Project project;
+  private final Project project;
 
   public JoobyProject(final Project project) {
     this.project = project;
@@ -254,17 +254,16 @@ public File classes() {
   public Set<File> classpath() {
     SourceSet sourceSet = sourceSet(project);
 
-    Set<File> cp = new LinkedHashSet<>();
     // conf & public
-    sourceSet.getResources().getSrcDirs().forEach(cp::add);
+    Set<File> cp = new LinkedHashSet<>(sourceSet.getResources().getSrcDirs());
 
     // classes/main, resources/main + jars
-    sourceSet.getRuntimeClasspath().getFiles().forEach(cp::add);
+    cp.addAll(sourceSet.getRuntimeClasspath().getFiles());
 
     // provided?
     Configuration provided = project.getConfigurations().findByName("provided");
     if (provided != null) {
-      provided.getFiles().forEach(cp::add);
+      cp.addAll(provided.getFiles());
     }
 
     return cp;
@@ -273,9 +272,8 @@ public Set<File> classpath() {
   public Set<File> sources() {
     SourceSet sourceSet = sourceSet(project);
 
-    Set<File> src = new LinkedHashSet<>();
     // conf & public
-    sourceSet.getResources().getSrcDirs().forEach(src::add);
+    Set<File> src = new LinkedHashSet<>(sourceSet.getResources().getSrcDirs());
 
     // source java: always add parent file: should be src/main
     sourceSet.getJava().getSrcDirs().forEach(f -> src.add(f.getParentFile()));
@@ -291,16 +289,15 @@ public File javaSrc() {
   }
 
   private SourceSet sourceSet(final Project project) {
-    SourceSet sourceSet = getJavaConvention(project).getSourceSets()
+    return getJavaConvention(project).getSourceSets()
         .getByName(SourceSet.MAIN_SOURCE_SET_NAME);
-    return sourceSet;
   }
 
   public JavaPluginConvention getJavaConvention(final Project project) {
     return project.getConvention().getPlugin(JavaPluginConvention.class);
   }
 
-  public URLClassLoader newClassLoader() throws MalformedURLException {
+  public URLClassLoader newClassLoader() {
     return toClassLoader(
         classpath().stream()
             .map(throwingFunction(f -> f.toURI().toURL()))
diff --git a/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyTask.java b/modules/jooby-gradle-plugin/src/main/java/org/jooby/run/JoobyTask.java
@@ -268,10 +268,8 @@ public void run() throws Exception {
 
     String mId = project.getName();
 
-    List<File> cp = new ArrayList<>();
-
     // conf & public
-    getClasspath().forEach(cp::add);
+    List<File> cp = new ArrayList<>(getClasspath());
 
     Main app = new Main(mId, getMainClassName(), toFiles(watchDirs),
         cp.toArray(new File[cp.size()]));
@@ -286,11 +284,7 @@ public void run() throws Exception {
     String compiler = getCompiler();
     getLogger().info("compiler is {}", compiler);
     if ("on".equalsIgnoreCase(compiler)) {
-      Path[] watchDirs = getSrc().stream()
-          .filter(File::exists)
-          .map(File::toPath)
-          .collect(Collectors.toList())
-          .toArray(new Path[0]);
+      Path[] watchDirs = getSrc().stream().filter(File::exists).map(File::toPath).toArray(Path[]::new);
       getLogger().info("watching directories {}", Arrays.asList(watchDirs));
 
       connection = GradleConnector.newConnector()
@@ -304,16 +298,14 @@ public void run() throws Exception {
           runTask(connection, path, "classes");
         }
       }, watchDirs);
-      Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-        Try.run(() -> watcher.stop())
-          .onComplete(() -> connection.close())
-          .throwException();
-      }));
+      Runtime.getRuntime().addShutdownHook(new Thread(() -> Try.run(watcher::stop)
+        .onComplete(() -> connection.close())
+        .throwException()));
       watcher.start();
     }
 
     String[] args = project.getGradle().getStartParameter().getProjectProperties()
-        .entrySet().stream().map(e -> e.toString()).collect(Collectors.toList())
+        .entrySet().stream().map(Object::toString).collect(Collectors.toList())
         .toArray(new String[0]);
     app.run(isBlock(), args);
   }
