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

formatting draft
support osgi meta data (#112 )
2018-05-01 12:15:27 +02:00 · 2018-04-30 23:22:21 +02:00 · 2018-04-17 23:54:31 +02:00 · 2018-04-16 20:11:37 +02:00 · 2018-04-16 20:07:11 +02:00 · 2018-02-05 01:36:46 +01:00
24 changed files with 607 additions and 60 deletions
--- a/README.md
+++ b/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.1</version>
+    <version>1.2.2</version>
 </dependency>
 ```
-### OR the gradle dependency
+### Or the gradle dependency
 ```
-compile 'com.j2html:j2html:1.2.1'
+compile 'com.j2html:j2html:1.2.2'
 ```

 ### Import TagCreator and start building HTML
@@ -27,9 +27,9 @@ import static j2html.TagCreator.*;

 public class Main {
    public static void main(String[] args) {
-        body().with(
-            h1("Heading!").withClass("example"),
-            img().withSrc("img/hello.png")
+        body(
+            h1("Hello, World!"),
+            img().withSrc("/img/hello.png")
        ).render();
    }
 }
@@ -37,8 +37,8 @@ public class Main {
 The above Java will result in the following HTML:
 ```html
 <body>
-    <h1 class="example">Heading!</h1>
-    <img src="img/hello.png">
+    <h1>Hello, World!</h1>
+    <img src="/img/hello.png">
 </body>
 ```

--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@

    <groupId>com.j2html</groupId>
    <artifactId>j2html</artifactId>
-    <version>1.2.2</version>
+    <version>1.3.0</version>

    <name>j2html</name>
    <description>Java to HTML builder with a fluent API</description>
@@ -63,7 +63,28 @@
            <artifactId>junit-benchmarks</artifactId>
            <version>0.7.2</version>
            <scope>test</scope>
-        </dependency>        
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>24.0-jre</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- performance test dependencies -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.7</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.18</version>
+            <scope>test</scope>
+        </dependency>
+
    </dependencies>

    <packaging>jar</packaging>
@@ -107,6 +128,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>

--- a/src/main/java/j2html/TagCreator.java
+++ b/src/main/java/j2html/TagCreator.java
@@ -10,6 +10,10 @@ 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.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -31,6 +35,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
     */
@@ -68,10 +89,14 @@ 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).collect(Collectors.toList()));
+    }
+
+    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()));
    }

    /**
--- a/src/main/java/j2html/tags/ContainerTag.java
+++ b/src/main/java/j2html/tags/ContainerTag.java
@@ -137,6 +137,9 @@ public class ContainerTag extends Tag<ContainerTag> {
    private String renderFormatted(int lvl) throws IOException {
        StringBuilder sb = new StringBuilder();
        renderOpenTag(sb, null);
+        if ("pre".equals(tagName) || "textarea".equals(tagName)) {
+            return this.render() + "\n";
+        }
        sb.append("\n");
        if (!children.isEmpty()) {
            for (DomContent c : children) {
--- a/src/main/java/j2html/tags/DomContentJoiner.java
+++ b/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");
            }
--- a/src/main/java/j2html/tags/Tag.java
+++ b/src/main/java/j2html/tags/Tag.java
@@ -4,6 +4,7 @@ import j2html.attributes.Attr;
 import j2html.attributes.Attribute;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Iterator;

 public abstract class Tag<T extends Tag<T>> extends DomContent {
    protected String tagName;
@@ -31,6 +32,9 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
    }

    void renderOpenTag(Appendable writer, Object model) throws IOException {
+        if (tagName == null || tagName.equals("")) { // avoid <null> and <> tags
+            return;
+        }
        writer.append("<").append(tagName);
        for (Attribute attribute : attributes) {
            attribute.renderModel(writer, model);
@@ -39,6 +43,9 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
    }

    void renderCloseTag(Appendable writer) throws IOException {
+        if (tagName == null || tagName.equals("")) {
+            return;
+        }
        writer.append("</");
        writer.append(tagName);
        writer.append(">");
@@ -79,6 +86,28 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
        return (T) this;
    }

+    /**
+     * Adds the specified attribute. If the Tag previously contained an attribute with the same name, the old attribute is replaced by the specified attribute.
+     *
+     * @param attribute the attribute
+     * @return itself for easy chaining
+     */
+    public T attr(Attribute attribute) {
+        Iterator<Attribute> iterator = attributes.iterator();
+        String name = attribute.getName();
+        if (name != null) {
+            // name == null is allowed, but those Attributes are not rendered. So we add them anyway.
+            while (iterator.hasNext()) {
+                Attribute existingAttribute = iterator.next();
+                if (existingAttribute.getName().equals(name)) {
+                    iterator.remove();
+                }
+            }
+        }
+        attributes.add(attribute);
+        return (T) this;
+    }
+
    /**
     * Sets a custom attribute without value
     *
--- a/src/main/java/j2html/utils/JSMin.java
+++ b/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;
--- a/src/test/java/j2html/comparison/ComparisonData.java
+++ b/src/test/java/j2html/comparison/ComparisonData.java
@@ -0,0 +1,17 @@
+package j2html.comparison;
+
+import j2html.comparison.model.Employee;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class ComparisonData {
+
+    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());
+
+}
+
--- a/src/test/java/j2html/comparison/RenderPerformanceComparisonTest.java
+++ b/src/test/java/j2html/comparison/RenderPerformanceComparisonTest.java
@@ -0,0 +1,34 @@
+package j2html.comparison;
+
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.carrotsearch.junitbenchmarks.BenchmarkRule;
+import com.carrotsearch.junitbenchmarks.Clock;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+
+@Ignore
+@BenchmarkOptions(callgc = false, benchmarkRounds = 20_000, warmupRounds = 200, concurrency = 2, clock = Clock.NANO_TIME)
+public class RenderPerformanceComparisonTest {
+
+    @Rule
+    public TestRule benchmarkRun = new BenchmarkRule();
+
+    @Test
+    public void j2htmlPerformance() throws Exception {
+        TestJ2html.helloWorld();
+        TestJ2html.fiveHundredEmployees();
+        TestJ2html.macros();
+        TestJ2html.multiplicationTable();
+    }
+
+    @Test
+    public void velocityPerformance() throws Exception {
+        TestVelocity.helloWorld();
+        TestVelocity.fiveHundredEmployees();
+        TestVelocity.macros();
+        TestVelocity.multiplicationTable();
+    }
+
+}
--- a/src/test/java/j2html/comparison/TestJ2html.java
+++ b/src/test/java/j2html/comparison/TestJ2html.java
@@ -0,0 +1,30 @@
+package j2html.comparison;
+
+import j2html.comparison.j2html.FiveHundredEmployees;
+import j2html.comparison.j2html.HelloWorld;
+import j2html.comparison.j2html.Macros;
+import j2html.comparison.j2html.MultiplicationTable;
+
+public class TestJ2html {
+
+    public static String helloWorld() {
+        return HelloWorld.tag.render();
+    }
+
+    public static String fiveHundredEmployees() {
+        return FiveHundredEmployees.tag.render();
+    }
+
+    public static String macros() {
+        return Macros.tag.render();
+    }
+
+    public static String multiplicationTable() {
+        return MultiplicationTable.tag.render();
+    }
+
+    public static void main(String[] args) {
+        System.out.println(MultiplicationTable.tag.renderFormatted());
+    }
+
+}
--- a/src/test/java/j2html/comparison/TestVelocity.java
+++ b/src/test/java/j2html/comparison/TestVelocity.java
@@ -0,0 +1,52 @@
+package j2html.comparison;
+
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+
+public class TestVelocity {
+
+    private static VelocityEngine velocityEngine;
+
+    static {
+        velocityEngine = new VelocityEngine();
+        velocityEngine.setProperty("resource.loader", "class");
+        velocityEngine.setProperty("class.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+    }
+
+    private static String render(String templatePath, Map<String, Object> model) {
+        StringWriter stringWriter = new StringWriter();
+        velocityEngine.getTemplate(templatePath, StandardCharsets.UTF_8.name()).merge(
+            new VelocityContext(model), stringWriter
+        );
+        return stringWriter.toString();
+    }
+
+    public static String helloWorld() {
+        return render("/comparison/velocity/helloWorld.vm", null);
+    }
+
+    public static String fiveHundredEmployees() {
+        Map<String, Object> model = new HashMap<>();
+        model.put("employees", ComparisonData.fiveHundredEmployees());
+        return render("/comparison/velocity/fiveHundredEmployees.vm", model);
+    }
+
+    public static String macros() {
+        return render("/comparison/velocity/macros.vm", null);
+    }
+
+    public static String multiplicationTable() {
+        Map<String, Object> model = new HashMap<>();
+        model.put("tableNumbers", ComparisonData.tableNumbers);
+        return render("/comparison/velocity/multiplicationTable.vm", model);
+    }
+
+    public static void main(String[] args) {
+        System.out.println(multiplicationTable());
+    }
+
+}
--- a/src/test/java/j2html/comparison/j2html/FiveHundredEmployees.java
+++ b/src/test/java/j2html/comparison/j2html/FiveHundredEmployees.java
@@ -0,0 +1,18 @@
+package j2html.comparison.j2html;
+
+import j2html.comparison.ComparisonData;
+import j2html.tags.ContainerTag;
+import static j2html.TagCreator.each;
+import static j2html.TagCreator.li;
+import static j2html.TagCreator.ul;
+import static org.apache.commons.lang3.StringUtils.join;
+
+public class FiveHundredEmployees {
+
+    public static ContainerTag tag = ul(
+        each(ComparisonData.fiveHundredEmployees(), employee ->
+            li(join(employee.getId(), employee.getName(), employee.getTitle()))
+        )
+    );
+
+}
--- a/src/test/java/j2html/comparison/j2html/HelloWorld.java
+++ b/src/test/java/j2html/comparison/j2html/HelloWorld.java
@@ -0,0 +1,27 @@
+package j2html.comparison.j2html;
+
+import j2html.tags.ContainerTag;
+import static j2html.TagCreator.attrs;
+import static j2html.TagCreator.body;
+import static j2html.TagCreator.h1;
+import static j2html.TagCreator.head;
+import static j2html.TagCreator.html;
+import static j2html.TagCreator.link;
+import static j2html.TagCreator.main;
+import static j2html.TagCreator.title;
+
+public class HelloWorld {
+
+    public static ContainerTag tag = html(
+        head(
+            title("Title"),
+            link().withRel("stylesheet").withHref("/css/main.css")
+        ),
+        body(
+            main(attrs("#main.content"),
+                h1("Heading!")
+            )
+        )
+    );
+
+}
--- a/src/test/java/j2html/comparison/j2html/Macros.java
+++ b/src/test/java/j2html/comparison/j2html/Macros.java
@@ -0,0 +1,46 @@
+package j2html.comparison.j2html;
+
+import j2html.tags.ContainerTag;
+import j2html.tags.DomContent;
+import static j2html.TagCreator.attrs;
+import static j2html.TagCreator.body;
+import static j2html.TagCreator.div;
+import static j2html.TagCreator.h1;
+import static j2html.TagCreator.head;
+import static j2html.TagCreator.html;
+import static j2html.TagCreator.link;
+import static j2html.TagCreator.main;
+import static j2html.TagCreator.title;
+
+public class Macros {
+
+    public static ContainerTag tag = mainLayout(
+        div(
+            h1("Example content"),
+            someMacro(1),
+            someMacro(2),
+            someMacro(3)
+        )
+    );
+
+    private static ContainerTag mainLayout(DomContent content) {
+        return html(
+            head(
+                title("Title"),
+                link().withRel("stylesheet").withHref("/css/main.css")
+            ),
+            body(
+                main(attrs("#main.content"),
+                    content
+                )
+            )
+        );
+    }
+
+    private static ContainerTag someMacro(int i) {
+        return div(
+            "Macro call " + i
+        );
+    }
+
+}
--- a/src/test/java/j2html/comparison/j2html/MultiplicationTable.java
+++ b/src/test/java/j2html/comparison/j2html/MultiplicationTable.java
@@ -0,0 +1,19 @@
+package j2html.comparison.j2html;
+
+import j2html.comparison.ComparisonData;
+import j2html.tags.ContainerTag;
+import static j2html.TagCreator.*;
+
+public class MultiplicationTable {
+
+    public static ContainerTag tag = table(
+        tbody(
+            each(ComparisonData.tableNumbers, i -> tr(
+                each(ComparisonData.tableNumbers, j -> td(
+                    String.valueOf(i * j)
+                ))
+            ))
+        )
+    );
+
+}
--- a/src/test/java/j2html/comparison/model/Employee.java
+++ b/src/test/java/j2html/comparison/model/Employee.java
@@ -0,0 +1,10 @@
+package j2html.comparison.model;
+
+import lombok.Value;
+
+@Value
+public class Employee {
+    int id;
+    String name;
+    String title;
+}
--- a/src/test/java/j2html/model/DynamicHrefAttribute.java
+++ b/src/test/java/j2html/model/DynamicHrefAttribute.java
@@ -0,0 +1,24 @@
+package j2html.model;
+
+import j2html.attributes.Attribute;
+import java.io.IOException;
+
+public class DynamicHrefAttribute extends Attribute {
+
+    public DynamicHrefAttribute() {
+        super("href");
+    }
+
+    @Override
+    public void renderModel(Appendable writer, Object model) throws IOException {
+        writer.append(" ");
+        writer.append(getName());
+        writer.append("=\"");
+        writer.append(getUrl(model));
+        writer.append("\"");
+    }
+
+    public String getUrl(Object model) {
+        return "/";
+    }
+}
--- a/src/test/java/j2html/tags/RenderFormattedTest.java
+++ b/src/test/java/j2html/tags/RenderFormattedTest.java
@@ -0,0 +1,60 @@
+package j2html.tags;
+
+import com.google.common.collect.ImmutableList;
+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 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(ImmutableList.of(1, 2, 3), i -> li("Number " + i))).renderFormatted(), is(
+            "<ul>\n" +
+                "    \n" +
+                "        <li>\n" +
+                "            Number 1\n" +
+                "        </li>\n" +
+                "        <li>\n" +
+                "            Number 2\n" +
+                "        </li>\n" +
+                "        <li>\n" +
+                "            Number 3\n" +
+                "        </li>\n" +
+                "    \n" +
+                "</ul>\n"
+        ));
+    }
+
+}
--- a/src/test/java/j2html/tags/TagCreatorTest.java
+++ b/src/test/java/j2html/tags/TagCreatorTest.java
@@ -2,8 +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.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import static j2html.TagCreator.*;
@@ -17,6 +21,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 {
@@ -38,6 +50,17 @@ public class TagCreatorTest {
        ).render();
        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 {
@@ -54,7 +77,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 +99,21 @@ 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
-    @Ignore // Having some trouble with RetroLambda setup
    public void testFilter() throws Exception {
        String j2htmlFilter = ul().with(
            li("Begin list"),
@@ -91,8 +129,8 @@ 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
--- a/src/test/java/j2html/tags/TagTest.java
+++ b/src/test/java/j2html/tags/TagTest.java
@@ -1,7 +1,5 @@
 package j2html.tags;

-import j2html.Config;
-import org.junit.Test;
 import static j2html.TagCreator.body;
 import static j2html.TagCreator.div;
 import static j2html.TagCreator.footer;
@@ -15,6 +13,9 @@ import static j2html.TagCreator.p;
 import static j2html.TagCreator.tag;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
+import j2html.Config;
+import j2html.model.DynamicHrefAttribute;
+import org.junit.Test;

 public class TagTest {

@@ -54,11 +55,6 @@ public class TagTest {
        Config.closeEmptyTags = false;
    }

-    @Test
-    public void testFormattedTags() throws Exception { // better test in ComplexRenderTest.java
-        assertThat(div(p("Hello")).renderFormatted(), is("<div>\n    <p>\n        Hello\n    </p>\n</div>\n"));
-    }
-
    @Test
    public void testEquals() throws Exception {
        Tag tagOne = tag("p").withClass("class").withText("Test");
@@ -92,5 +88,16 @@ public class TagTest {
        assertThat(testTagAttrWithoutAttr.render(), is("<a attribute></a>"));
    }

+    @Test
+    public void testDynamicAttribute() throws Exception {
+        ContainerTag testTagWithAttrValueNull = new ContainerTag("a").attr(new DynamicHrefAttribute());
+        assertThat(testTagWithAttrValueNull.render(), is("<a href=\"/\"></a>"));
+    }
+    
+    @Test
+    public void testDynamicAttributeReplacement() throws Exception {
+        ContainerTag testTagWithAttrValueNull = new ContainerTag("a").attr("href", "/link").attr(new DynamicHrefAttribute());
+        assertThat(testTagWithAttrValueNull.render(), is("<a href=\"/\"></a>"));
+    }

 }
--- a/src/test/resources/comparison/velocity/fiveHundredEmployees.vm
+++ b/src/test/resources/comparison/velocity/fiveHundredEmployees.vm
@@ -0,0 +1,7 @@
+#* @vtlvariable name="employees" type="java.util.List<j2html.comparison.ComparisonData.Employee>" *#
+
+<ul>
+    #foreach($employee in $employees)
+        <li>$employee.id $employee.name $employee.title</li>
+    #end
+</ul>
--- a/src/test/resources/comparison/velocity/helloWorld.vm
+++ b/src/test/resources/comparison/velocity/helloWorld.vm
@@ -0,0 +1,11 @@
+<html>
+    <head>
+        <title>Title</title>
+        <link rel="stylesheet" href="/css/main.css">
+    </head>
+    <body>
+        <main id="main" class="content">
+            <h1>Heading!</h1>
+        </main>
+    </body>
+</html>
--- a/src/test/resources/comparison/velocity/macros.vm
+++ b/src/test/resources/comparison/velocity/macros.vm
@@ -0,0 +1,28 @@
+#macro(mainLayout)
+<html>
+    <head>
+        <title>Title</title>
+        <link rel="stylesheet" href="/css/main.css">
+    </head>
+    <body>
+        <main id="main" class="content">
+            $!bodyContent
+        </main>
+    </body>
+</html>
+#end
+
+#@mainLayout()
+    <div>
+        <h1>Example content</h1>
+        #someMacro(1)
+        #someMacro(2)
+        #someMacro(3)
+    </div>
+#end
+
+#macro(someMacro $callNumber)
+    <div>
+        Macro call $callNumber
+    </div>
+#end
--- a/src/test/resources/comparison/velocity/multiplicationTable.vm
+++ b/src/test/resources/comparison/velocity/multiplicationTable.vm
@@ -0,0 +1,12 @@
+<table>
+    <tbody>
+        #foreach($i in $tableNumbers)
+            <tr>
+                #foreach($j in $tableNumbers)
+                    #set($product = $i * $j)
+                    <td>$product</td>
+                #end
+            </tr>
+        #end
+    </tbody>
+</table>
Author	SHA1	Message	Date
David	8ce386830d	[maven-release-plugin] prepare release j2html-1.3.0	2018-05-01 12:15:27 +02:00
David	6c5083512c	formatting draft	2018-04-30 23:22:21 +02:00
Matthias	f497b5c8b5	support osgi meta data (#112 )	2018-04-17 23:54:31 +02:00
Matthias	f212895eb2	Let each() take Map in addition to Collection (#110 ) * add support for maps for 'each' method. * add missing imports.	2018-04-16 20:11:37 +02:00
Rupert Madden-Abbott	62cafb9b31	Allow nulls in join() (fix #109 ) * Discard nulls in join. * Add test.	2018-04-16 20:07:11 +02:00
David	af7c986dd6	reorder asserts in each/fitler test	2018-02-05 01:36:46 +01:00
David	3aaab8b0fe	unignore tests	2018-02-05 01:34:45 +01:00
David	cf9558b6ab	fix formatting	2018-02-05 01:14:29 +01:00
Paul N. Baker	f87f9d8647	Overloaded method of iff for java8 Optional<>'s. (Includes test) (#103 ) Using an optional as a condition is really tricky. Even if the optional is not present, the right value of ifValue must be evaluated eagerly in order to be passed to the method. Passing a lambda function for ifFunction allows the value to be evaluated lazily. This avoids the need to manually map and "elseGet" a null value to preserve current functionality.	2018-01-17 22:10:21 +01:00
David	b42ba41697	Update README.md	2017-12-31 12:25:35 +01:00
David	0c7f75f5b8	Update README.md	2017-12-31 12:25:05 +01:00
Janning Vygen	754003ebf6	Add attr(Attribute attribute) to Tag	2017-12-10 16:50:15 +01:00
David	6968478894	add multiplication-table to perf-test	2017-12-08 19:36:41 +01:00
David	0b92a963e9	add some ignored performance-tests	2017-12-07 22:10:34 +01:00
David	ac92facca7	Update README.md	2017-12-06 18:11:29 +01:00
David	4cf16320ad	[maven-release-plugin] prepare for next development iteration	2017-12-06 17:04:20 +01:00