standalone jar (no dependencies) fix #633

Author: jknack

.travis.yml

@@ -3,4 +3,4 @@ language: java
 jdk:
   - oraclejdk8
 after_success:
-  - mvn clean cobertura:cobertura coveralls:cobertura
+  - mvn clean install cobertura:cobertura coveralls:cobertura

handlebars-guava-cache/src/main/java/com/github/jknack/handlebars/cache/GuavaTemplateCache.java

@@ -17,8 +17,6 @@
  */
 package com.github.jknack.handlebars.cache;
 
-import static org.apache.commons.lang3.Validate.notNull;
-
 import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 
@@ -28,6 +26,7 @@
 import com.github.jknack.handlebars.io.ReloadableTemplateSource;
 import com.github.jknack.handlebars.io.TemplateSource;
 import com.google.common.cache.Cache;
+import static java.util.Objects.requireNonNull;
 
 /**
  * An implementation of {@link TemplateCache} built on top of Guava. If {@link #setReload(boolean)}
@@ -53,7 +52,7 @@ public class GuavaTemplateCache implements TemplateCache {
    * @param cache The guava cache to use. Required.
    */
   public GuavaTemplateCache(final Cache<TemplateSource, Template> cache) {
-    this.cache = notNull(cache, "The cache is required.");
+    this.cache = requireNonNull(cache, "The cache is required.");
   }
 
   @Override
