fixed minor code issues (jooby-project#1169)

feffi · jknack · commit 00c7c8bd1c74 · 2018-06-25T12:49:49.000-03:00
(cherry picked from commit 8e70bd1)
diff --git a/modules/jooby-scanner/src/main/java/org/jooby/scanner/Scanner.java b/modules/jooby-scanner/src/main/java/org/jooby/scanner/Scanner.java
@@ -372,7 +372,7 @@ public class Scanner implements Jooby.Module {
   private List<String> packages;
 
   @SuppressWarnings("rawtypes")
-  private Set<Class> serviceTypes = new LinkedHashSet<>();
+  private final Set<Class> serviceTypes = new LinkedHashSet<>();
 
   /**
    * Creates a new {@link Scanner} and uses the provided scan spec or packages.
@@ -404,7 +404,7 @@ public void configure(final Env env, final Config conf, final Binder binder) {
     Router routes = env.router();
 
     ClassLoader loader = getClass().getClassLoader();
-    Throwing.Function<String, Class> loadClass = name -> loader.loadClass(name);
+    Throwing.Function<String, Class> loadClass = loader::loadClass;
 
     // bind once as singleton + post/pre callbacks
     Set<Object> bindings = new HashSet<>();
@@ -418,9 +418,7 @@ public void configure(final Env env, final Config conf, final Binder binder) {
     ScanResult result = scanner.scan(conf.getInt("runtime.processors") + 1);
 
     Predicate<String> inPackage = name -> packages.stream()
-        .filter(name::startsWith)
-        .findFirst()
-        .isPresent();
+        .anyMatch(name::startsWith);
 
     /** Controllers: */
     result.getNamesOfClassesWithAnnotation(Path.class)
@@ -443,41 +441,35 @@ public void configure(final Env env, final Config conf, final Binder binder) {
     /** Annotated with: */
     serviceTypes.stream()
         .filter(A)
-        .forEach(a -> {
-          result.getNamesOfClassesWithAnnotation(a)
-              .stream()
-              .filter(once)
-              .map(loadClass)
-              .filter(C)
-              .forEach(bind);
-        });
+        .forEach(a -> result.getNamesOfClassesWithAnnotation(a)
+            .stream()
+            .filter(once)
+            .map(loadClass)
+            .filter(C)
+            .forEach(bind));
 
     /** Implements: */
     serviceTypes.stream()
         .filter(I)
         .filter(type -> type != Jooby.Module.class && type != Module.class && type != Service.class)
-        .forEach(i -> {
-          result.getNamesOfClassesImplementing(i)
-              .stream()
-              .filter(inPackage)
-              .filter(once)
-              .map(loadClass)
-              .filter(C)
-              .forEach(bind);
-        });
+        .forEach(i -> result.getNamesOfClassesImplementing(i)
+            .stream()
+            .filter(inPackage)
+            .filter(once)
+            .map(loadClass)
+            .filter(C)
+            .forEach(bind));
 
     /** SubclassOf: */
     serviceTypes.stream()
         .filter(S)
-        .forEach(k -> {
-          result.getNamesOfSubclassesOf(k)
-              .stream()
-              .filter(inPackage)
-              .filter(once)
-              .map(loadClass)
-              .filter(C)
-              .forEach(bind);
-        });
+        .forEach(k -> result.getNamesOfSubclassesOf(k)
+            .stream()
+            .filter(inPackage)
+            .filter(once)
+            .map(loadClass)
+            .filter(C)
+            .forEach(bind));
 
     /** Guice modules: */
     if (serviceTypes.contains(Module.class)) {
@@ -528,7 +520,7 @@ public Scanner scan(final Class<?> type) {
   }
 
   private static <T> T newObject(final Class<T> klass) {
-    return throwingSupplier(() -> klass.newInstance()).get();
+    return throwingSupplier(klass::newInstance).get();
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
@@ -542,7 +534,7 @@ private static void guavaServices(final Env env, final Binder binder,
     serviceTypes.forEach(guavaService);
     // lazy service manager
     AtomicReference<ServiceManager> sm = new AtomicReference<>();
-    Provider<ServiceManager> smProvider = () -> sm.get();
+    Provider<ServiceManager> smProvider = sm::get;
     binder.bind(ServiceManager.class).toProvider(smProvider);
     // ask Guice for services, create ServiceManager and start services
     env.onStart(r -> {
@@ -553,9 +545,7 @@ private static void guavaServices(final Env env, final Binder binder,
       sm.get().startAsync().awaitHealthy();
     });
     // stop services
-    env.onStop(() -> {
-      sm.get().stopAsync().awaitStopped();
-    });
+    env.onStop(() -> sm.get().stopAsync().awaitStopped());
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
