Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

find first valid deferred words #1173

Merged
merged 3 commits into from
Apr 19, 2024
Merged

find first valid deferred words #1173

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f88ba3
find first valid deferred words
jboulter Apr 15, 2024
e5a827a
remove test I did not mean to commit
jboulter Apr 15, 2024
7bd9f8a
split unlimited
jboulter Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/main/java/com/hubspot/jinjava/lib/tag/eager/DeferredToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.hubspot.jinjava.lib.tag.eager;

import com.google.common.annotations.Beta;
import com.google.common.base.Strings;
import com.hubspot.jinjava.interpret.CallStack;
import com.hubspot.jinjava.interpret.Context;
import com.hubspot.jinjava.interpret.DeferredLazyReference;
Expand All @@ -13,9 +14,11 @@
import com.hubspot.jinjava.tree.parse.TokenScannerSymbols;
import com.hubspot.jinjava.util.EagerExpressionResolver;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import java.util.stream.Collectors;
Expand All @@ -40,7 +43,8 @@ public DeferredToken build() {
token,
usedDeferredWords != null
? usedDeferredWords
.map(prop -> prop.split("\\.", 2)[0])
.map(DeferredToken::splitToken)
.map(DeferredToken::getFirstNonEmptyToken)
.distinct()
.filter(word ->
interpreter == null ||
Expand All @@ -50,7 +54,8 @@ public DeferredToken build() {
: Collections.emptySet(),
setDeferredWords != null
? setDeferredWords
.map(prop -> prop.split("\\.", 2)[0])
.map(DeferredToken::splitToken)
.map(DeferredToken::getFirstNonEmptyToken)
.collect(Collectors.toSet())
: Collections.emptySet(),
acquireImportResourcePath(),
Expand Down Expand Up @@ -413,10 +418,19 @@ private static CallStack acquireMacroStack() {
.orElse(null);
}

private static String getFirstNonEmptyToken(List<String> strings) {
return Strings.isNullOrEmpty(strings.get(0)) ? strings.get(1) : strings.get(0);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that you need to split more if you're going to take the part after a . because you could have .bar.foobar and you want bar not bar.foobar

}

public static List<String> splitToken(String token) {
return Arrays.asList(token.split("\\.", 2));
}

public static Set<String> getBases(Set<String> original) {
return original
.stream()
.map(prop -> prop.split("\\.", 2)[0])
.map(DeferredToken::splitToken)
.map(prop -> prop.get(0))
.collect(Collectors.toSet());
}
}
16 changes: 16 additions & 0 deletions src/test/java/com/hubspot/jinjava/util/DeferredValueUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,22 @@ public void itDefersUsedWordsInDeferredTokens() {
assertThat(context.containsKey("int")).isFalse();
}

@Test
public void itFindsFirstValidDeferredWords() {
DeferredToken deferredToken = DeferredToken
.builderFromToken(
new ExpressionToken("{{ blah }}", 1, 1, new DefaultTokenScannerSymbols())
)
.addUsedDeferredWords(ImmutableSet.of("deferred", ".attribute1"))
.addSetDeferredWords(ImmutableSet.of("deferred", ".attribute2"))
.build();

assertThat(deferredToken.getUsedDeferredWords())
.isEqualTo(ImmutableSet.of("deferred", "attribute1"));
assertThat(deferredToken.getSetDeferredWords())
.isEqualTo(ImmutableSet.of("deferred", "attribute2"));
}

private Context getContext(List<? extends Node> nodes) {
return getContext(nodes, Optional.empty());
}
Expand Down
Loading