[maven-release-plugin] prepare release j2html-1.4.0

* Do not indent textarea contents.

Fixes #102

* Restore import style

* Handle <pre> and TagCreator::each

README.md

@@ -13,12 +13,12 @@ The project webpage is [j2html.com](http://j2html.com).
 <dependency>
     <groupId>com.j2html</groupId>
     <artifactId>j2html</artifactId>
-    <version>1.2.2</version>
+    <version>1.3.0</version>
 </dependency>
 ```
 ### Or the gradle dependency
 ```
-compile 'com.j2html:j2html:1.2.2'
+compile 'com.j2html:j2html:1.3.0'
 ```
 
 ### Import TagCreator and start building HTML

pom.xml

@@ -10,7 +10,7 @@
 
     <groupId>com.j2html</groupId>
     <artifactId>j2html</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.4.0</version>
 
     <name>j2html</name>
     <description>Java to HTML builder with a fluent API</description>
@@ -93,9 +93,6 @@
                     <source>1.8</source>
                     <target>1.8</target>
                     <optimize>true</optimize>
-                    <compilerArgs>
-                        <arg>-parameters</arg>
-                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
@@ -125,6 +122,33 @@
                 <configuration>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <archive>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.0</version>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/j2html/Config.java

@@ -10,29 +10,27 @@ import java.util.Collections;
 
 public class Config {
 
-    private static String FOUR_SPACES = "    ";
-
-    private Config() {
-    }
-
     /**
      * Change this to configure text-escaping
      * For example, to disable escaping, do <code>{@code Config.textEscaper = text -> text;}</code>
      */
     public static TextEscaper textEscaper = EscapeUtil::escape;
-
     /**
      * Change this to configure css-minification.
      * The default minifier is https://github.com/barryvan/CSSMin
      */
     public static Minifier cssMinifier = CSSMin::compressCss;
-
     /**
      * Change this to configure js-minification.
      * The default minifier is a simple whitespace/newline stripper
      */
     public static Minifier jsMinifier = JSMin::compressJs;
-
+    /**
+     * Change this to configure enable/disable closing empty tags
+     * The default is to NOT close them
+     */
+    public static boolean closeEmptyTags = false;
+    private static String FOUR_SPACES = "    ";
     /**
      * Change this to configure indentation when rendering formatted html
      * The default is four spaces
@@ -40,10 +38,7 @@ public class Config {
     public static Indenter indenter = (level, text) -> String.join("", Collections.nCopies(level, FOUR_SPACES)) + text;
 
 
-    /**
-     * Change this to configure enable/disable closing empty tags
-     * The default is to NOT close them
-     */
-    public static boolean closeEmptyTags = false;
+    private Config() {
+    }
 
 }

src/main/java/j2html/TagCreator.java

@@ -10,9 +10,15 @@ import j2html.tags.Text;
 import j2html.tags.UnescapedText;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class TagCreator {
 
@@ -31,6 +37,23 @@ public class TagCreator {
         return condition ? ifValue : null;
     }
 
+    /**
+     * Generic if-expression to if'ing inside method calls
+     *
+     * @param optional   The item that may be present
+     * @param ifFunction The function that will be called if that optional is present
+     * @param <T>        The derived generic parameter type
+     * @param <U>        The supplying generic parameter type
+     * @return transformed value if condition is true, null otherwise
+     */
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    public static <T, U> T iff(Optional<U> optional, Function<U, T> ifFunction) {
+        if (Objects.nonNull(optional) && optional.isPresent()) {
+            return optional.map(ifFunction).orElse(null);
+        }
+        return null;
+    }
+
     /**
      * Like {@link j2html.TagCreator#iff}, but returns else-value instead of null
      */
@@ -61,6 +84,17 @@ public class TagCreator {
         return DomContentJoiner.join(" ", true, stringOrDomObjects);
     }
 
+    /**
+     * Creates a DomContent object containing HTML elements from a stream.
+     * Intended usage: {@literal each(numbers.stream().map(n -> li(n.toString())))}
+     *
+     * @param stream the stream of DomContent elements
+     * @return DomContent containing elements from the stream
+     */
+    public static DomContent each(Stream<DomContent> stream) {
+        return new ContainerTag(null).with(stream);
+    }
+
     /**
      * Creates a DomContent object containing HTML using a mapping function on a collection
      * Intended usage: {@literal each(numbers, n -> li(n.toString()))}
@@ -68,10 +102,28 @@ public class TagCreator {
      * @param <T>        The derived generic parameter type
      * @param collection the collection to iterate over, ex: a list of values "1, 2, 3"
      * @param mapper     the mapping function, ex: {@literal "n -> li(n.toString())"}
-     * @return rawHtml containing mapped data {@literal (ex. docs: <li>1</li><li>2</li><li>3</li>)}
+     * @return DomContent containing mapped data {@literal (ex. docs: [li(1), li(2), li(3)])}
      */
     public static <T> DomContent each(Collection<T> collection, Function<? super T, DomContent> mapper) {
-        return rawHtml(collection.stream().map(mapper.andThen(DomContent::render)).collect(Collectors.joining()));
+        return tag(null).with(collection.stream().map(mapper));
+    }
+
+    public static <I, T> DomContent each(final Map<I, T> map, final Function<Entry<I, T>, DomContent> mapper) {
+        return rawHtml(map.entrySet().stream().map(mapper.andThen(DomContent::render)).collect(Collectors.joining()));
+    }
+
+    /**
+     * Creates a DomContent object containing HTML using a mapping function on a map
+     * Intended usage: {@literal each(idsToNames, (id, name) -> li(id + " " + name))}
+     *
+     * @param <I>    The type of the keys
+     * @param <T>    The type of the values
+     * @param map    the map to iterate over, ex: a map of values { 1: "Tom", 2: "Dick", 3: "Harry" }
+     * @param mapper the mapping function, ex: {@literal "(id, name) -> li(id + " " + name)"}
+     * @return DomContent containing mapped data {@literal (ex. docs: [li(1 Tom), li(2 Dick), li(3 Harry)])}
+     */
+    public static <I, T> DomContent each(final Map<I, T> map, final BiFunction<I, T, DomContent> mapper) {
+        return rawHtml(map.entrySet().stream().map(entry -> mapper.andThen(DomContent::render).apply(entry.getKey(), entry.getValue())).collect(Collectors.joining()));
     }
 
     /**

src/main/java/j2html/attributes/Attr.java

@@ -4,62 +4,6 @@ import j2html.tags.Tag;
 
 public class Attr {
 
-    public static class ShortForm {
-        String id;
-        String classes;
-
-        private ShortForm(String id, String classes) {
-            this.id = id;
-            this.classes = classes;
-        }
-
-        boolean hasId() {
-            return id != null && !"".equals(id);
-        }
-
-        boolean hasClasses() {
-            return classes != null && !"".equals(classes);
-        }
-    }
-
-    public static ShortForm shortFormFromAttrsString(String attrs) {
-        if (!attrs.contains(".") && !attrs.contains(("#"))) {
-            throw new IllegalArgumentException("String must contain either id (#) or class (.)");
-        }
-        if (attrs.split("#").length > 2) {
-            throw new IllegalArgumentException("Only one id (#) allowed");
-        }
-        String id = "";
-        StringBuilder classes = new StringBuilder();
-        for (String attr : attrs.split("\\.")) {
-            if (attr.contains("#")) {
-                if (!attr.startsWith("#")) {
-                    throw new IllegalArgumentException("# cannot be in the middle of string");
-                }
-                id = attr.replace("#", "");
-            } else {
-                classes.append(attr).append(" ");
-            }
-        }
-        return new ShortForm(id.trim(), classes.toString().trim());
-    }
-
-    public static <T extends Tag<T>> T addTo(T tag, ShortForm shortForm) {
-        if (shortForm.hasId() && shortForm.hasClasses()) {
-            return tag.withId(shortForm.id).withClass(shortForm.classes);
-        }
-        if (shortForm.hasId()) {
-            return tag.withId(shortForm.id);
-        }
-        if (shortForm.hasClasses()) {
-            return tag.withClass(shortForm.classes);
-        }
-        return tag;
-    }
-
-    private Attr() {
-    }
-
     public static final String ACCEPT = "accept";
     public static final String ACCEPT_CHARSET = "accept-charset";
     public static final String ACCESSKEY = "accesskey";
@@ -170,5 +114,60 @@ public class Attr {
     public static final String VALUE = "value";
     public static final String WIDTH = "width";
     public static final String WRAP = "wrap";
+    private Attr() {
+    }
+
+    public static ShortForm shortFormFromAttrsString(String attrs) {
+        if (!attrs.contains(".") && !attrs.contains(("#"))) {
+            throw new IllegalArgumentException("String must contain either id (#) or class (.)");
+        }
+        if (attrs.split("#").length > 2) {
+            throw new IllegalArgumentException("Only one id (#) allowed");
+        }
+        String id = "";
+        StringBuilder classes = new StringBuilder();
+        for (String attr : attrs.split("\\.")) {
+            if (attr.contains("#")) {
+                if (!attr.startsWith("#")) {
+                    throw new IllegalArgumentException("# cannot be in the middle of string");
+                }
+                id = attr.replace("#", "");
+            } else {
+                classes.append(attr).append(" ");
+            }
+        }
+        return new ShortForm(id.trim(), classes.toString().trim());
+    }
+
+    public static <T extends Tag<T>> T addTo(T tag, ShortForm shortForm) {
+        if (shortForm.hasId() && shortForm.hasClasses()) {
+            return tag.withId(shortForm.id).withClass(shortForm.classes);
+        }
+        if (shortForm.hasId()) {
+            return tag.withId(shortForm.id);
+        }
+        if (shortForm.hasClasses()) {
+            return tag.withClass(shortForm.classes);
+        }
+        return tag;
+    }
+
+    public static class ShortForm {
+        String id;
+        String classes;
+
+        private ShortForm(String id, String classes) {
+            this.id = id;
+            this.classes = classes;
+        }
+
+        boolean hasId() {
+            return id != null && !"".equals(id);
+        }
+
+        boolean hasClasses() {
+            return classes != null && !"".equals(classes);
+        }
+    }
 
 }

src/main/java/j2html/attributes/LambdaAttribute.java

@@ -1,24 +0,0 @@
-package j2html.attributes;
-
-import j2html.reflection.MethodFinder;
-import java.util.function.Function;
-
-public interface LambdaAttribute extends MethodFinder, Function<String, Object> {
-
-    default String name() {
-        checkParametersEnabled();
-        return parameter(0).getName();
-    }
-
-    default String value() {
-        checkParametersEnabled();
-        return String.valueOf(this.apply(name()));
-    }
-
-    default void checkParametersEnabled() {
-        if ("arg0".equals(parameter(0).getName())) {
-            throw new IllegalStateException("You need java 8u60 or newer for parameter reflection to work");
-        }
-    }
-
-}

src/main/java/j2html/reflection/MethodFinder.java

@@ -1,48 +0,0 @@
-package j2html.reflection;
-
-// Written by Benjamin Weber (http://benjiweber.co.uk/blog/author/benji/)
-
-import java.io.Serializable;
-import java.lang.invoke.SerializedLambda;
-import java.lang.reflect.Method;
-import java.lang.reflect.Parameter;
-import java.util.Arrays;
-import java.util.Objects;
-
-public interface MethodFinder extends Serializable {
-
-    default SerializedLambda serialized() {
-        try {
-            Method replaceMethod = getClass().getDeclaredMethod("writeReplace");
-            replaceMethod.setAccessible(true);
-            return (SerializedLambda) replaceMethod.invoke(this);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    default Class<?> getContainingClass() {
-        try {
-            String className = serialized().getImplClass().replaceAll("/", ".");
-            return Class.forName(className);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    default Method method() {
-        SerializedLambda lambda = serialized();
-        Class<?> containingClass = getContainingClass();
-        return Arrays.stream(containingClass.getDeclaredMethods())
-            .filter(method -> Objects.equals(method.getName(), lambda.getImplMethodName()))
-            .findFirst()
-            .orElseThrow(UnableToGuessMethodException::new);
-    }
-
-    default Parameter parameter(int n) {
-        return method().getParameters()[n];
-    }
-
-    class UnableToGuessMethodException extends RuntimeException {
-    }
-}

src/main/java/j2html/tags/ContainerTag.java

@@ -4,6 +4,7 @@ import j2html.Config;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 public class ContainerTag extends Tag<ContainerTag> {
 
@@ -89,6 +90,18 @@ public class ContainerTag extends Tag<ContainerTag> {
     }
 
 
+    /**
+     * Appends the DomContent-objects in the stream to the end of this element
+     *
+     * @param children Stream of DomContent-objects to be appended
+     * @return itself for easy chaining
+     */
+    public ContainerTag with(Stream<DomContent> children) {
+        children.forEach(this::with);
+        return this;
+    }
+
+
     /**
      * Call with-method based on condition
      * {@link #with(DomContent... children)}
@@ -137,24 +150,40 @@ public class ContainerTag extends Tag<ContainerTag> {
     private String renderFormatted(int lvl) throws IOException {
         StringBuilder sb = new StringBuilder();
         renderOpenTag(sb, null);
-        sb.append("\n");
+        if (hasTagName() && !isSelfFormattingTag()) {
+            sb.append("\n");
+        }
         if (!children.isEmpty()) {
             for (DomContent c : children) {
                 lvl++;
                 if (c instanceof ContainerTag) {
-                    sb.append(Config.indenter.indent(lvl, ((ContainerTag) c).renderFormatted(lvl)));
+                    if (((ContainerTag) c).hasTagName()) {
+                        sb.append(Config.indenter.indent(lvl, ((ContainerTag) c).renderFormatted(lvl)));
+                    } else {
+                        sb.append(Config.indenter.indent(lvl - 1, ((ContainerTag) c).renderFormatted(lvl - 1)));
+                    }
+                } else if (isSelfFormattingTag()) {
+                    sb.append(Config.indenter.indent(0, c.render()));
                 } else {
                     sb.append(Config.indenter.indent(lvl, c.render())).append("\n");
                 }
                 lvl--;
             }
         }
-        sb.append(Config.indenter.indent(lvl, ""));
+        if (!isSelfFormattingTag()) {
+            sb.append(Config.indenter.indent(lvl, ""));
+        }
         renderCloseTag(sb);
-        sb.append("\n");
+        if (hasTagName()) {
+            sb.append("\n");
+        }
         return sb.toString();
     }
 
+    private boolean isSelfFormattingTag() {
+        return "textarea".equals(tagName) || "pre".equals(tagName);
+    }
+
     @Override
     public void renderModel(Appendable writer, Object model) throws IOException {
         renderOpenTag(writer, model);

src/main/java/j2html/tags/DomContentJoiner.java

@@ -9,6 +9,8 @@ public class DomContentJoiner {
                 sb.append(((String) o).trim()).append(delimiter);
             } else if (o instanceof DomContent) {
                 sb.append(((DomContent) o).render().trim()).append(delimiter);
+            } else if (o == null) {
+                //Discard null objects so iff/iffelse can be used with join
             } else {
                 throw new RuntimeException("You can only join DomContent and String objects");
             }

src/main/java/j2html/tags/InlineStaticResource.java

@@ -10,8 +10,6 @@ import static j2html.TagCreator.style;
 
 public class InlineStaticResource {
 
-    public enum TargetFormat {CSS_MIN, CSS, JS_MIN, JS}
-
     public static ContainerTag get(String path, TargetFormat format) {
         String fileString = getFileAsString(path);
         switch (format) {
@@ -45,5 +43,7 @@ public class InlineStaticResource {
         return s.hasNext() ? s.next() : "";
     }
 
+    public enum TargetFormat {CSS_MIN, CSS, JS_MIN, JS}
+
 }
 

src/main/java/j2html/tags/Tag.java

@@ -2,7 +2,6 @@ package j2html.tags;
 
 import j2html.attributes.Attr;
 import j2html.attributes.Attribute;
-import j2html.attributes.LambdaAttribute;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -20,6 +19,10 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
         return this.tagName;
     }
 
+    protected boolean hasTagName() {
+        return tagName != null && !tagName.isEmpty();
+    }
+
     String renderOpenTag() throws IOException {
         StringBuilder stringBuilder = new StringBuilder();
         renderOpenTag(stringBuilder, null);
@@ -33,6 +36,9 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
     }
 
     void renderOpenTag(Appendable writer, Object model) throws IOException {
+        if (!hasTagName()) { // avoid <null> and <> tags
+            return;
+        }
         writer.append("<").append(tagName);
         for (Attribute attribute : attributes) {
             attribute.renderModel(writer, model);
@@ -41,6 +47,9 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
     }
 
     void renderCloseTag(Appendable writer) throws IOException {
+        if (!hasTagName()) { // avoid <null> and <> tags
+            return;
+        }
         writer.append("</");
         writer.append(tagName);
         writer.append(">");
@@ -135,6 +144,11 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
         return ((Tag) obj).render().equals(this.render());
     }
 
+    /**
+     * Convenience methods that call attr with predefined attributes
+     *
+     * @return itself for easy chaining
+     */
     public T withClasses(String... classes) {
         StringBuilder sb = new StringBuilder();
         for (String s : classes) {
@@ -143,19 +157,6 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
         return attr(Attr.CLASS, sb.toString().trim());
     }
 
-    public T withAttrs(LambdaAttribute... lambdaAttributes) {
-        for (LambdaAttribute attr : lambdaAttributes) {
-            attr(attr.name(), attr.value());
-        }
-        return (T) this;
-    }
-
-    /**
-     * Convenience methods that call attr with predefined attributes
-     *
-     * @return itself for easy chaining
-     */
-
     public T isAutoComplete() {
         return attr(Attr.AUTOCOMPLETE, null);
     }

src/main/java/j2html/utils/CSSMin.java

@@ -65,13 +65,11 @@ import java.util.regex.PatternSyntaxException;
 
 public class CSSMin {
 
-    private CSSMin() {
-    }
-
     private static final Logger LOG = Logger.getLogger(CSSMin.class.getName());
-
     static boolean debugLogging = false;
 
+    private CSSMin() {
+    }
 
     /**
      * Minify supplied CSS.

src/main/java/j2html/utils/JSMin.java

@@ -1,42 +1,42 @@
 package j2html.utils;
 
-    /*
-     * JSMin.java 2006-02-13
-     *
-     * Copyright (c) 2006 John Reilly (www.inconspicuous.org)
-     *
-     * This work is a translation from C to Java of jsmin.c published by
-     * Douglas Crockford.  Permission is hereby granted to use the Java
-     * version under the same conditions as the jsmin.c on which it is
-     * based.
-     *
-     *
-     *
-     *
-     * jsmin.c 2003-04-21
-     *
-     * Copyright (c) 2002 Douglas Crockford (www.crockford.com)
-     *
-     * Permission is hereby granted, free of charge, to any person obtaining a copy
-     * of this software and associated documentation files (the "Software"), to deal
-     * in the Software without restriction, including without limitation the rights
-     * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-     * copies of the Software, and to permit persons to whom the Software is
-     * furnished to do so, subject to the following conditions:
-     *
-     * The above copyright notice and this permission notice shall be included in
-     * all copies or substantial portions of the Software.
-     *
-     * The Software shall be used for Good, not Evil.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-     * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-     * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-     * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-     * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-     * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-     * SOFTWARE.
-     */
+/*
+ * JSMin.java 2006-02-13
+ *
+ * Copyright (c) 2006 John Reilly (www.inconspicuous.org)
+ *
+ * This work is a translation from C to Java of jsmin.c published by
+ * Douglas Crockford.  Permission is hereby granted to use the Java
+ * version under the same conditions as the jsmin.c on which it is
+ * based.
+ *
+ *
+ *
+ *
+ * jsmin.c 2003-04-21
+ *
+ * Copyright (c) 2002 Douglas Crockford (www.crockford.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * The Software shall be used for Good, not Evil.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -47,6 +47,16 @@ import java.io.PushbackInputStream;
 
 public class JSMin {
 
+    private static final int EOF = -1;
+    private PushbackInputStream in;
+    private OutputStream out;
+    private int theA;
+    private int theB;
+    private JSMin(InputStream in, OutputStream out) {
+        this.in = new PushbackInputStream(in);
+        this.out = out;
+    }
+
     /**
      * Compress a JS-string
      *
@@ -66,19 +76,6 @@ public class JSMin {
         }
     }
 
-    private static final int EOF = -1;
-
-    private PushbackInputStream in;
-    private OutputStream out;
-
-    private int theA;
-    private int theB;
-
-    private JSMin(InputStream in, OutputStream out) {
-        this.in = new PushbackInputStream(in);
-        this.out = out;
-    }
-
     /**
      * isAlphanum -- return true if the character is a letter, digit,
      * underscore, dollar sign, or non-ASCII character.

src/test/files/AnyContent.java

@@ -1 +1,2 @@
-public class AnyContent{}
+public class AnyContent {
+}

src/test/java/j2html/RenderPerformanceTest.java

@@ -1,15 +1,5 @@
 package j2html;
 
-import static j2html.TagCreator.attrs;
-import static j2html.TagCreator.body;
-import static j2html.TagCreator.div;
-import static j2html.TagCreator.h1;
-import static j2html.TagCreator.h2;
-import static j2html.TagCreator.head;
-import static j2html.TagCreator.html;
-import static j2html.TagCreator.p;
-import static j2html.TagCreator.title;
-import static org.junit.Assert.assertEquals;
 import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
 import com.carrotsearch.junitbenchmarks.BenchmarkRule;
 import com.carrotsearch.junitbenchmarks.Clock;
@@ -22,19 +12,28 @@ import j2html.tags.DomContent;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
+import static j2html.TagCreator.attrs;
+import static j2html.TagCreator.body;
+import static j2html.TagCreator.div;
+import static j2html.TagCreator.h1;
+import static j2html.TagCreator.h2;
+import static j2html.TagCreator.head;
+import static j2html.TagCreator.html;
+import static j2html.TagCreator.p;
+import static j2html.TagCreator.title;
+import static org.junit.Assert.assertEquals;
 
 @BenchmarkOptions(callgc = false, benchmarkRounds = 50000, warmupRounds = 200, concurrency = 2, clock = Clock.NANO_TIME)
 public class RenderPerformanceTest {
 
-    String expected = "<html><head><title>Browsertitle</title></head><body><h1>Hello World!</h1><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2 id=\"title\" class=\"visible-small\">Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2 id=\"title\" class=\"visible-small\">Hello World!</h2><div class=\"button\"><div class=\"button-text\">Action!</div></div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h1>Hello World!</h1><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></body></html>";
     @Rule
     public TestRule benchmarkRun = new BenchmarkRule();
-
+    String expected = "<html><head><title>Browsertitle</title></head><body><h1>Hello World!</h1><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2 id=\"title\" class=\"visible-small\">Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2 id=\"title\" class=\"visible-small\">Hello World!</h2><div class=\"button\"><div class=\"button-text\">Action!</div></div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h1>Hello World!</h1><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div><h2>Hello World!</h2><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><div><p>Hello World!</p></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></div></body></html>";
     private DomContent template;
 
     public RenderPerformanceTest() {
         this.template =
-                // @formatter:off
+            // @formatter:off
                 html(
                      head(
                           title(new BrowserTitle())
@@ -68,7 +67,7 @@ public class RenderPerformanceTest {
 
     private DomContent getDomContent(PageModel pageModel) throws Exception {
         return
-        // @formatter:off
+            // @formatter:off
         html(
              head(
                   title(pageModel.getTitle())

src/test/java/j2html/comparison/ComparisonData.java

@@ -7,11 +7,11 @@ import java.util.stream.IntStream;
 
 public class ComparisonData {
 
+    public static List<Integer> tableNumbers = IntStream.range(1, 51).boxed().collect(Collectors.toList());
+
     public static List<Employee> fiveHundredEmployees() {
         return IntStream.range(0, 500).mapToObj(i -> new Employee(i, "Some name", "Some title")).collect(Collectors.toList());
     }
 
-    public static List<Integer> tableNumbers = IntStream.range(1, 51).boxed().collect(Collectors.toList());
-
 }
 

src/test/java/j2html/comparison/j2html/MultiplicationTable.java

@@ -2,7 +2,11 @@ package j2html.comparison.j2html;
 
 import j2html.comparison.ComparisonData;
 import j2html.tags.ContainerTag;
-import static j2html.TagCreator.*;
+import static j2html.TagCreator.each;
+import static j2html.TagCreator.table;
+import static j2html.TagCreator.tbody;
+import static j2html.TagCreator.td;
+import static j2html.TagCreator.tr;
 
 public class MultiplicationTable {
 

src/test/java/j2html/model/Button.java

@@ -1,10 +1,8 @@
 package j2html.model;
 
-import static j2html.TagCreator.div;
-
-import java.io.IOException;
-
 import j2html.tags.ContainerTag;
+import java.io.IOException;
+import static j2html.TagCreator.div;
 
 public class Button extends Template<PageModel> {
 
@@ -37,4 +35,4 @@ class ButtonText extends Template<String> {
     public void renderTemplate(Appendable writer, String model) throws IOException {
         writer.append(model);
     }
-}
+}

src/test/java/j2html/model/ButtonModel.java

@@ -6,7 +6,8 @@ public class ButtonModel {
     public ButtonModel(String text) {
         this.text = text;
     }
+
     public String getText() {
         return text;
     }
-}
+}

src/test/java/j2html/model/Template.java

@@ -1,8 +1,7 @@
 package j2html.model;
 
-import java.io.IOException;
-
 import j2html.tags.DomContent;
+import java.io.IOException;
 
 public abstract class Template<T> extends DomContent {
 

src/test/java/j2html/reflection/NamedValueTest.java

@@ -1,17 +0,0 @@
-package j2html.reflection;
-
-import j2html.attributes.LambdaAttribute;
-import org.junit.Test;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-
-public class NamedValueTest {
-
-    @Test
-    public void testNamedValueWorks() {
-        LambdaAttribute pair = five -> 5;
-        assertThat("five", is(pair.name()));
-        assertThat("5", is(pair.value()));
-    }
-
-}

src/test/java/j2html/tags/InlineStaticResourceTest.java

@@ -19,7 +19,7 @@ public class InlineStaticResourceTest {
         String expectedJs = "<script>(function(){var test=5;var tast=10;var testTast=test+tast;console.log(testTast);})();</script>";
         String expectedHtml = "<body>" + EOL + "    Any content" + EOL + "</body>" + EOL;
         String expectedEscapedHtml = "&lt;body&gt;" + EOL + "    Any content" + EOL + "&lt;/body&gt;" + EOL;
-        String expectedAnyContent = "public class AnyContent{}" + EOL;
+        String expectedAnyContent = "public class AnyContent {" + EOL + "}" + EOL;
 
         // classpath files
         assertThat(styleWithInlineFile_min("/test.css").render(), is(expectedCss));

src/test/java/j2html/tags/RenderFormattedTest.java

@@ -0,0 +1,58 @@
+package j2html.tags;
+
+import org.junit.Test;
+import static j2html.TagCreator.div;
+import static j2html.TagCreator.each;
+import static j2html.TagCreator.li;
+import static j2html.TagCreator.p;
+import static j2html.TagCreator.pre;
+import static j2html.TagCreator.textarea;
+import static j2html.TagCreator.ul;
+import static java.util.Arrays.asList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+
+public class RenderFormattedTest {
+
+    @Test
+    public void testFormattedTags() throws Exception {
+        assertThat(div(p("Hello")).renderFormatted(), is("<div>\n    <p>\n        Hello\n    </p>\n</div>\n"));
+    }
+
+    @Test
+    public void testFormattedTags_doesntFormatPre() throws Exception {
+        assertThat(div(pre("public void renderModel(Appendable writer, Object model) throws IOException {\n" +
+            "        writer.append(text);\n" +
+            "    }")).renderFormatted(), is("<div>\n" +
+            "    <pre>public void renderModel(Appendable writer, Object model) throws IOException {\n" +
+            "        writer.append(text);\n" +
+            "    }</pre>\n" +
+            "</div>\n"));
+    }
+
+    @Test
+    public void testFormattedTags_doesntFormatTextArea() throws Exception {
+        assertThat(div(textarea("fred\ntom")).renderFormatted(), is("<div>\n" +
+            "    <textarea>fred\n" +
+            "tom</textarea>\n" +
+            "</div>\n"));
+    }
+
+    @Test
+    public void testFormattedTags_each() throws Exception {
+        assertThat(ul(each(asList(1, 2, 3), i -> li("Number " + i))).renderFormatted(), is(
+            "<ul>\n" +
+                "    <li>\n" +
+                "        Number 1\n" +
+                "    </li>\n" +
+                "    <li>\n" +
+                "        Number 2\n" +
+                "    </li>\n" +
+                "    <li>\n" +
+                "        Number 3\n" +
+                "    </li>\n" +
+                "</ul>\n"
+        ));
+    }
+
+}

src/test/java/j2html/tags/TagCreatorTest.java

@@ -2,9 +2,12 @@ package j2html.tags;
 
 import j2html.Config;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
-import org.junit.Ignore;
+import org.junit.Before;
 import org.junit.Test;
 import static j2html.TagCreator.*;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -17,6 +20,14 @@ public class TagCreatorTest {
 
     List<Employee> employees = Arrays.asList(new Employee(1, "Name 1", "Title 1"), new Employee(2, "Name 2", "Title 2"), new Employee(3, "Name 3", "Title 3"));
 
+    Map<Integer, Employee> employeeMap = new HashMap<>();
+
+    @Before
+    public void setUp() {
+        employeeMap.put(1, new Employee(1, "Name 1", "Title 1"));
+        employeeMap.put(2, new Employee(2, "Name 2", "Title 2"));
+        employeeMap.put(3, new Employee(3, "Name 3", "Title 3"));
+    }
 
     @Test
     public void testDocument() throws Exception {
@@ -39,6 +50,17 @@ public class TagCreatorTest {
         assertThat(actual, is(expected));
     }
 
+    @Test
+    public void testIffOptional() {
+        String expected = "<div><p>Test</p><a href=\"#1\">Test</a></div>";
+        String actual = div(
+            p("Test"),
+            iff(Optional.of(1), i -> a("Test").withHref("#" + i)),
+            iff(Optional.empty(), i -> a("Tast").withHref("#2"))
+        ).render();
+        assertThat(actual, is(expected));
+    }
+
     @Test
     public void testIffElse() throws Exception {
         String expected = "<div><p>Tast</p></div>";
@@ -54,7 +76,13 @@ public class TagCreatorTest {
     }
 
     @Test
-    @Ignore // Having some trouble with RetroLambda setup
+    public void testJoinWithNulls() throws Exception {
+        String expected = "This is my joined string. It has ignored null content in the middle.";
+        String actual = join("This is my joined string.", iff(false, "this should not be displayed"), "It has ignored null content in the middle.").render();
+        assertThat(actual, is(expected));
+    }
+
+    @Test
     public void testEach() throws Exception {
         String j2htmlMap = ul().with(
             li("Begin list"),
@@ -70,12 +98,31 @@ public class TagCreatorTest {
                 p(employee.title)
             )).map(DomContent::render).collect(Collectors.joining()))
         ).render();
-        assertThat(j2htmlMap.equals(javaMap), is(true));
         assertThat(j2htmlMap, is("<ul><li>Begin list</li><li><h2>Name 1</h2><p>Title 1</p></li><li><h2>Name 2</h2><p>Title 2</p></li><li><h2>Name 3</h2><p>Title 3</p></li></ul>"));
+        assertThat(j2htmlMap.equals(javaMap), is(true));
+    }
+
+    @Test
+    public void testEachWithMap() {
+        final String j2htmlMap = ul().with(
+            li("Begin list"),
+            each(employeeMap, entry -> li(entry.getKey() + "-" + entry.getValue().name))
+        ).render();
+
+        assertThat(j2htmlMap, is("<ul><li>Begin list</li><li>1-Name 1</li><li>2-Name 2</li><li>3-Name 3</li></ul>"));
+    }
+
+    @Test
+    public void testEachWithMapAndBiFunction() {
+        final String j2htmlMap = ul().with(
+            li("Begin list"),
+            each(employeeMap, (id, employee) -> li(id + "-" + employee.name))
+        ).render();
+
+        assertThat(j2htmlMap, is("<ul><li>Begin list</li><li>1-Name 1</li><li>2-Name 2</li><li>3-Name 3</li></ul>"));
     }
 
     @Test
-    @Ignore // Having some trouble with RetroLambda setup
     public void testFilter() throws Exception {
         String j2htmlFilter = ul().with(
             li("Begin list"),
@@ -91,8 +138,18 @@ public class TagCreatorTest {
                 p(employee.title)
             )).map(DomContent::render).collect(Collectors.joining()))
         ).render();
-        assertThat(j2htmlFilter.equals(javaFilter), is(true));
         assertThat(j2htmlFilter, is("<ul><li>Begin list</li><li><h2>Name 1</h2><p>Title 1</p></li><li><h2>Name 3</h2><p>Title 3</p></li></ul>"));
+        assertThat(j2htmlFilter.equals(javaFilter), is(true));
+    }
+
+    @Test
+    public void testEachWithStream() throws Exception {
+        final String j2htmlMap = ul().with(
+            li("Begin list"),
+            each(employeeMap.entrySet().stream().map(e -> li(e.getKey() + "-" + e.getValue().name)))
+        ).render();
+
+        assertThat(j2htmlMap, is("<ul><li>Begin list</li><li>1-Name 1</li><li>2-Name 2</li><li>3-Name 3</li></ul>"));
     }
 
     @Test

src/test/java/j2html/tags/TagTest.java

@@ -2,12 +2,11 @@ package j2html.tags;
 
 import j2html.Config;
 import j2html.model.DynamicHrefAttribute;
+import java.io.FileWriter;
 import org.junit.Test;
-import static j2html.TagCreator.a;
 import static j2html.TagCreator.body;
 import static j2html.TagCreator.div;
 import static j2html.TagCreator.footer;
-import static j2html.TagCreator.form;
 import static j2html.TagCreator.header;
 import static j2html.TagCreator.html;
 import static j2html.TagCreator.iff;
@@ -108,16 +107,10 @@ public class TagTest {
     }
 
     @Test
-    public void testParameterNameReflectionAttributes() throws Exception {
-        String expectedAnchor = "<a href=\"http://example.com\">example.com</a>";
-        String actualAnchor = a("example.com").withAttrs(href -> "http://example.com").render();
-        assertThat(actualAnchor, is(expectedAnchor));
-        String expectedForm = "<form method=\"post\" action=\"/form-path\"><input name=\"email\" type=\"email\"><input name=\"password\" type=\"password\"></form>";
-        String actualForm = form().withAttrs(method -> "post", action -> "/form-path").with(
-            input().withAttrs(name -> "email", type -> "email"),
-            input().withAttrs(name -> "password", type -> "password")
-        ).render();
-        assertThat(actualForm, is(expectedForm));
+    public void renderToFile() throws Exception {
+        FileWriter fileWriter = new FileWriter("file.txt");
+        div("Test").render(fileWriter);
+        fileWriter.close();
     }
 
 }

src/test/resources/AnyContent.java

@@ -1 +1,2 @@
-public class AnyContent{}
+public class AnyContent {
+}

src/test/resources/comparison/velocity/macros.vm

@@ -13,16 +13,16 @@
 #end
 
 #@mainLayout()
-    <div>
-        <h1>Example content</h1>
-        #someMacro(1)
-        #someMacro(2)
-        #someMacro(3)
-    </div>
+<div>
+    <h1>Example content</h1>
+    #someMacro(1)
+    #someMacro(2)
+    #someMacro(3)
+</div>
 #end
 
 #macro(someMacro $callNumber)
-    <div>
-        Macro call $callNumber
-    </div>
+<div>
+    Macro call $callNumber
+</div>
 #end