Skip to content

Commit 2daefaf

Browse files
jaredstehlerjaredstehler
committed
switch to jdk StandardCharsets, organize imports
1 parent 3ecf482 commit 2daefaf

32 files changed

+84
-110
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import java.security.SecureRandom;
55
import java.util.Date;
66

7-
import org.joda.time.DateTime;
8-
97
import de.svenjacobs.loremipsum.LoremIpsum;
108

119
public class Article {

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.File;
44
import java.io.IOException;
55
import java.nio.charset.Charset;
6+
import java.nio.charset.StandardCharsets;
67
import java.security.NoSuchAlgorithmException;
78
import java.security.SecureRandom;
89
import java.util.ArrayList;
@@ -17,14 +18,6 @@
1718

1819
import ch.qos.logback.classic.Level;
1920

20-
import com.google.common.base.Charsets;
21-
import com.google.common.collect.ImmutableMap;
22-
import com.google.common.collect.Lists;
23-
import com.hubspot.jinjava.Jinjava;
24-
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
25-
import com.hubspot.jinjava.loader.FileLocator;
26-
import com.hubspot.jinjava.loader.ResourceLocator;
27-
2821

2922
@State(Scope.Benchmark)
3023
public class Jinja2Benchmark {
@@ -44,9 +37,9 @@ public void setup() throws IOException, NoSuchAlgorithmException {
4437
JinjavaInterpreter interpreter = new JinjavaInterpreter(jinjava, jinjava.getGlobalContext(), jinjava.getGlobalConfig());
4538

4639
FileLocator locator = new FileLocator(new File("jinja2/examples/rwbench/jinja"));
47-
final String helpersTemplate = locator.getString("helpers.html", Charsets.UTF_8, interpreter);
48-
final String indexTemplate = locator.getString("index.html", Charsets.UTF_8, interpreter);
49-
final String layoutTemplate = locator.getString("layout.html", Charsets.UTF_8, interpreter);
40+
final String helpersTemplate = locator.getString("helpers.html", StandardCharsets.UTF_8, interpreter);
41+
final String indexTemplate = locator.getString("index.html", StandardCharsets.UTF_8, interpreter);
42+
final String layoutTemplate = locator.getString("layout.html", StandardCharsets.UTF_8, interpreter);
5043

5144
jinjava.setResourceLocator(new ResourceLocator() {
5245
@Override

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
package com.hubspot.jinjava.benchmarks.liquid;
22

3-
import static org.apache.commons.lang3.math.NumberUtils.toDouble;
4-
53
import java.util.ArrayList;
64
import java.util.Collection;
75
import java.util.Objects;
86
import java.util.Set;
97
import java.util.TreeSet;
108

11-
import org.apache.commons.lang3.StringUtils;
12-
import org.joda.time.DateTime;
13-
14-
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
15-
import com.hubspot.jinjava.lib.filter.DatetimeFilter;
16-
import com.hubspot.jinjava.lib.filter.Filter;
17-
import com.hubspot.jinjava.lib.fn.Functions;
18-
199
/**
2010
* Liquid::Template.register_filter JsonFilter
2111
* Liquid::Template.register_filter MoneyFilter

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import java.io.File;
77
import java.io.IOException;
8+
import java.nio.charset.StandardCharsets;
89
import java.util.ArrayList;
910
import java.util.HashMap;
1011
import java.util.List;
@@ -20,11 +21,6 @@
2021

2122
import ch.qos.logback.classic.Level;
2223

23-
import com.google.common.base.Charsets;
24-
import com.hubspot.jinjava.Jinjava;
25-
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
26-
import com.hubspot.jinjava.tree.Node;
27-
2824
@State(Scope.Benchmark)
2925
public class LiquidBenchmark {
3026

@@ -69,13 +65,13 @@ public void setup() throws IOException {
6965

7066
templates = new ArrayList<>();
7167

72-
Map<String, ?> db = (Map<String, ?>) new Yaml().load(readFileToString(new File("liquid/performance/shopify/vision.database.yml"), Charsets.UTF_8));
68+
Map<String, ?> db = (Map<String, ?>) new Yaml().load(readFileToString(new File("liquid/performance/shopify/vision.database.yml"), StandardCharsets.UTF_8));
7369
bindings = new HashMap<>(db);
7470

7571
File baseDir = new File("liquid/performance/tests");
7672
for(File tmpl : listFiles(baseDir, new String[]{"liquid"}, true)){
7773

78-
String template = readFileToString(tmpl, Charsets.UTF_8);
74+
String template = readFileToString(tmpl, StandardCharsets.UTF_8);
7975
// convert filter syntax from ':' to '()'
8076
template = template.replaceAll("\\| ([\\w_]+): (.*?)(\\||})", "| $1($2)$3");
8177
// jinjava doesn't have the '?' postfix binary operator

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
package com.hubspot.jinjava.benchmarks.liquid;
22

3-
import com.hubspot.jinjava.interpret.JinjavaInterpreter;
4-
import com.hubspot.jinjava.lib.tag.SetTag;
5-
import com.hubspot.jinjava.lib.tag.Tag;
6-
import com.hubspot.jinjava.tree.TagNode;
73

84
/**
95
* Liquid::Template.register_tag 'paginate', Paginate

‎src/main/java/com/hubspot/jinjava/JinjavaConfig.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
package com.hubspot.jinjava;
1717

1818
import java.nio.charset.Charset;
19+
import java.nio.charset.StandardCharsets;
1920
import java.util.Locale;
2021

2122
import org.joda.time.DateTimeZone;
2223

23-
import com.google.common.base.Charsets;
24-
2524
public class JinjavaConfig {
2625

2726
private final Charset charset;
@@ -30,7 +29,7 @@ public class JinjavaConfig {
3029
private final int maxRenderDepth;
3130

3231
public JinjavaConfig() {
33-
charset = Charsets.UTF_8;
32+
charset = StandardCharsets.UTF_8;
3433
locale = Locale.ENGLISH;
3534
timeZone = DateTimeZone.UTC;
3635
maxRenderDepth = 10;

‎src/main/java/com/hubspot/jinjava/el/ext/AbsOperator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.hubspot.jinjava.el.ext;
22

33
import de.odysseus.el.misc.TypeConverter;
4-
import de.odysseus.el.tree.impl.Scanner;
54
import de.odysseus.el.tree.impl.Parser.ExtensionHandler;
65
import de.odysseus.el.tree.impl.Parser.ExtensionPoint;
6+
import de.odysseus.el.tree.impl.Scanner;
77
import de.odysseus.el.tree.impl.Scanner.ExtensionToken;
88
import de.odysseus.el.tree.impl.ast.AstNode;
99
import de.odysseus.el.tree.impl.ast.AstUnary;

‎src/main/java/com/hubspot/jinjava/el/ext/CollectionMembershipOperator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
import org.apache.commons.lang3.StringUtils;
77

88
import de.odysseus.el.misc.TypeConverter;
9-
import de.odysseus.el.tree.impl.Scanner;
109
import de.odysseus.el.tree.impl.Parser.ExtensionHandler;
1110
import de.odysseus.el.tree.impl.Parser.ExtensionPoint;
11+
import de.odysseus.el.tree.impl.Scanner;
1212
import de.odysseus.el.tree.impl.ast.AstBinary;
13-
import de.odysseus.el.tree.impl.ast.AstNode;
1413
import de.odysseus.el.tree.impl.ast.AstBinary.SimpleOperator;
14+
import de.odysseus.el.tree.impl.ast.AstNode;
1515

1616
public class CollectionMembershipOperator extends SimpleOperator {
1717

‎src/main/java/com/hubspot/jinjava/el/ext/StringConcatOperator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.hubspot.jinjava.el.ext;
22

33
import de.odysseus.el.misc.TypeConverter;
4-
import de.odysseus.el.tree.impl.Scanner;
54
import de.odysseus.el.tree.impl.Parser.ExtensionHandler;
65
import de.odysseus.el.tree.impl.Parser.ExtensionPoint;
6+
import de.odysseus.el.tree.impl.Scanner;
77
import de.odysseus.el.tree.impl.ast.AstBinary;
88
import de.odysseus.el.tree.impl.ast.AstBinary.SimpleOperator;
99
import de.odysseus.el.tree.impl.ast.AstNode;

‎src/test/java/com/hubspot/jinjava/el/ExtendedSyntaxBuilderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static org.assertj.core.api.Assertions.entry;
55

66
import java.io.IOException;
7+
import java.nio.charset.StandardCharsets;
78
import java.util.Arrays;
89
import java.util.List;
910
import java.util.Map;
@@ -12,7 +13,6 @@
1213
import org.junit.Before;
1314
import org.junit.Test;
1415

15-
import com.google.common.base.Charsets;
1616
import com.google.common.base.Throwables;
1717
import com.google.common.collect.Lists;
1818
import com.google.common.io.Resources;
@@ -188,7 +188,7 @@ public void itReturnsRightResultForOrExpr() throws Exception {
188188
private String fixture(String name) {
189189
try {
190190
return Resources.toString(
191-
Resources.getResource(String.format("el/dict/%s.fixture", name)), Charsets.UTF_8);
191+
Resources.getResource(String.format("el/dict/%s.fixture", name)), StandardCharsets.UTF_8);
192192
} catch (IOException e) {
193193
throw Throwables.propagate(e);
194194
}

0 commit comments

Comments
 (0)