Skip to content

Commit e520666

Browse files
jasmith-hsclaude
andcommitted
Fix 2.8.x build: remove Jinjava 3.0-only constructs
The previous commit used BaseJinjavaTest.newConfigBuilder() which only exists in Jinjava 3.0. Replace with JinjavaConfig.newBuilder() plus matching LegacyOverrides. Also replace Java 16 pattern variable in instanceof with a traditional approach. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 2131380 commit e520666

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

src/main/java/com/hubspot/jinjava/lib/filter/AbstractSetFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ private boolean potentiallyConvertibleNumbers(Object oneVarObj, Object oneArgObj
129129
private Set<Object> convertIntegersToLongs(Set<Object> set) {
130130
Set<Object> result = new LinkedHashSet<>();
131131
for (Object element : set) {
132-
if (element instanceof Integer integer) {
133-
result.add(integer.longValue());
132+
if (element instanceof Integer) {
133+
result.add(Long.valueOf(element.toString()));
134134
} else {
135135
result.add(element);
136136
}

src/test/java/com/hubspot/jinjava/lib/filter/AbstractSetFilterTest.java

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

55
import com.hubspot.jinjava.BaseJinjavaTest;
66
import com.hubspot.jinjava.Jinjava;
7+
import com.hubspot.jinjava.JinjavaConfig;
8+
import com.hubspot.jinjava.LegacyOverrides;
79
import com.hubspot.jinjava.features.BuiltInFeatures;
810
import com.hubspot.jinjava.features.FeatureConfig;
911
import com.hubspot.jinjava.features.FeatureStrategies;
@@ -102,8 +104,15 @@ public void itDoesNotThrowWarningOnIntegerLongMismatch() {
102104
@Test
103105
public void itConvertsIntegerToLongWhenFeatureActive() {
104106
Jinjava jinjavaWithFeature = new Jinjava(
105-
BaseJinjavaTest
106-
.newConfigBuilder()
107+
JinjavaConfig
108+
.newBuilder()
109+
.withLegacyOverrides(
110+
LegacyOverrides
111+
.newBuilder()
112+
.withUsePyishObjectMapper(true)
113+
.withKeepNullableLoopValues(true)
114+
.build()
115+
)
107116
.withFeatureConfig(
108117
FeatureConfig
109118
.newBuilder()

0 commit comments

Comments
 (0)