Skip to content

Commit 39fccba

Browse files
author
Jonathan Haber
committed
Make it build
1 parent 39937af commit 39fccba

209 files changed

Lines changed: 1317 additions & 1314 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎benchmark/src/main/java/com/hubspot/jinjava/benchmarks/jinja2/Article.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ public class Article {
1717
private String body;
1818
private Date pubDate;
1919
private boolean published;
20-
20+
2121
public Article(int id, User user) throws NoSuchAlgorithmException {
2222
this.id = id;
2323
this.href = "/article/" + id;
24-
24+
2525
LoremIpsum ipsum = new LoremIpsum();
2626
SecureRandom rnd = SecureRandom.getInstanceStrong();
27-
27+
2828
this.title = ipsum.getWords(10);
2929
this.user = user;
3030
this.body = ipsum.getParagraphs();
@@ -59,5 +59,5 @@ public Date getPubDate() {
5959
public boolean isPublished() {
6060
return published;
6161
}
62-
62+
6363
}

‎benchmark/src/main/java/com/hubspot/jinjava/benchmarks/jinja2/Jinja2Benchmark.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,29 @@
2929

3030
@State(Scope.Benchmark)
3131
public class Jinja2Benchmark {
32-
32+
3333
public String complexTemplate;
3434
public Map<String, ?> complexBindings;
35-
35+
3636
public Jinjava jinjava;
37-
37+
3838
public JinjavaInterpreter interpreter;
3939
public Node precompiledTemplate;
40-
40+
4141
@SuppressWarnings("unchecked")
4242
@Setup
4343
public void setup() throws IOException, NoSuchAlgorithmException {
4444
ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME);
4545
logger.setLevel(Level.WARN);
46-
46+
4747
jinjava = new Jinjava();
4848
interpreter = jinjava.newInterpreter();
49-
49+
5050
FileLocator locator = new FileLocator(new File("jinja2/examples/rwbench/jinja"));
5151
final String helpersTemplate = locator.getString("helpers.html", StandardCharsets.UTF_8, interpreter);
5252
final String indexTemplate = locator.getString("index.html", StandardCharsets.UTF_8, interpreter);
5353
final String layoutTemplate = locator.getString("layout.html", StandardCharsets.UTF_8, interpreter);
54-
54+
5555
jinjava.setResourceLocator(new ResourceLocator() {
5656
@Override
5757
public String getString(String fullName, Charset encoding, JinjavaInterpreter interpreter) throws IOException {
@@ -66,28 +66,28 @@ public String getString(String fullName, Charset encoding, JinjavaInterpreter in
6666
return null;
6767
}
6868
});
69-
69+
7070
complexTemplate = indexTemplate;
7171
// for tag doesn't support postfix conditional filtering
7272
complexTemplate = complexTemplate.replaceAll(" if article.published", "");
73-
73+
7474
List<User> users = Lists.newArrayList(new User("John Doe"), new User("Jane Doe"), new User("Peter Somewhat"));
7575
SecureRandom rnd = SecureRandom.getInstanceStrong();
7676
List<Article> articles = new ArrayList<>();
7777
for(int i = 0; i < 20; i++) {
7878
articles.add(new Article(i, users.get(rnd.nextInt(users.size()))));
7979
}
8080
List<ArrayList<String>> navigation = Lists.newArrayList(
81-
Lists.newArrayList("index", "Index"),
81+
Lists.newArrayList("index", "Index"),
8282
Lists.newArrayList("about", "About"),
8383
Lists.newArrayList("foo?bar=1", "Foo with Bar"),
8484
Lists.newArrayList("foo?bar=2&s=x", "Foo with X"),
8585
Lists.newArrayList("blah", "Blub Blah"),
8686
Lists.newArrayList("hehe", "Haha")
8787
);
88-
88+
8989
complexBindings = ImmutableMap.of("users", users, "articles", articles, "navigation", navigation);
90-
90+
9191
precompiledTemplate = interpreter.parse(complexTemplate);
9292
}
9393

@@ -100,12 +100,12 @@ public String realWorldishBenchmark() {
100100
public String precompiledBenchmark() {
101101
return interpreter.render(precompiledTemplate, true);
102102
}
103-
103+
104104
public static void main(String[] args) throws Exception {
105105
Jinja2Benchmark b = new Jinja2Benchmark();
106106
b.setup();
107107
System.out.println(b.realWorldishBenchmark());
108108
System.out.println(b.precompiledBenchmark());
109109
}
110-
110+
111111
}

‎benchmark/src/main/java/com/hubspot/jinjava/benchmarks/jinja2/User.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ public class User {
44

55
private String href;
66
private String username;
7-
7+
88
public User(String username) {
99
this.href = "/user/" + username;
1010
this.username = username;
1111
}
12-
12+
1313
public String getHref() {
1414
return href;
1515
}
16-
16+
1717
public String getUsername() {
1818
return username;
1919
}

‎benchmark/src/main/java/com/hubspot/jinjava/benchmarks/liquid/Filters.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* Liquid::Template.register_filter WeightFilter
2323
* Liquid::Template.register_filter ShopFilter
2424
* Liquid::Template.register_filter TagFilter
25-
*
25+
*
2626
* @author jstehler
2727
*
2828
*/
@@ -37,7 +37,7 @@ public Object filter(Object object, JinjavaInterpreter interpreter, String... ar
3737
return Functions.dateTimeFormat(ZonedDateTime.now(), arg);
3838
}
3939
}
40-
40+
4141
public static class JsonFilter implements Filter {
4242
@Override
4343
public String getName() {
@@ -81,7 +81,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
8181
return val + " USD";
8282
}
8383
}
84-
84+
8585
public static class WeightFilter implements Filter {
8686
@Override
8787
public String getName() {
@@ -130,7 +130,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
130130
return "/global/" + var;
131131
}
132132
}
133-
133+
134134
public static class ShopShopifyAssetUrl implements Filter {
135135
@Override
136136
public String getName() {
@@ -142,7 +142,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
142142
return "/shopify/" + var;
143143
}
144144
}
145-
145+
146146
public static class ShopScriptTag implements Filter {
147147
@Override
148148
public String getName() {
@@ -154,7 +154,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
154154
return String.format("<script src=\"%s\" type=\"text/javascript\"></script>", var);
155155
}
156156
}
157-
157+
158158
public static class ShopStylesheetTag implements Filter {
159159
@Override
160160
public String getName() {
@@ -170,7 +170,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
170170
return String.format("<link href=\"%s\" rel=\"stylesheet\" type=\"text/css\" media=\"%s\" />", var, media);
171171
}
172172
}
173-
173+
174174
public static class ShopLinkTo implements Filter {
175175
@Override
176176
public String getName() {
@@ -187,7 +187,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
187187
return String.format("<a href=\"%s\" title=\"%s\">%s</a>", url, title, var);
188188
}
189189
}
190-
190+
191191
public static class ShopImgTagFilter implements Filter {
192192
@Override
193193
public String getName() {
@@ -200,7 +200,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
200200
if(args.length > 0) {
201201
alt = args[0];
202202
}
203-
203+
204204
return String.format("<img src=\"%s\" alt=\"%s\" />", var, alt);
205205
}
206206
}
@@ -215,7 +215,7 @@ public String getName() {
215215
public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
216216
String label = Objects.toString(var);
217217
String tag = args[0];
218-
218+
219219
return String.format("<a title=\"Show tag %s\" href=\"/collections/%s/%s\">%s</a>", tag, interpreter.getContext().get("handle"), tag, label);
220220
}
221221
}
@@ -233,7 +233,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
233233
if(args.length > 0) {
234234
cssClass = args[0];
235235
}
236-
236+
237237
Collection<String> currentTags = getCurrentTags(interpreter);
238238
if(currentTags.contains(tag)) {
239239
return String.format("<span class=\"%s\">%s</span>", cssClass, tag);
@@ -254,10 +254,10 @@ public String getName() {
254254
public Object filter(Object var, JinjavaInterpreter interpreter, String... args) {
255255
String label = Objects.toString(var);
256256
String tag = args[0];
257-
257+
258258
Set<String> tags = new TreeSet<String>(getCurrentTags(interpreter));
259259
tags.add(tag);
260-
260+
261261
return String.format("<a title=\"Show tag %s\" href=\"/collections/%s/%s\">%s</a>",
262262
tag, interpreter.getContext().get("handle"), StringUtils.join(tags, '+'), label);
263263
}
@@ -276,7 +276,7 @@ public Object filter(Object var, JinjavaInterpreter interpreter, String... args)
276276

277277
Set<String> tags = new TreeSet<String>(getCurrentTags(interpreter));
278278
tags.remove(tag);
279-
279+
280280
return String.format("<a title=\"Show tag %s\" href=\"/collections/%s/%s\">%s</a>",
281281
tag, interpreter.getContext().get("handle"), StringUtils.join(tags, '+'), label);
282282
}

‎benchmark/src/main/java/com/hubspot/jinjava/benchmarks/liquid/LiquidBenchmark.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@
2727

2828
@State(Scope.Benchmark)
2929
public class LiquidBenchmark {
30-
30+
3131
public List<String> templates;
3232
public Map<String, ?> bindings;
33-
33+
3434
public Jinjava jinjava;
35-
35+
3636
@SuppressWarnings("unchecked")
3737
@Setup
3838
public void setup() throws IOException {
3939
ch.qos.logback.classic.Logger logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(ch.qos.logback.classic.Logger.ROOT_LOGGER_NAME);
4040
logger.setLevel(Level.WARN);
41-
41+
4242
jinjava = new Jinjava();
4343

4444
jinjava.getGlobalContext().registerClasses(
4545
Filters.OverrideDateFilter.class,
46-
46+
4747
Filters.JsonFilter.class,
4848
Filters.LinkToAddTagFilter.class,
4949
Filters.LinkToRemoveTagFilter.class,
@@ -60,21 +60,21 @@ public void setup() throws IOException {
6060
Filters.ShopStylesheetTag.class,
6161
Filters.WeightFilter.class,
6262
Filters.WeightWithUnitFilter.class,
63-
63+
6464
Tags.AssignTag.class,
6565
Tags.CommentFormTag.class,
6666
Tags.PaginateTag.class,
6767
Tags.TableRowTag.class
6868
);
69-
69+
7070
templates = new ArrayList<>();
71-
71+
7272
Map<String, ?> db = (Map<String, ?>) new Yaml().load(readFileToString(new File("liquid/performance/shopify/vision.database.yml"), StandardCharsets.UTF_8));
7373
bindings = new HashMap<>(db);
74-
74+
7575
File baseDir = new File("liquid/performance/tests");
7676
for(File tmpl : listFiles(baseDir, new String[]{"liquid"}, true)){
77-
77+
7878
String template = readFileToString(tmpl, StandardCharsets.UTF_8);
7979
// convert filter syntax from ':' to '()'
8080
template = template.replaceAll("\\| ([\\w_]+): (.*?)(\\||})", "| $1($2)$3");
@@ -88,14 +88,14 @@ public void setup() throws IOException {
8888
template = template.replaceAll("cols:\\s*\\d*", "");
8989
// no support for for reversal
9090
template = template.replaceAll(" reversed", "");
91-
91+
9292
// System.out.println("Adding template: " + tmpl.getAbsolutePath());
9393
// System.out.println(template);
9494

9595
templates.add(template);
9696
}
9797
}
98-
98+
9999
@Benchmark
100100
public void parse(Blackhole blackhole) {
101101
JinjavaInterpreter interpreter = jinjava.newInterpreter();
@@ -107,7 +107,7 @@ public void parse(Blackhole blackhole) {
107107
}
108108
}
109109
}
110-
110+
111111
@Benchmark
112112
public void parseAndRender(Blackhole blackhole) {
113113
for(String template : templates) {
@@ -117,7 +117,7 @@ public void parseAndRender(Blackhole blackhole) {
117117
}
118118
}
119119
}
120-
120+
121121
public static void main(String[] args) throws Exception {
122122
LiquidBenchmark b = new LiquidBenchmark();
123123
b.setup();

‎benchmark/src/main/java/com/hubspot/jinjava/benchmarks/liquid/Tags.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Liquid::Template.register_tag 'paginate', Paginate
1111
* Liquid::Template.register_tag 'form', CommentForm
12-
*
12+
*
1313
* @author jstehler
1414
*
1515
*/
@@ -31,14 +31,14 @@ public String getEndTagName() {
3131
return "endpaginate";
3232
}
3333
}
34-
34+
3535
public static class CommentFormTag implements Tag {
3636
@Override
3737
public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
38-
38+
3939
return null;
4040
}
41-
41+
4242
@Override
4343
public String getName() {
4444
return "form";
@@ -49,14 +49,14 @@ public String getEndTagName() {
4949
return "endform";
5050
}
5151
}
52-
52+
5353
public static class AssignTag extends SetTag {
5454
@Override
5555
public String getName() {
5656
return "assign";
5757
}
5858
}
59-
59+
6060
public static class TableRowTag implements Tag {
6161
@Override
6262
public String interpret(TagNode tagNode, JinjavaInterpreter interpreter) {
@@ -72,5 +72,5 @@ public String getEndTagName() {
7272
return "endtablerow";
7373
}
7474
}
75-
75+
7676
}

0 commit comments

Comments
 (0)