code cleanup

- remove deprecated API calls
- some minor java 8 cleanups

Author: jknack

.travis.yml

@@ -3,6 +3,6 @@ language: java
 jdk:
   - oraclejdk8
 script:
-  - mvn clean package coveralls:report -P coverage
+  - mvn clean install coveralls:report -P coverage
 after_success:
   - bash <(curl -s https://codecov.io/bash)

handlebars/pom.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
     <groupId>com.github.jknack</groupId>
@@ -32,7 +33,8 @@
               <minimizeJar>true</minimizeJar>
               <artifactSet>
                 <includes>
-                  <include>org.apache.commons:commons-lang3:</include>
+                  <include>org.apache.commons:commons-lang3</include>
+                  <include>org.apache.commons:commons-text</include>
                   <include>org.antlr:antlr4-runtime</include>
                 </includes>
               </artifactSet>
@@ -41,6 +43,10 @@
                   <pattern>org.apache.commons.lang3</pattern>
                   <shadedPattern>com.github.jknack.handlebars.internal.lang3</shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>org.apache.commons.text</pattern>
+                  <shadedPattern>com.github.jknack.handlebars.internal.text</shadedPattern>
+                </relocation>
                 <relocation>
                   <pattern>org.antlr.v4.runtime</pattern>
                   <shadedPattern>com.github.jknack.handlebars.internal.antlr</shadedPattern>
@@ -147,6 +153,12 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-text</artifactId>
+      <optional>true</optional>
+    </dependency>
+
     <!-- ANTLRv4 -->
     <dependency>
       <groupId>org.antlr</groupId>
@@ -233,6 +245,21 @@
   </properties>
 
   <profiles>
+    <profile>
+      <id>Xlint</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+              <compilerArgs>
+                <arg>-Xlint</arg>
+              </compilerArgs>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>coverage</id>
       <build>
@@ -244,8 +271,8 @@
             <configuration>
               <includes>
                 <include>**/*Test.java</include>
-                <include>**/*Hbs.java</include>
-                <include>**/*Issue*.java</include>
+                <include>**/Hbs*.java</include>
+                <include>**/Issue*.java</include>
               </includes>
               <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
               <systemPropertyVariables>

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

@@ -17,8 +17,11 @@
  */
 package com.github.jknack.handlebars;
 
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.text.translate.LookupTranslator;
+import org.apache.commons.text.StringEscapeUtils;
+import org.apache.commons.text.translate.LookupTranslator;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <p>
@@ -63,6 +66,15 @@ class Hbs implements EscapingStrategy {
      * @param escapeMap A escape map.
      */
     public Hbs(final String[][] escapeMap) {
+      this(escapeMap(escapeMap));
+    }
+
+    /**
+     * Creates a new {@link Hbs} escaping strategy.
+     *
+     * @param escapeMap A escape map.
+     */
+    public Hbs(final Map<CharSequence, CharSequence> escapeMap) {
       translator = new LookupTranslator(escapeMap);
     }
 
@@ -74,6 +86,19 @@ public CharSequence escape(final CharSequence value) {
       return value == null || value.length() == 0 ? EMPTY : translator.translate(value);
     }
 
+    /**
+     * Convert a table to a hash (internal usage).
+     *
+     * @param table Table.
+     * @return A hash.
+     */
+    private static Map<CharSequence, CharSequence> escapeMap(final String[][] table) {
+      Map<CharSequence, CharSequence> result = new HashMap<>();
+      for (String[] row : table) {
+        result.put(row[0], row[1]);
+      }
+      return result;
+    }
   }
 
   /**
@@ -110,7 +135,7 @@ public CharSequence escape(final CharSequence value) {
 
   /** Escape variable for XML. */
   EscapingStrategy XML = value ->
-    value == null ? null : StringEscapeUtils.escapeXml(value.toString());
+    value == null ? null : StringEscapeUtils.escapeXml11(value.toString());
 
   /** Escape variable for JavaScript. */
   EscapingStrategy JS = value ->

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

@@ -39,11 +39,11 @@
 
 import org.apache.commons.lang3.LocaleUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.text.WordUtils;
 
 import com.github.jknack.handlebars.Handlebars;
 import com.github.jknack.handlebars.Helper;
 import com.github.jknack.handlebars.Options;
+import org.apache.commons.text.WordUtils;
 
 /**
  * Commons string function helpers.
@@ -459,8 +459,8 @@ protected CharSequence safeApply(final Object value, final Options options) {
   replace {
     @Override
     public CharSequence safeApply(final Object value, final Options options) {
-      String target = (String) options.param(0, null);
-      String replacement = (String) options.param(1, null);
+      String target = options.param(0, null);
+      String replacement = options.param(1, null);
       return value.toString().replace(target, replacement);
     }
   },

handlebars/src/main/java/com/github/jknack/handlebars/internal/FastStringWriter.java

@@ -17,11 +17,11 @@
  */
 package com.github.jknack.handlebars.internal;
 
+import org.apache.commons.text.TextStringBuilder;
+
 import java.io.IOException;
 import java.io.Writer;
 
-import org.apache.commons.lang3.text.StrBuilder;
-
 /**
  * A string writer without locking.
  *
@@ -42,7 +42,7 @@ class FastStringWriter extends Writer {
   /**
    * The internal buffer.
    */
-  private StrBuilder buffer = new StrBuilder(BUFFER_SIZE);
+  private TextStringBuilder buffer = new TextStringBuilder(BUFFER_SIZE);
 
   @Override
   public Writer append(final char c) throws IOException {

handlebars/src/main/java/com/github/jknack/handlebars/internal/HbsParserFactory.java

@@ -20,7 +20,8 @@
 import java.io.IOException;
 
 import org.antlr.v4.runtime.ANTLRErrorListener;
-import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonToken;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.LexerNoViableAltException;
@@ -68,11 +69,12 @@ public Parser create(final Handlebars handlebars,
       @Override
       public Template parse(final TemplateSource source) throws IOException {
         logger.debug("About to parse: {}", source);
-        final ANTLRErrorListener errorReporter = new HbsErrorReporter(source.filename());
+        String sourceName = source.filename();
+        final ANTLRErrorListener errorReporter = new HbsErrorReporter(sourceName);
 
         // 1. Lexer
-        final HbsLexer lexer = newLexer(newStream(source.filename(),
-            source.content(handlebars.getCharset())), startDelimiter, endDelimiter);
+        String content = source.content(handlebars.getCharset());
+        final HbsLexer lexer = newLexer(CharStreams.fromString(content, sourceName), startDelimiter, endDelimiter);
         configure(lexer, errorReporter);
 
         // 2. Parser
@@ -97,7 +99,7 @@ public Template parse(final TemplateSource source) throws IOException {
         /**
          * Build the AST.
          */
-        TemplateBuilder<Template> builder = new TemplateBuilder<Template>(handlebars, source) {
+        TemplateBuilder builder = new TemplateBuilder(handlebars, source) {
           @Override
           protected void reportError(final CommonToken offendingToken, final int line,
               final int column,
@@ -113,21 +115,6 @@ protected void reportError(final CommonToken offendingToken, final int line,
     };
   }
 
-  /**
-   * Creates a new {@link ANTLRInputStream}.
-   *
-   * @param filename The file's name.
-   * @param content A content.
-   * @return A new {@link ANTLRInputStream}.
-   * @throws IOException If the reader can't be open.
-   */
-  private ANTLRInputStream newStream(final String filename, final String content)
-      throws IOException {
-    ANTLRInputStream stream = new ANTLRInputStream(content);
-    stream.name = filename;
-    return stream;
-  }
-
   /**
    * Creates a new {@link HbsLexer}.
    *
@@ -136,7 +123,7 @@ private ANTLRInputStream newStream(final String filename, final String content)
    * @param endDelimiter The end delimiter.
    * @return A new {@link HbsLexer}.
    */
-  private HbsLexer newLexer(final ANTLRInputStream stream, final String startDelimiter,
+  private HbsLexer newLexer(final CharStream stream, final String startDelimiter,
       final String endDelimiter) {
     return new HbsLexer(stream, startDelimiter, endDelimiter) {
 

handlebars/src/main/java/com/github/jknack/handlebars/internal/TemplateBuilder.java

@@ -80,10 +80,9 @@
  * Traverse the parse tree and build templates.
  *
  * @author edgar.espina
- * @param <it>
  * @since 0.10.0
  */
-abstract class TemplateBuilder<it> extends HbsParserBaseVisitor<Object> {
+abstract class TemplateBuilder extends HbsParserBaseVisitor<Object> {
 
   /**
    * Get partial info: static vs dynamic.
@@ -171,7 +170,7 @@ public Template visitRawBlock(final RawBlockContext ctx) {
 
     hasTag(true);
     Block block = new Block(handlebars, name, false, "{{", params(sexpr.param()),
-        hash(sexpr.hash()), Collections.<String> emptyList());
+        hash(sexpr.hash()), Collections.emptyList());
 
     if (block.paramSize > 0) {
       paramStack.addLast(block.params.get(0).toString());
@@ -304,8 +303,8 @@ public Template visitUnless(final UnlessContext ctx) {
       reportError(null, ctx.nameEnd.getLine(), ctx.nameEnd.getCharPositionInLine(),
           String.format("found: '%s', expected: '%s'", nameEnd, name));
     }
-    Block block = new Block(handlebars, name, true, "^", Collections.<Param> emptyList(),
-        Collections.<String, Param> emptyMap(), blockParams(ctx.blockParams()));
+    Block block = new Block(handlebars, name, true, "^", Collections.emptyList(),
+        Collections.emptyMap(), blockParams(ctx.blockParams()));
     block.filename(source.filename());
     block.position(nameStart.getLine(), nameStart.getCharPositionInLine());
     String startDelim = ctx.start.getText();
@@ -388,7 +387,7 @@ private Variable newVar(final Token name, final TagType varType, final List<Para
     String[] parts = varName.split("\\./");
     // TODO: try to catch this with ANTLR...
     // foo.0 isn't allowed, it must be foo.0.
-    if (parts.length > 0 && NumberUtils.isNumber(parts[parts.length - 1])
+    if (parts.length > 0 && NumberUtils.isCreatable(parts[parts.length - 1])
         && !varName.endsWith(".")) {
       String evidence = varName;
       String reason = "found: " + varName + ", expecting: " + varName + ".";

pom.xml

@@ -68,6 +68,12 @@
         <version>3.7</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-text</artifactId>
+        <version>1.3</version>
+      </dependency>
+
       <!-- Guava -->
       <dependency>
         <groupId>com.google.guava</groupId>