Skip to content

Commit 5cb2463

Browse files
author
jhaber
committed
Enable prettier-java for formatting
1 parent 9f663d8 commit 5cb2463

File tree

377 files changed

+9340
-5823
lines changed

Some content is hidden

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

377 files changed

+9340
-5823
lines changed

‎.prettier-java-enabled‎

Whitespace-only changes.

‎pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.hubspot</groupId>
77
<artifactId>basepom</artifactId>
8-
<version>25.4</version>
8+
<version>25.6-SNAPSHOT</version>
99
</parent>
1010

1111
<groupId>com.hubspot.jinjava</groupId>
@@ -14,6 +14,8 @@
1414
<description>Jinja templating engine implemented in Java</description>
1515

1616
<properties>
17+
<basepom.check.skip-prettier>false</basepom.check.skip-prettier>
18+
1719
<dep.javassist.version>3.24.1-GA</dep.javassist.version>
1820

1921
<dep.plugin.jacoco.version>0.8.3</dep.plugin.jacoco.version>

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

Lines changed: 55 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515
**********************************************************************/
1616
package com.hubspot.jinjava;
1717

18-
import java.util.List;
19-
import java.util.Map;
20-
import java.util.Properties;
21-
import java.util.stream.Collectors;
22-
23-
import javax.el.ExpressionFactory;
24-
2518
import com.hubspot.jinjava.doc.JinjavaDoc;
2619
import com.hubspot.jinjava.doc.JinjavaDocFactory;
2720
import com.hubspot.jinjava.el.ExtendedSyntaxBuilder;
@@ -38,10 +31,14 @@
3831
import com.hubspot.jinjava.interpret.TemplateSyntaxException;
3932
import com.hubspot.jinjava.loader.ClasspathResourceLocator;
4033
import com.hubspot.jinjava.loader.ResourceLocator;
41-
4234
import de.odysseus.el.ExpressionFactoryImpl;
4335
import de.odysseus.el.misc.TypeConverter;
4436
import de.odysseus.el.tree.TreeBuilder;
37+
import java.util.List;
38+
import java.util.Map;
39+
import java.util.Properties;
40+
import java.util.stream.Collectors;
41+
import javax.el.ExpressionFactory;
4542

