checkstyle upgrade

Author: jknack

handlebars-helpers/src/main/java/com/github/jknack/handlebars/helper/JodaHelper.java

@@ -96,6 +96,6 @@ public Object apply(final ReadableInstant time, final Options options) throws IO
    *          Any formatting options, such as the Pattern, Style, or ISO format.
    * @return The String result.
    */
-  protected abstract CharSequence safeApply(final ReadableInstant time, final Options options);
+  protected abstract CharSequence safeApply(ReadableInstant time, Options options);
 
 }

handlebars-helpers/src/main/java/com/github/jknack/handlebars/helper/NumberHelper.java

@@ -101,8 +101,7 @@ public Object apply(final Object context, final Options options)
    *        The options object.
    * @return A string result.
    */
-  protected abstract CharSequence safeApply(final Number value,
-      final Options options);
+  protected abstract CharSequence safeApply(Number value, Options options);
 
   /**
    * Apply the helper to the context.

handlebars-proto/src/main/java/com/github/jknack/handlebars/server/HbsServlet.java

@@ -296,17 +296,16 @@ private void fancyError(final Object error, final int firstLine, final String la
 
     Template template = handlebars.compile("/error-pages/error");
 
-    PrintWriter writer = null;
-    writer = response.getWriter();
+    PrintWriter writer = response.getWriter();
     template.apply(
         Context
             .newBuilder(error)
             .resolver(MapValueResolver.INSTANCE, FieldValueResolver.INSTANCE,
                 JavaBeanValueResolver.INSTANCE)
             .combine("lang", lang)
             .combine("version", HbsServer.version)
-            .combine("firstLine", firstLine).build()
-        , writer);
+            .combine("firstLine", firstLine).build(),
+        writer);
 
     IOUtils.closeQuietly(writer);
   }

handlebars/src/main/java/com/github/jknack/handlebars/Context.java

@@ -188,7 +188,7 @@ private static class CompositeValueResolver implements ValueResolver {
      *
      * @param resolvers The value resolvers.
      */
-    public CompositeValueResolver(final ValueResolver... resolvers) {
+    CompositeValueResolver(final ValueResolver... resolvers) {
       this.resolvers = resolvers;
     }
 
@@ -350,7 +350,7 @@ private static class PathExpressionChain implements PathExpression.Chain {
      *
      * @param path Expression path.
      */
-    public PathExpressionChain(final List<PathExpression> path) {
+    PathExpressionChain(final List<PathExpression> path) {
       this.path = path;
     }
 

handlebars/src/main/java/com/github/jknack/handlebars/HelperRegistry.java

@@ -86,7 +86,7 @@ public interface HelperRegistry {
    * @param helper The helper object. Required.
    * @return This handlebars.
    */
-  <H> HelperRegistry registerHelperMissing(final Helper<H> helper);
+  <H> HelperRegistry registerHelperMissing(Helper<H> helper);
 
   /**
    * <p>

handlebars/src/main/java/com/github/jknack/handlebars/ParserFactory.java

@@ -33,6 +33,5 @@ public interface ParserFactory {
    * @param endDelimiter The end delimiter.
    * @return A new {@link Parser}.
    */
-  Parser create(final Handlebars handlebars, final String startDelimiter,
-      final String endDelimiter);
+  Parser create(Handlebars handlebars, String startDelimiter, String endDelimiter);
 }

handlebars/src/main/java/com/github/jknack/handlebars/Template.java

@@ -167,7 +167,7 @@ public List<String> collectReferenceParameters() {
    * @param <S> The template type.
    * @return A new {@link TypeSafeTemplate}.
    */
-  <T, S extends TypeSafeTemplate<T>> S as(final Class<S> type);
+  <T, S extends TypeSafeTemplate<T>> S as(Class<S> type);
 
   /**
    * Creates a new {@link TypeSafeTemplate}.

handlebars/src/main/java/com/github/jknack/handlebars/context/FieldValueResolver.java

@@ -106,7 +106,7 @@ private static class FieldMember extends AccessibleObject implements FieldWrappe
     /**
      * @param field The field object.
      */
-    public FieldMember(final Field field) {
+    FieldMember(final Field field) {
       this.field = field;
     }
 

handlebars/src/main/java/com/github/jknack/handlebars/helper/I18nHelper.java

@@ -368,7 +368,7 @@ public static class UTF8Control extends ResourceBundle.Control {
      *
      * @param charset Charset.
      */
-    public UTF8Control(final Charset charset) {
+    UTF8Control(final Charset charset) {
       this.charset = charset;
     }
     @Override
@@ -402,7 +402,7 @@ public ResourceBundle newBundle(final String baseName, final Locale locale, fina
    * @param locale The locale.
    * @param classLoader The classloader.
    */
-  public DefI18nSource(final Charset charset, final String baseName, final Locale locale,
+  DefI18nSource(final Charset charset, final String baseName, final Locale locale,
       final ClassLoader classLoader) {
     bundle = ResourceBundle.getBundle(baseName, locale, classLoader, new UTF8Control(charset));
   }

handlebars/src/main/java/com/github/jknack/handlebars/helper/StringHelpers.java

@@ -17,9 +17,12 @@
  */
 package com.github.jknack.handlebars.helper;
 
-import static org.apache.commons.lang3.Validate.isTrue;
-import static org.apache.commons.lang3.Validate.notNull;
-import static org.apache.commons.lang3.Validate.validIndex;
+import com.github.jknack.handlebars.Handlebars;
+import com.github.jknack.handlebars.Helper;
+import com.github.jknack.handlebars.Options;
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.WordUtils;
 
 import java.io.IOException;
 import java.math.RoundingMode;
@@ -37,13 +40,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang3.LocaleUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import com.github.jknack.handlebars.Handlebars;
-import com.github.jknack.handlebars.Helper;
-import com.github.jknack.handlebars.Options;
-import org.apache.commons.text.WordUtils;
+import static org.apache.commons.lang3.Validate.isTrue;
+import static org.apache.commons.lang3.Validate.notNull;
+import static org.apache.commons.lang3.Validate.validIndex;
 
 /**
  * Commons string function helpers.
@@ -521,8 +520,7 @@ protected CharSequence safeApply(final Object context, final Options options) {
      * The default date styles.
      */
     @SuppressWarnings("serial")
-    private Map<String, Integer> styles = new HashMap<String, Integer>()
-    {
+    private Map<String, Integer> styles = new HashMap<String, Integer>() {
       {
         put("full", DateFormat.FULL);
         put("long", DateFormat.LONG);
@@ -718,7 +716,7 @@ public Object apply(final Object context, final Options options) throws IOExcept
    * @param options The options object.
    * @return A string result.
    */
-  protected abstract CharSequence safeApply(final Object context, final Options options);
+  protected abstract CharSequence safeApply(Object context, Options options);
 
   /**
    * Register the helper in a handlebars instance.