Make copy of global context.

hs-lsong · hs-lsong · commit b4bc172d410c · 2020-05-20T17:34:59.000-04:00
diff --git a/src/main/java/com/hubspot/jinjava/Jinjava.java b/src/main/java/com/hubspot/jinjava/Jinjava.java
@@ -123,6 +123,10 @@ public Context getGlobalContext() {
     return globalContext;
   }
 
+  public Context getGlobalContextCopy() {
+    return copyGlobalContext();
+  }
+
   public ResourceLocator getResourceLocator() {
     return resourceLocator;
   }
@@ -192,7 +196,11 @@ public RenderResult renderForResult(
     Map<String, ?> bindings,
     JinjavaConfig renderConfig
   ) {
-    Context context = new Context(globalContext, bindings, renderConfig.getDisabled());
+    Context context = new Context(
+      copyGlobalContext(),
+      bindings,
+      renderConfig.getDisabled()
+    );
 
     JinjavaInterpreter parentInterpreter = JinjavaInterpreter.getCurrent();
     if (parentInterpreter != null) {
@@ -256,6 +264,16 @@ public RenderResult renderForResult(
   public JinjavaInterpreter newInterpreter() {
     return globalConfig
       .getInterpreterFactory()
-      .newInstance(this, this.getGlobalContext(), this.getGlobalConfig());
+      .newInstance(this, copyGlobalContext(), this.getGlobalConfig());
+  }
+
+  private Context copyGlobalContext() {
+    Context context = new Context(null, globalContext);
+    // copy registered.
+    globalContext.getAllExpTests().forEach(context::registerExpTest);
+    globalContext.getAllFilters().forEach(context::registerFilter);
+    globalContext.getAllFunctions().forEach(context::registerFunction);
+    globalContext.getAllTags().forEach(context::registerTag);
+    return context;
   }
 }
diff --git a/src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java b/src/main/java/com/hubspot/jinjava/doc/JinjavaDocFactory.java
@@ -42,7 +42,7 @@ public JinjavaDoc get() {
   }
 
   private void addExpTests(JinjavaDoc doc) {
-    for (ExpTest t : jinjava.getGlobalContext().getAllExpTests()) {
+    for (ExpTest t : jinjava.getGlobalContextCopy().getAllExpTests()) {
       com.hubspot.jinjava.doc.annotations.JinjavaDoc docAnnotation = t
         .getClass()
         .getAnnotation(com.hubspot.jinjava.doc.annotations.JinjavaDoc.class);
@@ -83,7 +83,7 @@ private void addExpTests(JinjavaDoc doc) {
   }
 
   private void addFilterDocs(JinjavaDoc doc) {
-    for (Filter f : jinjava.getGlobalContext().getAllFilters()) {
+    for (Filter f : jinjava.getGlobalContextCopy().getAllFilters()) {
       com.hubspot.jinjava.doc.annotations.JinjavaDoc docAnnotation = f
         .getClass()
         .getAnnotation(com.hubspot.jinjava.doc.annotations.JinjavaDoc.class);
@@ -124,7 +124,7 @@ private void addFilterDocs(JinjavaDoc doc) {
   }
 
   private void addFnDocs(JinjavaDoc doc) {
-    for (ELFunctionDefinition fn : jinjava.getGlobalContext().getAllFunctions()) {
+    for (ELFunctionDefinition fn : jinjava.getGlobalContextCopy().getAllFunctions()) {
       if (StringUtils.isBlank(fn.getNamespace())) {
         Method realMethod = fn.getMethod();
         if (
@@ -182,7 +182,7 @@ private void addFnDocs(JinjavaDoc doc) {
   }
 
   private void addTagDocs(JinjavaDoc doc) {
-    for (Tag t : jinjava.getGlobalContext().getAllTags()) {
+    for (Tag t : jinjava.getGlobalContextCopy().getAllTags()) {
       if (t instanceof EndTag) {
         continue;
       }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public JinjavaDoc get() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`private void addExpTests(JinjavaDoc doc) {`
`45`		`- for (ExpTest t : jinjava.getGlobalContext().getAllExpTests()) {`
	`45`	`+ for (ExpTest t : jinjava.getGlobalContextCopy().getAllExpTests()) {`
`46`	`46`	`com.hubspot.jinjava.doc.annotations.JinjavaDoc docAnnotation = t`
`47`	`47`	`.getClass()`
`48`	`48`	`.getAnnotation(com.hubspot.jinjava.doc.annotations.JinjavaDoc.class);`
`@@ -83,7 +83,7 @@ private void addExpTests(JinjavaDoc doc) {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`private void addFilterDocs(JinjavaDoc doc) {`
`86`		`- for (Filter f : jinjava.getGlobalContext().getAllFilters()) {`
	`86`	`+ for (Filter f : jinjava.getGlobalContextCopy().getAllFilters()) {`
`87`	`87`	`com.hubspot.jinjava.doc.annotations.JinjavaDoc docAnnotation = f`
`88`	`88`	`.getClass()`
`89`	`89`	`.getAnnotation(com.hubspot.jinjava.doc.annotations.JinjavaDoc.class);`
`@@ -124,7 +124,7 @@ private void addFilterDocs(JinjavaDoc doc) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`private void addFnDocs(JinjavaDoc doc) {`
`127`		`- for (ELFunctionDefinition fn : jinjava.getGlobalContext().getAllFunctions()) {`
	`127`	`+ for (ELFunctionDefinition fn : jinjava.getGlobalContextCopy().getAllFunctions()) {`
`128`	`128`	`if (StringUtils.isBlank(fn.getNamespace())) {`
`129`	`129`	`Method realMethod = fn.getMethod();`
`130`	`130`	`if (`
`@@ -182,7 +182,7 @@ private void addFnDocs(JinjavaDoc doc) {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`private void addTagDocs(JinjavaDoc doc) {`
`185`		`- for (Tag t : jinjava.getGlobalContext().getAllTags()) {`
	`185`	`+ for (Tag t : jinjava.getGlobalContextCopy().getAllTags()) {`
`186`	`186`	`if (t instanceof EndTag) {`
`187`	`187`	`continue;`
`188`	`188`	`}`