Don't need annotation introspector

Author: jasmith-hs

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

@@ -26,8 +26,6 @@
 import com.hubspot.jinjava.el.ObjectUnwrapper;
 import com.hubspot.jinjava.el.ext.AllowlistMethodValidator;
 import com.hubspot.jinjava.el.ext.AllowlistReturnTypeValidator;
-import com.hubspot.jinjava.el.ext.MethodValidatorConfig;
-import com.hubspot.jinjava.el.ext.ReturnTypeValidatorConfig;
 import com.hubspot.jinjava.features.FeatureConfig;
 import com.hubspot.jinjava.features.Features;
 import com.hubspot.jinjava.interpret.Context.Library;
@@ -165,16 +163,12 @@ default TokenScannerSymbols getTokenScannerSymbols() {
 
   @Value.Default
   default AllowlistMethodValidator getMethodValidator() {
-    return AllowlistMethodValidator.create(
-      MethodValidatorConfig.builder().addDefaultAllowlistGroups().build()
-    );
+    return AllowlistMethodValidator.DEFAULT;
   }
 
   @Value.Default
   default AllowlistReturnTypeValidator getReturnTypeValidator() {
-    return AllowlistReturnTypeValidator.create(
-      ReturnTypeValidatorConfig.builder().addDefaultAllowlistGroups().build()
-    );
+    return AllowlistReturnTypeValidator.DEFAULT;
   }
 
   @Value.Default

src/main/java/com/hubspot/jinjava/el/ext/AllowlistGroup.java

@@ -24,7 +24,6 @@
 import com.hubspot.jinjava.util.ForLoop;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
-import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -101,7 +100,6 @@ String[] allowedDeclaredMethodsFromClasses() {
       ForwardingMap.class.getCanonicalName(),
       ForwardingSet.class.getCanonicalName(),
       ForwardingCollection.class.getCanonicalName(),
-      AbstractCollection.class.getCanonicalName(),
       LinkedHashMap.class.getCanonicalName(),
       "%s.Entry".formatted(LinkedHashMap.class.getCanonicalName()),
       "%s.LinkedValues".formatted(LinkedHashMap.class.getCanonicalName()),

src/main/java/com/hubspot/jinjava/el/ext/AllowlistMethodValidator.java

@@ -7,6 +7,9 @@
 
 public final class AllowlistMethodValidator {
 
+  public static final AllowlistMethodValidator DEFAULT = AllowlistMethodValidator.create(
+    MethodValidatorConfig.builder().addDefaultAllowlistGroups().build()
+  );
   private final ConcurrentHashMap<Method, Boolean> allowedMethodsCache;
   private final ImmutableSet<Method> allowedMethods;
   private final ImmutableSet<String> allowedDeclaredMethodsFromCanonicalClassPrefixes;

src/main/java/com/hubspot/jinjava/el/ext/AllowlistReturnTypeValidator.java

@@ -6,6 +6,10 @@
 
 public final class AllowlistReturnTypeValidator {
 
+  public static final AllowlistReturnTypeValidator DEFAULT =
+    AllowlistReturnTypeValidator.create(
+      ReturnTypeValidatorConfig.builder().addDefaultAllowlistGroups().build()
+    );
   private final ConcurrentHashMap<String, Boolean> allowedReturnTypesCache;
 
   private final ImmutableSet<String> allowedCanonicalClassPrefixes;
@@ -68,11 +72,20 @@ public boolean allowReturnTypeClass(Class<?> clazz) {
       return true;
     }
     String canonicalClassName = clazz.getCanonicalName();
-    return allowedReturnTypesCache.computeIfAbsent(
+    boolean isAllowedReturnType = allowedReturnTypesCache.computeIfAbsent(
       canonicalClassName,
       c ->
         allowedCanonicalClassNames.contains(canonicalClassName) ||
         allowedCanonicalClassPrefixes.stream().anyMatch(canonicalClassName::startsWith)
     );
+    if (!isAllowedReturnType) {
+      return false;
+    }
+    for (ReturnTypeValidator v : additionalValidators) {
+      if (!v.allowReturnTypeClass(clazz)) {
+        return false;
+      }
+    }
+    return true;
   }
 }

src/main/java/com/hubspot/jinjava/el/ext/ReturnTypeValidator.java

@@ -2,4 +2,5 @@
 
 public interface ReturnTypeValidator {
   Object validateReturnType(Object o);
+  boolean allowReturnTypeClass(Class<?> c);
 }

src/main/java/com/hubspot/jinjava/objects/serialization/PyishObjectMapper.java

@@ -8,8 +8,6 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.google.common.annotations.Beta;
@@ -55,25 +53,6 @@ private static ObjectMapper getPyishObjectMapper() {
           .addSerializer(PyishSerializable.class, PyishSerializer.INSTANCE)
       );
     mapper.getSerializerProvider().setNullKeySerializer(new NullKeySerializer());
-    mapper.setAnnotationIntrospector(
-      new JacksonAnnotationIntrospector() {
-        @Override
-        protected boolean _isIgnorable(Annotated a) {
-          return (
-            super._isIgnorable(a) ||
-            !JinjavaInterpreter
-              .getCurrentMaybe()
-              .map(interpreter ->
-                interpreter
-                  .getConfig()
-                  .getReturnTypeValidator()
-                  .allowReturnTypeClass(a.getRawType())
-              )
-              .orElse(false)
-          );
-        }
-      }
-    );
     return mapper;
   }
 

src/test/java/com/hubspot/jinjava/interpret/JinjavaInterpreterTest.java

@@ -3,7 +3,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.hubspot.jinjava.BaseJinjavaTest;
@@ -20,6 +19,7 @@
 import com.hubspot.jinjava.mode.PreserveRawExecutionMode;
 import com.hubspot.jinjava.objects.date.FormattedDate;
 import com.hubspot.jinjava.objects.date.StrftimeFormatter;
+import com.hubspot.jinjava.testobjects.JinjavaInterpreterTestObjects;
 import com.hubspot.jinjava.tree.TextNode;
 import com.hubspot.jinjava.tree.output.BlockInfo;
 import com.hubspot.jinjava.tree.output.OutputList;
@@ -107,64 +107,59 @@ public void resolveBlockStubsWithCycle() {
 
   // Ex VariableChain stuff
 
-  static class Foo {
-
-    private String bar;
-
-    public Foo(String bar) {
-      this.bar = bar;
-    }
-
-    public String getBar() {
-      return bar;
-    }
-
-    public String getBarFoo() {
-      return bar;
-    }
-
-    public String getBarFoo1() {
-      return bar;
-    }
-
-    @JsonIgnore
-    public String getBarHidden() {
-      return bar;
-    }
-  }
-
   @Test
   public void singleWordProperty() {
     try (var a = JinjavaInterpreter.closeablePushCurrent(interpreter).get()) {
-      assertThat(interpreter.resolveProperty(new Foo("a"), "bar")).isEqualTo("a");
+      assertThat(
+        interpreter.resolveProperty(new JinjavaInterpreterTestObjects.Foo("a"), "bar")
+      )
+        .isEqualTo("a");
     }
   }
 
   @Test
   public void multiWordCamelCase() {
     try (var a = JinjavaInterpreter.closeablePushCurrent(interpreter).get()) {
-      assertThat(interpreter.resolveProperty(new Foo("a"), "barFoo")).isEqualTo("a");
+      assertThat(
+        interpreter.resolveProperty(new JinjavaInterpreterTestObjects.Foo("a"), "barFoo")
+      )
+        .isEqualTo("a");
     }
   }
 
   @Test
   public void multiWordSnakeCase() {
     try (var a = JinjavaInterpreter.closeablePushCurrent(interpreter).get()) {
-      assertThat(interpreter.resolveProperty(new Foo("a"), "bar_foo")).isEqualTo("a");
+      assertThat(
+        interpreter.resolveProperty(new JinjavaInterpreterTestObjects.Foo("a"), "bar_foo")
+      )
+        .isEqualTo("a");
     }
   }
 
   @Test
   public void multiWordNumberSnakeCase() {
     try (var a = JinjavaInterpreter.closeablePushCurrent(interpreter).get()) {
-      assertThat(interpreter.resolveProperty(new Foo("a"), "bar_foo_1")).isEqualTo("a");
+      assertThat(
+        interpreter.resolveProperty(
+          new JinjavaInterpreterTestObjects.Foo("a"),
+          "bar_foo_1"
+        )
+      )
+        .isEqualTo("a");
     }
   }
 
   @Test
   public void jsonIgnore() {
     try (var a = JinjavaInterpreter.closeablePushCurrent(interpreter).get()) {
-      assertThat(interpreter.resolveProperty(new Foo("a"), "barHidden")).isEqualTo("a");
+      assertThat(
+        interpreter.resolveProperty(
+          new JinjavaInterpreterTestObjects.Foo("a"),
+          "barHidden"
+        )
+      )
+        .isEqualTo("a");
     }
   }
 
@@ -388,8 +383,8 @@ public void itInterpretsWhitespaceControl() {
   public void itInterpretsEmptyExpressions() {
     jinjava =
       new Jinjava(
-        JinjavaConfig
-          .builder()
+        BaseJinjavaTest
+          .newConfigBuilder()
           .withTimeZone(ZoneId.of("America/New_York"))
           .withLegacyOverrides(
             LegacyOverrides.THREE_POINT_0.withParseWhitespaceControlStrictly(false)

src/test/java/com/hubspot/jinjava/lib/expression/EagerExpressionStrategyTest.java

@@ -72,6 +72,15 @@ public void eagerSetup() throws Exception {
 
   @Test
   public void itPreservesRawTags() {
+    interpreter =
+      new JinjavaInterpreter(
+        jinjava,
+        new Context(),
+        BaseJinjavaTest
+          .newConfigBuilder()
+          .withExecutionMode(EagerExecutionMode.instance())
+          .build()
+      );
     assertExpectedOutput(
       interpreter,
       "{{ '{{ foo }}' }} {{ '{% something %}' }} {{ 'not needed' }}",

src/test/java/com/hubspot/jinjava/lib/filter/time/FormatDateFilterTest.java

@@ -6,7 +6,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.features.DateTimeFeatureActivationStrategy;
 import com.hubspot.jinjava.features.FeatureConfig;
 import com.hubspot.jinjava.interpret.RenderResult;
@@ -34,7 +33,7 @@ public class FormatDateFilterTest {
 
   @Before
   public void setUp() throws Exception {
-    jinjava = new Jinjava();
+    jinjava = new Jinjava(BaseJinjavaTest.newConfigBuilder().build());
     jinjava.getGlobalContext().registerClasses(FormatDateFilter.class);
   }
 

src/test/java/com/hubspot/jinjava/lib/tag/MacroTagTest.java

@@ -9,7 +9,6 @@
 import com.hubspot.jinjava.BaseInterpretingTest;
 import com.hubspot.jinjava.BaseJinjavaTest;
 import com.hubspot.jinjava.Jinjava;
-import com.hubspot.jinjava.JinjavaConfig;
 import com.hubspot.jinjava.interpret.DeferredValue;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateError.ErrorReason;
@@ -304,7 +303,7 @@ public void itPreventsRecursionForMacroWithVar() {
     try (var a = JinjavaInterpreter.closeablePushCurrent(interpreter).get()) {
       String jinja =
         "{%- macro func(var) %}" +
-        "{%- for f in var %}" +
+        "{%- for k,f in var.items() %}" +
         "{{ f.val }}" +
         "{%- endfor %}" +
         "{%- endmacro %}" +