Merge pull request #551 from HubSpot/fix-aliased-functions

Fix args for aliased functions
HubSpot · Nov 25, 2020 · d42cec8 · d42cec8
2 parents 6d5b05c + 9b1c2fa
commit d42cec8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/main/java/com/hubspot/jinjava/lib/filter/AbstractFilter.java b/src/main/java/com/hubspot/jinjava/lib/filter/AbstractFilter.java
@@ -15,6 +15,7 @@
  **********************************************************************/
 package com.hubspot.jinjava.lib.filter;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaParam;
@@ -208,6 +209,12 @@ public String getIndexedArgumentName(int position) {
 
   public Map<String, JinjavaParam> initNamedArguments() {
     JinjavaDoc jinjavaDoc = this.getClass().getAnnotation(JinjavaDoc.class);
+
+    if (jinjavaDoc != null && !Strings.isNullOrEmpty(jinjavaDoc.aliasOf())) {
+      // aliased functions extend the base function. We need to get the annotations on the base
+      jinjavaDoc = this.getClass().getSuperclass().getAnnotation(JinjavaDoc.class);
+    }
+
     if (jinjavaDoc != null) {
       ImmutableMap.Builder<String, JinjavaParam> namedArgsBuilder = ImmutableMap.builder();
 

diff --git a/src/test/java/com/hubspot/jinjava/lib/filter/DAliasedDefaultFilterTest.java b/src/test/java/com/hubspot/jinjava/lib/filter/DAliasedDefaultFilterTest.java
@@ -0,0 +1,18 @@
+package com.hubspot.jinjava.lib.filter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.hubspot.jinjava.BaseJinjavaTest;
+import java.util.HashMap;
+import org.junit.Test;
+
+public class DAliasedDefaultFilterTest extends BaseJinjavaTest {
+
+  @Test
+  public void itSetsDefaultStringValues() {
+    assertThat(
+        jinjava.render("{% set d=d |d(\"some random value\") %}{{ d }}", new HashMap<>())
+      )
+      .isEqualTo("some random value");
+  }
+}