4643
/**
4744
* The main client API for the Jinjava library, instances of this class can be used to render jinja templates with a given map of context values. Example use:
@@ -58,7 +55,6 @@
5855
* @author jstehler
5956
*/
6057
public class Jinjava {
61-
6258
private ExpressionFactory expressionFactory;
6359
private ResourceLocator resourceLocator;
6460

@@ -83,7 +79,10 @@ public Jinjava(JinjavaConfig globalConfig) {
8379
this.globalContext = new Context();
8480

8581
Properties expConfig = new Properties();
86-
expConfig.setProperty(TreeBuilder.class.getName(), ExtendedSyntaxBuilder.class.getName());
82+
expConfig.setProperty(
83+
TreeBuilder.class.getName(),
84+
ExtendedSyntaxBuilder.class.getName()
85+
);
8786

8887
TypeConverter converter = new TruthyTypeConverter();
8988
this.expressionFactory = new ExpressionFactoryImpl(expConfig, converter);
@@ -149,9 +148,11 @@ public JinjavaDoc getJinjavaDoc() {
149148
public String render(String template, Map<String, ?> bindings) {
150149
RenderResult result = renderForResult(template, bindings);
151150

152-
List<TemplateError> fatalErrors = result.getErrors().stream()
153-
.filter(error -> error.getSeverity() == ErrorType.FATAL)
154-
.collect(Collectors.toList());
151+
List<TemplateError> fatalErrors = result
152+
.getErrors()
153+
.stream()
154+
.filter(error -> error.getSeverity() == ErrorType.FATAL)
155+
.collect(Collectors.toList());
155156

156157
if (!fatalErrors.isEmpty()) {
157158
throw new FatalTemplateErrorsException(template, fatalErrors);
@@ -186,31 +187,61 @@ public RenderResult renderForResult(String template, Map<String, ?> bindings) {
186187
* used to override specific config values for this render operation
187188
* @return result object containing rendered output, render context, and any encountered errors
188189
*/
189-
public RenderResult renderForResult(String template, Map<String, ?> bindings, JinjavaConfig renderConfig) {
190+
public RenderResult renderForResult(
191+
String template,
192+
Map<String, ?> bindings,
193+
JinjavaConfig renderConfig
194+
) {
190195
Context context = new Context(globalContext, bindings, renderConfig.getDisabled());
191196

192197
JinjavaInterpreter parentInterpreter = JinjavaInterpreter.getCurrent();
193198
if (parentInterpreter != null) {
194199
renderConfig = parentInterpreter.getConfig();
195200
}
196201

197-
JinjavaInterpreter interpreter = globalConfig.getInterpreterFactory().newInstance(this, context, renderConfig);
202+
JinjavaInterpreter interpreter = globalConfig
203+
.getInterpreterFactory()
204+
.newInstance(this, context, renderConfig);
198205
JinjavaInterpreter.pushCurrent(interpreter);
199206

200207
try {
201208
String result = interpreter.render(template);
202-
return new RenderResult(result, interpreter.getContext(), interpreter.getErrorsCopy());
209+
return new RenderResult(
210+
result,
211+
interpreter.getContext(),
212+
interpreter.getErrorsCopy()
213+
);
203214
} catch (InterpretException e) {
204215
if (e instanceof TemplateSyntaxException) {
205-
return new RenderResult(TemplateError.fromException((TemplateSyntaxException) e), interpreter.getContext(), interpreter.getErrorsCopy());
216+
return new RenderResult(
217+
TemplateError.fromException((TemplateSyntaxException) e),
218+
interpreter.getContext(),
219+
interpreter.getErrorsCopy()
220+
);
206221
}
207-
return new RenderResult(TemplateError.fromSyntaxError(e), interpreter.getContext(), interpreter.getErrorsCopy());
222+
return new RenderResult(
223+
TemplateError.fromSyntaxError(e),
224+
interpreter.getContext(),
225+
interpreter.getErrorsCopy()
226+
);
208227
} catch (InvalidArgumentException e) {
209-
return new RenderResult(TemplateError.fromInvalidArgumentException(e), interpreter.getContext(), interpreter.getErrorsCopy());
228+
return new RenderResult(
229+
TemplateError.fromInvalidArgumentException(e),
230+
interpreter.getContext(),
231+
interpreter.getErrorsCopy()
232+
);
210233
} catch (InvalidInputException e) {
211-
return new RenderResult(TemplateError.fromInvalidInputException(e), interpreter.getContext(), interpreter.getErrorsCopy());
234+
return new RenderResult(
235+
TemplateError.fromInvalidInputException(e),
236+
interpreter.getContext(),
237+
interpreter.getErrorsCopy()
238+
);
212239
} catch (Exception e) {
213-
return new RenderResult(TemplateError.fromException(e), interpreter.getContext(), interpreter.getErrorsCopy());
240+
return new RenderResult(
241+
TemplateError.fromException(e),
242+
interpreter.getContext(),
243+
interpreter.getErrorsCopy()
244+
);
214245
} finally {
215246
globalContext.reset();
216247
JinjavaInterpreter.popCurrent();
@@ -223,7 +254,8 @@ public RenderResult renderForResult(String template, Map<String, ?> bindings, Ji
223254
* @return a new interpreter instance
224255
*/
225256
public JinjavaInterpreter newInterpreter() {
226-
return globalConfig.getInterpreterFactory().newInstance(this, this.getGlobalContext(), this.getGlobalConfig());
257+
return globalConfig
258+
.getInterpreterFactory()
259+
.newInstance(this, this.getGlobalContext(), this.getGlobalConfig());
227260
}
228-
229261
}

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

Lines changed: 93 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
**********************************************************************/
1616
package com.hubspot.jinjava;
1717

18+
import com.hubspot.jinjava.interpret.Context;
19+
import com.hubspot.jinjava.interpret.Context.Library;
20+
import com.hubspot.jinjava.interpret.InterpreterFactory;
21+
import com.hubspot.jinjava.interpret.JinjavaInterpreterFactory;
22+
import com.hubspot.jinjava.random.RandomNumberGeneratorStrategy;
1823
import java.nio.charset.Charset;
1924
import java.nio.charset.StandardCharsets;
2025
import java.time.ZoneId;
@@ -24,14 +29,7 @@
2429
import java.util.Map;
2530
import java.util.Set;
2631

27-
import com.hubspot.jinjava.interpret.Context;
28-
import com.hubspot.jinjava.interpret.Context.Library;
29-
import com.hubspot.jinjava.interpret.InterpreterFactory;
30-
import com.hubspot.jinjava.interpret.JinjavaInterpreterFactory;
31-
import com.hubspot.jinjava.random.RandomNumberGeneratorStrategy;
32-
3332
public class JinjavaConfig {
34-
3533
private final Charset charset;
3634
private final Locale locale;
3735
private final ZoneId timeZone;
@@ -62,30 +60,73 @@ public JinjavaConfig() {
6260
}
6361

6462
public JinjavaConfig(InterpreterFactory interpreterFactory) {
65-
this(StandardCharsets.UTF_8, Locale.ENGLISH, ZoneOffset.UTC, 10, new HashMap<>(), false, false, true, false, 0, false, 0, true, RandomNumberGeneratorStrategy.THREAD_LOCAL, false, 0, interpreterFactory);
63+
this(
64+
StandardCharsets.UTF_8,
65+
Locale.ENGLISH,
66+
ZoneOffset.UTC,
67+
10,
68+
new HashMap<>(),
69+
false,
70+
false,
71+
true,
72+
false,
73+
0,
74+
false,
75+
0,
76+
true,
77+
RandomNumberGeneratorStrategy.THREAD_LOCAL,
78+
false,
79+
0,
80+
interpreterFactory
81+
);
6682
}
6783

68-
public JinjavaConfig(Charset charset, Locale locale, ZoneId timeZone, int maxRenderDepth) {
69-
this(charset, locale, timeZone, maxRenderDepth, new HashMap<>(), false, false, true, false, 0, false, 0, true, RandomNumberGeneratorStrategy.THREAD_LOCAL, false, 0, new JinjavaInterpreterFactory());
84+
public JinjavaConfig(
85+
Charset charset,
86+
Locale locale,
87+
ZoneId timeZone,
88+
int maxRenderDepth
89+
) {
90+
this(
91+
charset,
92+
locale,
93+
timeZone,
94+
maxRenderDepth,
95+
new HashMap<>(),
96+
false,
97+
false,
98+
true,
99+
false,
100+
0,
101+
false,
102+
0,
103+
true,
104+
RandomNumberGeneratorStrategy.THREAD_LOCAL,
105+
false,
106+
0,
107+
new JinjavaInterpreterFactory()
108+
);
70109
}
71110

72-
private JinjavaConfig(Charset charset,
73-
Locale locale,
74-
ZoneId timeZone,
75-
int maxRenderDepth,
76-
Map<Context.Library, Set<String>> disabled,
77-
boolean trimBlocks,
78-
boolean lstripBlocks,
79-
boolean readOnlyResolver,
80-
boolean enableRecursiveMacroCalls,
81-
int maxMacroRecursionDepth,
82-
boolean failOnUnknownTokens,
83-
long maxOutputSize,
84-
boolean nestedInterpretationEnabled,
85-
RandomNumberGeneratorStrategy randomNumberGenerator,
86-
boolean validationMode,
87-
long maxStringLength,
88-
InterpreterFactory interpreterFactory) {
111+
private JinjavaConfig(
112+
Charset charset,
113+
Locale locale,
114+
ZoneId timeZone,
115+
int maxRenderDepth,
116+
Map<Context.Library, Set<String>> disabled,
117+
boolean trimBlocks,
118+
boolean lstripBlocks,
119+
boolean readOnlyResolver,
120+
boolean enableRecursiveMacroCalls,
121+
int maxMacroRecursionDepth,
122+
boolean failOnUnknownTokens,
123+
long maxOutputSize,
124+
boolean nestedInterpretationEnabled,
125+
RandomNumberGeneratorStrategy randomNumberGenerator,
126+
boolean validationMode,
127+
long maxStringLength,
128+
InterpreterFactory interpreterFactory
129+
) {
89130
this.charset = charset;
90131
this.locale = locale;
91132
this.timeZone = timeZone;
@@ -189,13 +230,13 @@ public static class Builder {
189230
private int maxMacroRecursionDepth;
190231
private boolean failOnUnknownTokens;
191232
private boolean nestedInterpretationEnabled = true;
192-
private RandomNumberGeneratorStrategy randomNumberGeneratorStrategy = RandomNumberGeneratorStrategy.THREAD_LOCAL;
233+
private RandomNumberGeneratorStrategy randomNumberGeneratorStrategy =
234+
RandomNumberGeneratorStrategy.THREAD_LOCAL;
193235
private boolean validationMode = false;
194236
private long maxStringLength = 0;
195237
private InterpreterFactory interpreterFactory = new JinjavaInterpreterFactory();
196238

197-
private Builder() {
198-
}
239+
private Builder() {}
199240

200241
public Builder withCharset(Charset charset) {
201242
this.charset = charset;
@@ -222,12 +263,13 @@ public Builder withMaxRenderDepth(int maxRenderDepth) {
222263
return this;
223264
}
224265

225-
public Builder withRandomNumberGeneratorStrategy(RandomNumberGeneratorStrategy randomNumberGeneratorStrategy) {
266+
public Builder withRandomNumberGeneratorStrategy(
267+
RandomNumberGeneratorStrategy randomNumberGeneratorStrategy
268+
) {
226269
this.randomNumberGeneratorStrategy = randomNumberGeneratorStrategy;
227270
return this;
228271
}
229272

230-
231273
public Builder withTrimBlocks(boolean trimBlocks) {
232274
this.trimBlocks = trimBlocks;
233275
return this;
@@ -284,25 +326,25 @@ public Builder withInterperterFactory(InterpreterFactory interperterFactory) {
284326
}
285327

286328
public JinjavaConfig build() {
287-
return new JinjavaConfig(charset,
288-
locale,
289-
timeZone,
290-
maxRenderDepth,
291-
disabled,
292-
trimBlocks,
293-
lstripBlocks,
294-
readOnlyResolver,
295-
enableRecursiveMacroCalls,
296-
maxMacroRecursionDepth,
297-
failOnUnknownTokens,
298-
maxOutputSize,
299-
nestedInterpretationEnabled,
300-
randomNumberGeneratorStrategy,
301-
validationMode,
302-
maxStringLength,
303-
interpreterFactory);
329+
return new JinjavaConfig(
330+
charset,
331+
locale,
332+
timeZone,
333+
maxRenderDepth,
334+
disabled,
335+
trimBlocks,
336+
lstripBlocks,
337+
readOnlyResolver,
338+
enableRecursiveMacroCalls,
339+
maxMacroRecursionDepth,
340+
failOnUnknownTokens,
341+
maxOutputSize,
342+
nestedInterpretationEnabled,
343+
randomNumberGeneratorStrategy,
344+
validationMode,
345+
maxStringLength,
346+
interpreterFactory
347+
);
304348
}
305-
306349
}
307-
308350
}

‎src/main/java/com/hubspot/jinjava/doc/JinjavaDoc.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.util.TreeMap;
55

66
public class JinjavaDoc {
7-
87
private final Map<String, JinjavaDocExpTest> expTests = new TreeMap<>();
98
private final Map<String, JinjavaDocFilter> filters = new TreeMap<>();
109
private final Map<String, JinjavaDocFunction> functions = new TreeMap<>();
@@ -41,5 +40,4 @@ public Map<String, JinjavaDocTag> getTags() {
4140
public void addTag(JinjavaDocTag tag) {
4241
tags.put(tag.getName(), tag);
4342
}
44-
4543
}

‎src/main/java/com/hubspot/jinjava/doc/JinjavaDocExpTest.java‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@
44

55
public class JinjavaDocExpTest extends JinjavaDocItem {
66

7-
public JinjavaDocExpTest(String name, String desc, String aliasOf, boolean deprecated, JinjavaDocParam[] inputs, JinjavaDocParam[] params, JinjavaDocSnippet[] snippets, Map<String, String> meta) {
7+
public JinjavaDocExpTest(
8+
String name,
9+
String desc,
10+
String aliasOf,
11+
boolean deprecated,
12+
JinjavaDocParam[] inputs,
13+
JinjavaDocParam[] params,
14+
JinjavaDocSnippet[] snippets,
15+
Map<String, String> meta
16+
) {
817
super(name, desc, aliasOf, deprecated, inputs, params, snippets, meta);
918
}
10-
1119
}

0 commit comments

Comments
 (0)