Skip to content

Commit 789cfe2

Browse files
jasmith-hsjasmith-hs
authored
Merge pull request #1194 from HubSpot/basepom-59-11
Upgrade basepom to 59.11
2 parents 444a9f4 + f59d5eb commit 789cfe2

32 files changed

Lines changed: 112 additions & 195 deletions

‎pom.xml‎

Lines changed: 1 addition & 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>59.7</version>
8+
<version>59.11</version>
99
</parent>
1010

1111
<groupId>com.hubspot.jinjava</groupId>

‎src/main/java/com/hubspot/jinjava/el/ExpressionResolver.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,8 @@ private void handleELException(String expression, ELException e) {
292292
TemplateError.fromException(
293293
new TemplateSyntaxException(
294294
expression,
295-
(
296-
e.getCause() == null ||
297-
StringUtils.endsWith(originatingException, e.getCause().getMessage())
298-
)
295+
(e.getCause() == null ||
296+
StringUtils.endsWith(originatingException, e.getCause().getMessage()))
299297
? e.getMessage()
300298
: combinedMessage,
301299
interpreter.getLineNumber(),

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -585,9 +585,9 @@ private boolean isPossibleExpTestOrFilter(String namespace)
585585
throws ParseException, ScanException {
586586
if (
587587
FILTER_PREFIX.substring(0, FILTER_PREFIX.length() - 1).equals(namespace) ||
588-
EXPTEST_PREFIX.substring(0, EXPTEST_PREFIX.length() - 1).equals(namespace) &&
589-
lookahead(1).getSymbol() == DOT &&
590-
lookahead(2).getSymbol() == IDENTIFIER
588+
(EXPTEST_PREFIX.substring(0, EXPTEST_PREFIX.length() - 1).equals(namespace) &&
589+
lookahead(1).getSymbol() == DOT &&
590+
lookahead(2).getSymbol() == IDENTIFIER)
591591
) {
592592
Token property = lookahead(2);
593593
if (

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,8 @@ public Object invoke(
106106
if (
107107
method == null ||
108108
DEFAULT_RESTRICTED_METHODS.contains(method.toString()) ||
109-
(
110-
interpreter != null &&
111-
interpreter.getConfig().getRestrictedMethods().contains(method.toString())
112-
)
109+
(interpreter != null &&
110+
interpreter.getConfig().getRestrictedMethods().contains(method.toString()))
113111
) {
114112
throw new MethodNotFoundException(
115113
"Cannot find method '" + method + "' in " + base.getClass()
@@ -221,10 +219,8 @@ private String validatePropertyName(Object property) {
221219

222220
if (
223221
DEFAULT_RESTRICTED_PROPERTIES.contains(propertyName) ||
224-
(
225-
interpreter != null &&
226-
interpreter.getConfig().getRestrictedProperties().contains(propertyName)
227-
)
222+
(interpreter != null &&
223+
interpreter.getConfig().getRestrictedProperties().contains(propertyName))
228224
) {
229225
return null;
230226
}
@@ -253,10 +249,8 @@ protected boolean isRestrictedClass(Object o) {
253249
}
254250

255251
return (
256-
(
257-
o.getClass().getPackage() != null &&
258-
o.getClass().getPackage().getName().startsWith("java.lang.reflect")
259-
) ||
252+
(o.getClass().getPackage() != null &&
253+
o.getClass().getPackage().getName().startsWith("java.lang.reflect")) ||
260254
o instanceof Class ||
261255
o instanceof ClassLoader ||
262256
o instanceof Thread ||

‎src/main/java/com/hubspot/jinjava/el/ext/eager/EagerAstMacroFunction.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,11 @@ protected Object invoke(
7878
if (types.length > 0) {
7979
// This is just the AstFunction.invoke, but surrounded with this try-with-resources
8080
try (
81-
TemporaryValueClosable<Boolean> c = (
82-
(JinjavaInterpreter) context
83-
.getELResolver()
84-
.getValue(context, null, ExtendedParser.INTERPRETER)
85-
).getContext()
86-
.withPartialMacroEvaluation(false)
81+
TemporaryValueClosable<Boolean> c =
82+
((JinjavaInterpreter) context
83+
.getELResolver()
84+
.getValue(context, null, ExtendedParser.INTERPRETER)).getContext()
85+
.withPartialMacroEvaluation(false)
8786
) {
8887
params = new Object[types.length];
8988
int varargIndex;

‎src/main/java/com/hubspot/jinjava/el/ext/eager/EagerAstParameters.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,11 @@ private EagerAstParameters(List<AstNode> nodes, boolean convertedToEvalResultHol
4040
@Override
4141
public Object[] eval(Bindings bindings, ELContext context) {
4242
try (
43-
TemporaryValueClosable<Boolean> c = (
44-
(JinjavaInterpreter) context
45-
.getELResolver()
46-
.getValue(context, null, ExtendedParser.INTERPRETER)
47-
).getContext()
48-
.withPartialMacroEvaluation(false)
43+
TemporaryValueClosable<Boolean> c =
44+
((JinjavaInterpreter) context
45+
.getELResolver()
46+
.getValue(context, null, ExtendedParser.INTERPRETER)).getContext()
47+
.withPartialMacroEvaluation(false)
4948
) {
5049
try {
5150
setEvalResult(super.eval(bindings, context));

‎src/main/java/com/hubspot/jinjava/el/ext/eager/EvalResultHolder.java‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,9 @@ default Object checkEvalResultSize(ELContext context) {
5151
if (
5252
evalResult instanceof Collection &&
5353
((Collection<?>) evalResult).size() > 100 && // TODO make size configurable
54-
(
55-
(JinjavaInterpreter) context
54+
((JinjavaInterpreter) context
5655
.getELResolver()
57-
.getValue(context, null, ExtendedParser.INTERPRETER)
58-
).getContext()
56+
.getValue(context, null, ExtendedParser.INTERPRETER)).getContext()
5957
.isDeferLargeObjects()
6058
) {
6159
throw new DeferredValueException("Collection too big");
@@ -83,8 +81,8 @@ static String reconstructNode(
8381
preserveIdentifier =
8482
IdentifierPreservationStrategy.preserving(
8583
preserveIdentifier.isPreserving() ||
86-
astNode instanceof AstIdentifier &&
87-
ExtendedParser.INTERPRETER.equals(((AstIdentifier) astNode).getName())
84+
(astNode instanceof AstIdentifier &&
85+
ExtendedParser.INTERPRETER.equals(((AstIdentifier) astNode).getName()))
8886
);
8987
if (
9088
preserveIdentifier.isPreserving() &&
@@ -107,13 +105,9 @@ static String reconstructNode(
107105
}
108106
if (
109107
!preserveIdentifier.isPreserving() ||
110-
(
111-
astNode.hasEvalResult() &&
112-
(
113-
EagerExpressionResolver.isPrimitive(evalResult) ||
114-
evalResult instanceof PartiallyDeferredValue
115-
)
116-
)
108+
(astNode.hasEvalResult() &&
109+
(EagerExpressionResolver.isPrimitive(evalResult) ||
110+
evalResult instanceof PartiallyDeferredValue))
117111
) {
118112
if (exceptionMatchesNode(exception, astNode)) {
119113
return exception.getDeferredEvalResult();
@@ -131,11 +125,9 @@ static String reconstructNode(
131125
if (astNode instanceof AstIdentifier) {
132126
String name = ((AstIdentifier) astNode).getName();
133127
if (
134-
(
135-
(JinjavaInterpreter) context
128+
((JinjavaInterpreter) context
136129
.getELResolver()
137-
.getValue(context, null, ExtendedParser.INTERPRETER)
138-
).getContext()
130+
.getValue(context, null, ExtendedParser.INTERPRETER)).getContext()
139131
.getComputedMetaContextVariables()
140132
.contains(name)
141133
) {

‎src/main/java/com/hubspot/jinjava/interpret/JinjavaInterpreter.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,8 @@ private void resolveBlockStubs(OutputList output) {
492492
private boolean isExtendsTag(Node node) {
493493
return (
494494
node instanceof TagNode &&
495-
(
496-
((TagNode) node).getTag() instanceof ExtendsTag ||
497-
isEagerExtendsTag((TagNode) node)
498-
)
495+
(((TagNode) node).getTag() instanceof ExtendsTag ||
496+
isEagerExtendsTag((TagNode) node))
499497
);
500498
}
501499

‎src/main/java/com/hubspot/jinjava/lib/expression/DefaultExpressionStrategy.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ public RenderedOutputNode interpretOutput(
3737
if (interpreter.getConfig().isNestedInterpretationEnabled()) {
3838
if (
3939
!StringUtils.equals(result, master.getImage()) &&
40-
(
41-
StringUtils.contains(result, master.getSymbols().getExpressionStart()) ||
42-
StringUtils.contains(result, master.getSymbols().getExpressionStartWithTag())
43-
)
40+
(StringUtils.contains(result, master.getSymbols().getExpressionStart()) ||
41+
StringUtils.contains(result, master.getSymbols().getExpressionStartWithTag()))
4442
) {
4543
try {
4644
result = interpreter.renderFlat(result);

‎src/main/java/com/hubspot/jinjava/lib/expression/EagerExpressionStrategy.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@ public static String postProcessResult(
9999
) {
100100
if (
101101
!StringUtils.equals(result, master.getImage()) &&
102-
(
103-
StringUtils.contains(result, master.getSymbols().getExpressionStart()) ||
104-
StringUtils.contains(result, master.getSymbols().getExpressionStartWithTag())
105-
)
102+
(StringUtils.contains(result, master.getSymbols().getExpressionStart()) ||
103+
StringUtils.contains(result, master.getSymbols().getExpressionStartWithTag()))
106104
) {
107105
if (interpreter.getConfig().isNestedInterpretationEnabled()) {
108106
long errorSizeStart = getParsingErrorsCount(interpreter);

0 commit comments

Comments
 (0)