mindol1004/j2html
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Java 7 support, cleanup

Browse Source
This commit is contained in:
tipsy
2015-10-19 20:22:52 +02:00
parent 5ad63ad1d6
commit ef43af72a3
3 changed files with 4 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -40,7 +40,7 @@
</issueManagement>
<properties>
<jdk.version>1.8</jdk.version>
<jdk.version>1.7</jdk.version>
<junit.version>4.12</junit.version>
<commons-lang3.version>3.4</commons-lang3.version>
</properties>

15
src/main/java/j2html/tags/ContainerTag.java
View File

@@ -45,7 +45,9 @@ public class ContainerTag extends Tag {
*/
public ContainerTag with(List<Tag> children) {
if (children != null) {
children.forEach(this::with);
for (Tag child : children) {
this.with(child);
}
}
return this;
}
@@ -114,17 +116,6 @@ public class ContainerTag extends Tag {
*/
@Override
public String render() {
//very slow
// return renderOpenTag() + children.stream().map(Tag::render).collect(Collectors.joining()) + renderCloseTag();
//pretty fast
// StringBuilder rendered = new StringBuilder(renderOpenTag());
// children.forEach(rendered::append);
// rendered.append(renderCloseTag());
// return rendered.toString();
//fastest
StringBuilder rendered = new StringBuilder(renderOpenTag());
if (children != null && children.size() > 0) {
for (Tag child : children) {

97
src/test/java/performancetester/RenderSpeed.java
View File

@@ -1,97 +0,0 @@
package performancetester;
import j2html.tags.ContainerTag;
import org.junit.Test;
import java.util.concurrent.TimeUnit;
import java.util.function.IntConsumer;
import java.util.stream.IntStream;
import java.util.stream.LongStream;
import static j2html.TagCreator.*;
import static org.junit.Assert.assertEquals;
public class RenderSpeed {
/**
* This test class is only used during development of j2html, to see if changes to data-types and rendering
* techniques have a positive or negative impact
*/
public int iterations = 100000;
public int precision = 10;
@Test
public void testFullPageRenderSpeed() {
ContainerTag complexTestTag = html().with(body().with(header(), main().with(p("Main stuff...")), footer().condWith(1 == 1, p("Conditional with!"))));
String expectedResult = "<html><body><header></header><main><p>Main stuff...</p></main><footer><p>Conditional with!</p></footer></body></html>";
assertEquals(complexTestTag.render(), (expectedResult));
String methodName = new Object(){}.getClass().getEnclosingMethod().getName();
measureAvgMethodTime(this::fullPageRenderTest, iterations, precision, methodName);
}
@Test
public void testAttributeRenderSpeed() {
String methodName = new Object(){}.getClass().getEnclosingMethod().getName();
measureAvgMethodTime(this::attributeRenderTest, iterations, precision, methodName);
}
public void attributeRenderTest(int i) {
tag("div " + i)
.attr("just", "adding")
.attr("some", "pretty")
.attr("random", "attributes")
.attr("to", "this")
.attr("div", "here").render();
}
public String fullPageRenderTest(int i) {
return html().with(
head().with(
title().withText("Test " + i)
),
body().with(
header().with(
h1("Test Header")
),
main().with(
h2("Test Form"),
div().with(
input().withType("email").withName("email").withPlaceholder("Email"),
input().withType("password").withName("password").withPlaceholder("Password"),
input().withType("password").withName("repeatPassword").withPlaceholder("Repeat password"),
input().withType("password").withName("repeatPasswordAgain").withPlaceholder("Repeat password again"),
button().withType("submit").withText("Login")
),
div().withText(
"<script>alert(1)</script>"
)
),
footer().withText("Test Footer"),
script().withSrc("/testScript.js")
)
).render();
}
/**
* Please tell me if there is a proper way to do this :D
*
* @param method the method to measure
* @param iterations the number of times to run the method
* @param precision the number of times to run the timer
* @param methodName the name of the method (only used for output)
*/
private void measureAvgMethodTime(IntConsumer method, int iterations, int precision, String methodName) {
double averageTime = LongStream.range(0, precision).map(l -> measureMethodTime(method, iterations)).average().getAsDouble();
System.out.println("\n" + methodName + ": " + averageTime + "ms was avg runtime per " + String.format("%,d", iterations) + " iterations (ran " + precision + " times) \n");
}
private long measureMethodTime(IntConsumer method, int iterations) {
long startTime = System.nanoTime();
IntStream.range(0, iterations).parallel().forEach(method);
long endTime = System.nanoTime();
System.out.print(TimeUnit.NANOSECONDS.toMillis(endTime - startTime) + " ");
return TimeUnit.NANOSECONDS.toMillis(endTime - startTime);
}
}