@@ -68,8 +67,8 @@ public void evict(final TemplateSource source) {
 
   @Override
   public Template get(final TemplateSource source, final Parser parser) throws IOException {
-    notNull(source, "The source is required.");
-    notNull(parser, "The parser is required.");
+    requireNonNull(source, "The source is required.");
+    requireNonNull(parser, "The parser is required.");
     try {
       return cache.get(key(source), () -> parser.parse(source));
     } catch (ExecutionException ex) {

handlebars-helpers/pom.xml

@@ -20,6 +20,12 @@
       <artifactId>handlebars</artifactId>
       <version>${project.version}</version>
     </dependency>
+
+    <!-- commons-lang3 -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>joda-time</groupId>

handlebars-humanize/src/main/java/com/github/jknack/handlebars/HumanizeHelper.java

@@ -17,15 +17,14 @@
  */
 package com.github.jknack.handlebars;
 
-import static org.apache.commons.lang3.Validate.isTrue;
-import static org.apache.commons.lang3.Validate.notNull;
 import humanize.Humanize;
 
 import java.io.IOException;
 import java.util.Date;
 import java.util.Locale;
 
 import com.github.jknack.handlebars.internal.Locales;
+import static java.util.Objects.requireNonNull;
 
 /**
  * Handlebars helper for the Humanize library.
@@ -51,7 +50,6 @@ public enum HumanizeHelper implements Helper<Object> {
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Number, "found '%s', expected: 'number'", value);
       return Humanize.binaryPrefix((Number) value, resolveLocale(options));
     }
   },
@@ -71,7 +69,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       Boolean capFirst = options.hash("capFirst", true);
       return Humanize.camelize((String) value, capFirst);
     }
@@ -92,7 +89,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       return Humanize.capitalize((String) value);
     }
   },
@@ -112,7 +108,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       String replacement = options.hash("replacement", " ");
       return Humanize.decamelize((String) value, replacement);
     }
@@ -133,7 +128,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Number, "found '%s', expected: 'number'", value);
       return Humanize.formatCurrency((Number) value, resolveLocale(options));
     }
   },
@@ -153,7 +147,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Number, "found '%s', expected: 'number'", value);
       return Humanize.formatPercent((Number) value, resolveLocale(options));
     }
   },
@@ -174,7 +167,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Number, "found '%s', expected: 'number'", value);
       return Humanize.metricPrefix((Number) value, resolveLocale(options));
     }
   },
@@ -194,7 +186,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Date, "found '%s', expected: 'date'", value);
       return Humanize.naturalDay((Date) value);
     }
   },
@@ -216,7 +207,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Date, "found '%s', expected: 'date'", value);
       return Humanize.naturalTime((Date) value, resolveLocale(options));
     }
   },
@@ -237,7 +227,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Number, "found '%s', expected: 'number'", value);
       return Humanize.ordinal((Number) value, resolveLocale(options));
     }
   },
@@ -291,7 +280,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       return Humanize.pluralizeFormat((String) value, resolveLocale(options))
           .render(options.params);
     }
@@ -326,7 +314,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       return Humanize.slugify((String) value);
     }
   },
@@ -347,7 +334,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Number, "found '%s', expected: 'number'", value);
       return Humanize.spellBigNumber((Number) value, resolveLocale(options));
     }
   },
@@ -368,7 +354,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof Number, "found '%s', expected: 'number'", value);
       return Humanize.spellDigit((Number) value, resolveLocale(options));
     }
   },
@@ -389,7 +374,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       return Humanize.titleize((String) value);
     }
   },
@@ -409,7 +393,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       return Humanize.transliterate((String) value);
     }
   },
@@ -429,7 +412,6 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       return Humanize.underscore((String) value);
     }
   },
@@ -450,11 +432,8 @@ public Object apply(final Object value, final Options options)
     @Override
     public Object apply(final Object value, final Options options)
         throws IOException {
-      isTrue(value instanceof String, "found '%s', expected: 'string'", value);
       Number length = options.param(0, null);
-      notNull(length, "found 'null', expected 'word wrap length'");
-      isTrue(length.intValue() > 0, "found '%s', expected 'a positive number'",
-          length);
+      requireNonNull(length, "found 'null', expected 'word wrap length'");
       return Humanize.wordWrap((String) value, length.intValue());
     }
   };
@@ -476,7 +455,6 @@ protected static Locale resolveLocale(final Options options) {
    * @param handlebars The helper's owner.
    */
   public static void register(final Handlebars handlebars) {
-    notNull(handlebars, "A handlebars object is required.");
     for (HumanizeHelper helper : values()) {
       handlebars.registerHelper(helper.name(), helper);
     }

handlebars-jackson2/src/main/java/com/github/jknack/handlebars/Jackson2Helper.java

@@ -17,10 +17,6 @@
  */
 package com.github.jknack.handlebars;
 
-import static org.apache.commons.lang3.StringUtils.isEmpty;
-import static org.apache.commons.lang3.Validate.notEmpty;
-import static org.apache.commons.lang3.Validate.notNull;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
@@ -32,6 +28,7 @@
 import com.fasterxml.jackson.core.io.SegmentedStringWriter;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import static java.util.Objects.requireNonNull;
 
 /**
  * A Jackson 2.x helper.
@@ -152,7 +149,7 @@ public SerializableString getEscapeSequence(final int ch) {
    * @param objectMapper The object's mapper. Required.
    */
   public Jackson2Helper(final ObjectMapper objectMapper) {
-    mapper = notNull(objectMapper, "The object mapper is required.");
+    mapper = requireNonNull(objectMapper, "The object mapper is required.");
   }
 
   /**
@@ -173,7 +170,7 @@ public Object apply(final Object context, final Options options)
     try {
       final ObjectWriter writer;
       // do we need to use a view?
-      if (!isEmpty(viewName)) {
+      if (!Handlebars.Utils.isEmpty(viewName)) {
         Class<?> viewClass = alias.get(viewName);
         if (viewClass == null) {
           viewClass = getClass().getClassLoader().loadClass(viewName);
@@ -225,8 +222,8 @@ public Object apply(final Object context, final Options options)
    */
   public Jackson2Helper viewAlias(final String alias,
       final Class<?> viewClass) {
-    this.alias.put(notEmpty(alias, "A view alias is required."),
-        notNull(viewClass, "A view class is required."));
+    this.alias.put(requireNonNull(alias, "A view alias is required."),
+        requireNonNull(viewClass, "A view class is required."));
     return this;
   }
 }

handlebars-springmvc/src/main/java/com/github/jknack/handlebars/springmvc/HandlebarsView.java

@@ -17,16 +17,14 @@
  */
 package com.github.jknack.handlebars.springmvc;
 
-import static org.apache.commons.lang3.Validate.notEmpty;
-import static org.apache.commons.lang3.Validate.notNull;
-
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import static java.util.Objects.requireNonNull;
 import org.springframework.web.servlet.view.AbstractTemplateView;
 
 import com.github.jknack.handlebars.Context;
@@ -86,7 +84,7 @@ public boolean checkResource(final Locale locale) {
    * @param template The compiled template. Required.
    */
   void setTemplate(final Template template) {
-    this.template = notNull(template, "A handlebars template is required.");
+    this.template = requireNonNull(template, "A handlebars template is required.");
   }
 
   /**
@@ -95,7 +93,7 @@ void setTemplate(final Template template) {
    * @param valueResolvers The value resolvers. Required.
    */
   void setValueResolver(final ValueResolver... valueResolvers) {
-    this.valueResolvers = notEmpty(valueResolvers,
+    this.valueResolvers = requireNonNull(valueResolvers,
         "At least one value-resolver must be present.");
   }
 

handlebars-springmvc/src/main/java/com/github/jknack/handlebars/springmvc/HandlebarsViewResolver.java

@@ -17,8 +17,7 @@
  */
 package com.github.jknack.handlebars.springmvc;
 
-import static org.apache.commons.lang3.Validate.notEmpty;
-import static org.apache.commons.lang3.Validate.notNull;
+import static java.util.Objects.requireNonNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -226,7 +225,7 @@ public void afterPropertiesSet() {
       TemplateLoader templateLoader = createTemplateLoader(getApplicationContext());
 
       // Creates a new handlebars object.
-      handlebars = notNull(createHandlebars(templateLoader),
+      handlebars = requireNonNull(createHandlebars(templateLoader),
               "A handlebars object is required.");
     }
 
@@ -335,7 +334,7 @@ public Handlebars getHandlebars() {
    * @param valueResolvers The value resolvers. Required.
    */
   public void setValueResolvers(final ValueResolver... valueResolvers) {
-    this.valueResolvers = notEmpty(valueResolvers,
+    this.valueResolvers = requireNonNull(valueResolvers,
         "At least one value-resolver must be present.");
   }
 
@@ -345,7 +344,7 @@ public void setValueResolvers(final ValueResolver... valueResolvers) {
    * @param formatters Formatters to add.
    */
   public void setFormatters(final Formatter... formatters) {
-    this.formatters = notEmpty(formatters,
+    this.formatters = requireNonNull(formatters,
         "At least one formatter must be present.");
   }
 
@@ -373,7 +372,7 @@ public void setFormatters(final Formatter... formatters) {
    * @param location A classpath location of the handlebar.js file.
    */
   public void setHandlebarsJsFile(final String location) {
-    this.handlebarsJsFile = notEmpty(location, "Location is required");
+    this.handlebarsJsFile = requireNonNull(location, "Location is required");
   }
 
   /**
@@ -393,7 +392,7 @@ public void setFailOnMissingFile(final boolean failOnMissingFile) {
    * @see Handlebars#registerHelper(String, Helper)
    */
   public void setHelpers(final Map<String, Helper<?>> helpers) {
-    notNull(helpers, "The helpers are required.");
+    requireNonNull(helpers, "The helpers are required.");
     for (Entry<String, Helper<?>> helper : helpers.entrySet()) {
       registry.registerHelper(helper.getKey(), helper.getValue());
     }
@@ -407,7 +406,7 @@ public void setHelpers(final Map<String, Helper<?>> helpers) {
    * @see Handlebars#registerHelpers(Object)
    */
   public void setHelperSources(final List<?> helpers) {
-    notNull(helpers, "The helpers are required.");
+    requireNonNull(helpers, "The helpers are required.");
     for (Object helper : helpers) {
       registry.registerHelpers(helper);
     }
@@ -607,7 +606,7 @@ public HandlebarsViewResolver registerDecorator(final String name, final Decorat
   }
 
   @Override public HandlebarsViewResolver setCharset(final Charset charset) {
-    this.charset = notNull(charset, "Charset required.");
+    this.charset = requireNonNull(charset, "Charset required.");
     return this;
   }
 }