throw container exception to support recording multiple errors during template rendering

jaredstehler · jaredstehler · commit babd66125c5c · 2015-03-02T11:30:31.000-05:00
diff --git a/src/main/java/com/hubspot/jinjava/Jinjava.java b/src/main/java/com/hubspot/jinjava/Jinjava.java
@@ -15,19 +15,23 @@
  **********************************************************************/
 package com.hubspot.jinjava;
 
+import java.util.Collection;
 import java.util.Map;
 import java.util.Properties;
 
 import javax.el.ExpressionFactory;
 
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
 import com.hubspot.jinjava.el.ExtendedSyntaxBuilder;
 import com.hubspot.jinjava.el.TruthyTypeConverter;
 import com.hubspot.jinjava.interpret.Context;
+import com.hubspot.jinjava.interpret.FatalTemplateErrorsException;
 import com.hubspot.jinjava.interpret.InterpretException;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.RenderResult;
 import com.hubspot.jinjava.interpret.TemplateError;
-import com.hubspot.jinjava.interpret.TemplateError.ErrorReason;
+import com.hubspot.jinjava.interpret.TemplateError.ErrorType;
 import com.hubspot.jinjava.loader.CascadingResourceLocator;
 import com.hubspot.jinjava.loader.ClasspathResourceLocator;
 import com.hubspot.jinjava.loader.FileLocator;
@@ -136,12 +140,15 @@ public ResourceLocator getResourceLocator() {
   public String render(String template, Map<String, ?> bindings) {
     RenderResult result = renderForResult(template, bindings);
 
-    if(!result.getErrors().isEmpty()) {
-      for(TemplateError err : result.getErrors()) {
-        if(err.getReason() == ErrorReason.SYNTAX_ERROR) {
-          throw new InterpretException(err.getMessage(), err.getException(), err.getLineno());
-        }
+    Collection<TemplateError> fatalErrors = Collections2.filter(result.getErrors(), new Predicate<TemplateError>() {
+      @Override
+      public boolean apply(TemplateError input) {
+        return input.getSeverity() == ErrorType.FATAL;
       }
+    });
+    
+    if(!fatalErrors.isEmpty()) {
+      throw new FatalTemplateErrorsException(template, fatalErrors);
     }
     
     return result.getOutput();
diff --git a/src/main/java/com/hubspot/jinjava/interpret/FatalTemplateErrorsException.java b/src/main/java/com/hubspot/jinjava/interpret/FatalTemplateErrorsException.java
@@ -0,0 +1,38 @@
+package com.hubspot.jinjava.interpret;
+
+/**
+ * Container exception thrown when fatal errors are encountered while rendering a template.
+ * 
+ * @author jstehler
+ */
+public class FatalTemplateErrorsException extends InterpretException {
+  private static final long serialVersionUID = 1L;
+
+  private final String template;
+  private final Iterable<TemplateError> errors;
+
+  public FatalTemplateErrorsException(String template, Iterable<TemplateError> errors) {
+    super(generateMessage(errors));
+    this.template = template;
+    this.errors = errors;
+  }
+
+  private static String generateMessage(Iterable<TemplateError> errors) {
+    StringBuilder msg = new StringBuilder();
+    
+    for(TemplateError error : errors) {
+      msg.append(error.toString()).append('\n');
+    }
+    
+    return msg.toString();
+  }
+
+  public String getTemplate() {
+    return template;
+  }
+  
+  public Iterable<TemplateError> getErrors() {
+    return errors;
+  }
+  
+}
diff --git a/src/main/java/com/hubspot/jinjava/interpret/TemplateError.java b/src/main/java/com/hubspot/jinjava/interpret/TemplateError.java
@@ -19,15 +19,21 @@ public enum ErrorReason { SYNTAX_ERROR, UNKNOWN, BAD_URL, EXCEPTION, MISSING, OT
   private final Exception exception;
   
   public static TemplateError fromSyntaxError(InterpretException ex) {
-    return new TemplateError(ErrorType.FATAL, ErrorReason.SYNTAX_ERROR, ExceptionUtils.getRootCauseMessage(ex), null, ex.getLineNumber(), ex);
+    return new TemplateError(ErrorType.FATAL, ErrorReason.SYNTAX_ERROR, ExceptionUtils.getMessage(ex), null, ex.getLineNumber(), ex);
   }
 
   public static TemplateError fromException(Exception ex) {
-    return new TemplateError(ErrorType.FATAL, ErrorReason.EXCEPTION, ExceptionUtils.getRootCauseMessage(ex), null, null, ex);
+    int lineNumber = -1;
+    
+    if(ex instanceof InterpretException) {
+      lineNumber = ((InterpretException) ex).getLineNumber();
+    }
+    
+    return new TemplateError(ErrorType.FATAL, ErrorReason.EXCEPTION, ExceptionUtils.getMessage(ex), null, lineNumber, ex);
   }
   
   public static TemplateError fromException(Exception ex, int lineNumber) {
-    return new TemplateError(ErrorType.FATAL, ErrorReason.EXCEPTION, ExceptionUtils.getRootCauseMessage(ex), null, lineNumber, ex);
+    return new TemplateError(ErrorType.FATAL, ErrorReason.EXCEPTION, ExceptionUtils.getMessage(ex), null, lineNumber, ex);
   }
   
   public static TemplateError fromUnknownProperty(Object base, String variable, int lineNumber) {
