Merge pull request #1103 from HubSpot/update-guava

Update guava to 31.1

Author: jasmith-hs

pom.xml

@@ -18,6 +18,8 @@
 
     <dep.javassist.version>3.24.1-GA</dep.javassist.version>
     <dep.plugin.jacoco.version>0.8.3</dep.plugin.jacoco.version>
+    <dep.guava.version>31.1-jre</dep.guava.version>
+    <dep.error-prone.version>2.19.1</dep.error-prone.version>
 
     <basepom.test.add.opens>
       --add-opens=java.base/java.lang=ALL-UNNAMED

src/main/java/com/hubspot/jinjava/lib/tag/eager/EagerTagFactory.java

@@ -63,9 +63,11 @@ public static <T extends Tag> Optional<EagerTagDecorator<T>> getEagerTagDecorato
       if (TAG_CLASSES_TO_SKIP.contains(clazz)) {
         return Optional.empty();
       }
-      if (EAGER_TAG_OVERRIDES.containsKey(clazz)) {
-        EagerTagDecorator<?> decorator = EAGER_TAG_OVERRIDES
-          .get(clazz)
+      Class<? extends EagerTagDecorator<? extends Tag>> eagerOverrideClass = EAGER_TAG_OVERRIDES.get(
+        clazz
+      );
+      if (eagerOverrideClass != null) {
+        EagerTagDecorator<?> decorator = eagerOverrideClass
           .getDeclaredConstructor(clazz)
           .newInstance(tag);
         if (decorator.getTag().getClass() == clazz) {