cleanup-jooby-hbs (jooby-project#1178)

feffi · jknack · commit 6b220522b20c · 2018-06-25T13:13:41.000-03:00
* fixed minor code issues (cherry picked from commit c799ac4) * added missing import
diff --git a/modules/jooby-hbs/src/main/java/org/jooby/hbs/Hbs.java b/modules/jooby-hbs/src/main/java/org/jooby/hbs/Hbs.java
@@ -205,12 +205,10 @@
 
 import static java.util.Objects.requireNonNull;
 
-import java.util.Deque;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Set;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.Collections;
 
 import org.jooby.Env;
 import org.jooby.Jooby;
@@ -353,9 +351,9 @@ public class Hbs implements Jooby.Module {
 
   private BiConsumer<Handlebars, Config> callback;
 
-  private Set<Class<?>> helpers = new HashSet<>();
+  private final Set<Class<?>> helpers = new HashSet<>();
 
-  private Deque<ValueResolver> resolvers = new LinkedList<>();
+  private final Deque<ValueResolver> resolvers = new LinkedList<>();
 
   /**
    * Creates a new {@link Hbs} module.
@@ -440,9 +438,7 @@ public Hbs doWith(final Consumer<Handlebars> callback) {
    * @return This module.
    */
   public Hbs with(final Class<?>... helper) {
-    for (Class<?> h : helper) {
-      helpers.add(h);
-    }
+    Collections.addAll(helpers, helper);
     return this;
   }
 
diff --git a/modules/jooby-hbs/src/main/java/org/jooby/internal/hbs/HbsEngine.java b/modules/jooby-hbs/src/main/java/org/jooby/internal/hbs/HbsEngine.java
@@ -219,9 +219,9 @@
 
 public class HbsEngine implements View.Engine {
 
-  private Handlebars handlebars;
+  private final Handlebars handlebars;
 
-  private ValueResolver[] resolvers;
+  private final ValueResolver[] resolvers;
 
   public HbsEngine(final Handlebars handlebars, final ValueResolver[] resolvers) {
     this.handlebars = requireNonNull(handlebars, "Handlebars is required.");
diff --git a/modules/jooby-hbs/src/main/java/org/jooby/internal/hbs/HbsHelpers.java b/modules/jooby-hbs/src/main/java/org/jooby/internal/hbs/HbsHelpers.java
@@ -214,6 +214,6 @@ public class HbsHelpers {
 
   @Inject
   public HbsHelpers(final Handlebars hbs, @Named("hbs.helpers") final Set<Object> helpers) {
-    helpers.forEach(h -> hbs.registerHelpers(h));
+    helpers.forEach(hbs::registerHelpers);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -214,6 +214,6 @@ public class HbsHelpers {`
`214`	`214`
`215`	`215`	`@Inject`
`216`	`216`	`public HbsHelpers(final Handlebars hbs, @Named("hbs.helpers") final Set<Object> helpers) {`
`217`		`- helpers.forEach(h -> hbs.registerHelpers(h));`
	`217`	`+ helpers.forEach(hbs::registerHelpers);`
`218`	`218`	`}`
`219`	`219`	`}`