Merge pull request #1095 from HubSpot/distinct-function-proxies

jasmith-hs · web-flow · commit 370f113e0f62 · 2023-07-27T15:21:48.000-04:00
Make ELFunction proxies distinct on injected instance class name and package
diff --git a/src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java b/src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java
@@ -26,8 +26,6 @@ public class JinjavaDocFactory {
   private static final Class JINJAVA_DOC_CLASS =
     com.hubspot.jinjava.doc.annotations.JinjavaDoc.class;
 
-  private static final String GUICE_CLASS_INDICATOR = "$$EnhancerByGuice$$";
-
   private final Jinjava jinjava;
 
   public JinjavaDocFactory(Jinjava jinjava) {
@@ -320,11 +318,7 @@ private Map<String, String> extractMeta(JinjavaMetaValue[] metaValues) {
   private com.hubspot.jinjava.doc.annotations.JinjavaDoc getJinjavaDocAnnotation(
     Class<?> clazz
   ) {
-    if (
-      clazz.getName().contains(GUICE_CLASS_INDICATOR) && clazz.getSuperclass() != null
-    ) {
-      clazz = clazz.getSuperclass();
-    }
+    clazz = InjectedContextFunctionProxy.removeGuiceWrapping(clazz);
 
     return clazz.getAnnotation(com.hubspot.jinjava.doc.annotations.JinjavaDoc.class);
   }
diff --git a/src/main/java/com/hubspot/jinjava/lib/fn/InjectedContextFunctionProxy.java b/src/main/java/com/hubspot/jinjava/lib/fn/InjectedContextFunctionProxy.java
@@ -13,22 +13,25 @@
 import javassist.bytecode.AccessFlag;
 
 public class InjectedContextFunctionProxy {
+  private static final String GUICE_CLASS_INDICATOR = "$$EnhancerByGuice$$";
 
   public static ELFunctionDefinition defineProxy(
     String namespace,
     String name,
     Method m,
     Object injectedInstance
   ) {
+    Class<?> injectedInstanceClass = removeGuiceWrapping(injectedInstance.getClass());
     try {
       ClassPool pool = ClassPool.getDefault();
 
-      String ccName =
-        InjectedContextFunctionProxy.class.getSimpleName() +
-        "$$" +
-        namespace +
-        "$$" +
-        name;
+      String ccName = String.format(
+        "%s$$%s$$%s$$%s",
+        injectedInstanceClass.getName(),
+        InjectedContextFunctionProxy.class.getSimpleName(),
+        namespace,
+        name
+      );
       Class<?> injectedClass = null;
 
       try {
@@ -97,4 +100,13 @@ public static ELFunctionDefinition defineProxy(
       throw new RuntimeException(e);
     }
   }
+
+  public static Class<?> removeGuiceWrapping(Class<?> clazz) {
+    if (
+      clazz.getName().contains(GUICE_CLASS_INDICATOR) && clazz.getSuperclass() != null
+    ) {
+      clazz = clazz.getSuperclass();
+    }
+    return clazz;
+  }
 }
diff --git a/src/test/java/com/hubspot/jinjava/lib/fn/InjectedContextFunctionProxyTest.java b/src/test/java/com/hubspot/jinjava/lib/fn/InjectedContextFunctionProxyTest.java
@@ -19,6 +19,18 @@ public String concatState(String in) {
     }
   }
 
+  public static class OtherClass {
+    private String state;
+
+    public OtherClass(String state) {
+      this.state = state;
+    }
+
+    public String prependState(String in) {
+      return state + in;
+    }
+  }
+
   @Test
   public void testDefineProxy() throws Exception {
     Method m = MyClass.class.getDeclaredMethod("concatState", String.class);
@@ -31,9 +43,56 @@ public void testDefineProxy() throws Exception {
       instance
     );
     assertThat(proxy.getName()).isEqualTo("ns:fooproxy");
-    assertThat(proxy.getMethod().getDeclaringClass().getSimpleName())
-      .isEqualTo(InjectedContextFunctionProxy.class.getSimpleName() + "$$ns$$fooproxy");
+    assertThat(proxy.getMethod().getDeclaringClass().getName())
+      .isEqualTo(
+        MyClass.class.getName() +
+        "$$" +
+        InjectedContextFunctionProxy.class.getSimpleName() +
+        "$$ns$$fooproxy"
+      );
 
     assertThat(proxy.getMethod().invoke(null, "foo")).isEqualTo("foobar");
   }
+
+  @Test
+  public void testDefineMultipleProxies() throws Exception {
+    Method concat = MyClass.class.getDeclaredMethod("concatState", String.class);
+    MyClass myClassInstance = new MyClass("bar");
+
+    ELFunctionDefinition myClassProxy = InjectedContextFunctionProxy.defineProxy(
+      "ns",
+      "fooproxy",
+      concat,
+      myClassInstance
+    );
+    Method prepend = OtherClass.class.getDeclaredMethod("prependState", String.class);
+    OtherClass otherClassInstance = new OtherClass("bar");
+
+    ELFunctionDefinition otherClassProxy = InjectedContextFunctionProxy.defineProxy(
+      "ns",
+      "fooproxy",
+      prepend,
+      otherClassInstance
+    );
+    assertThat(myClassProxy.getName()).isEqualTo("ns:fooproxy");
+    assertThat(myClassProxy.getMethod().getDeclaringClass().getName())
+      .isEqualTo(
+        MyClass.class.getName() +
+        "$$" +
+        InjectedContextFunctionProxy.class.getSimpleName() +
+        "$$ns$$fooproxy"
+      );
+
+    assertThat(myClassProxy.getMethod().invoke(null, "foo")).isEqualTo("foobar");
+    assertThat(otherClassProxy.getName()).isEqualTo("ns:fooproxy");
+    assertThat(otherClassProxy.getMethod().getDeclaringClass().getName())
+      .isEqualTo(
+        OtherClass.class.getName() +
+        "$$" +
+        InjectedContextFunctionProxy.class.getSimpleName() +
+        "$$ns$$fooproxy"
+      );
+
+    assertThat(otherClassProxy.getMethod().invoke(null, "foo")).isEqualTo("barfoo");
+  }
 }
