Cannot use AutoCloseableSupplier in 2.7.x

jasmith-hs · jasmith-hs · commit 98d1d6310afd · 2026-02-02T16:31:28.000-05:00
diff --git a/src/test/java/com/hubspot/jinjava/el/ext/JinjavaBeanELResolverTest.java b/src/test/java/com/hubspot/jinjava/el/ext/JinjavaBeanELResolverTest.java
@@ -10,6 +10,7 @@
 import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.el.JinjavaELContext;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
+import java.util.ArrayList;
 import java.util.List;
 import javax.el.ELContext;
 import javax.el.MethodNotFoundException;
@@ -189,25 +190,21 @@ public void itDoesNotAllowAccessingPropertiesOfInterpreter() {
 
   @Test
   public void itDoesNotGettingFromObjectMapper() {
-    try (
-      AutoCloseableSupplier.AutoCloseableImpl<JinjavaInterpreter> c = JinjavaInterpreter
-        .closeablePushCurrent(interpreter)
-        .get()
-    ) {
+    JinjavaInterpreter.pushCurrent(interpreter);
+    try {
       assertThat(
         jinjavaBeanELResolver.getValue(elContext, new ObjectMapper(), "dateFormat")
       )
         .isNull();
+    } finally {
+      JinjavaInterpreter.popCurrent();
     }
   }
 
   @Test
   public void itDoesNotAllowInvokingFromObjectMapper() throws NoSuchMethodException {
-    try (
-      AutoCloseableSupplier.AutoCloseableImpl<JinjavaInterpreter> c = JinjavaInterpreter
-        .closeablePushCurrent(interpreter)
-        .get()
-    ) {
+    JinjavaInterpreter.pushCurrent(interpreter);
+    try {
       ObjectMapper objectMapper = new ObjectMapper();
       assertThatThrownBy(() ->
           jinjavaBeanELResolver.invoke(
@@ -219,17 +216,17 @@ public void itDoesNotAllowInvokingFromObjectMapper() throws NoSuchMethodExceptio
           )
         )
         .isInstanceOf(MethodNotFoundException.class);
+    } finally {
+      JinjavaInterpreter.popCurrent();
     }
   }
 
   @Test
   public void itDoesNotAllowInvokingFromMethod() throws NoSuchMethodException {
-    try (
-      AutoCloseableSupplier.AutoCloseableImpl<JinjavaInterpreter> c = JinjavaInterpreter
-        .closeablePushCurrent(interpreter)
-        .get()
-    ) {
-      List<String> list = List.of("foo");
+    JinjavaInterpreter.pushCurrent(interpreter);
+    try {
+      List<String> list = new ArrayList<>();
+      list.add("foo");
       assertThatThrownBy(() ->
           jinjavaBeanELResolver.invoke(
             elContext,
@@ -240,6 +237,8 @@ public void itDoesNotAllowInvokingFromMethod() throws NoSuchMethodException {
           )
         )
         .isInstanceOf(MethodNotFoundException.class);
+    } finally {
+      JinjavaInterpreter.popCurrent();
     }
   }
 }
