Migrate usages of deprecated method

Author: jasmith-hs

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

@@ -96,11 +96,10 @@ public String eagerInterpret(
         );
       }
       caller.setDeferred(true);
-      prefixToPreserveState.putAll(
-        EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
-          eagerExecutionResult.getResult().getDeferredWords(),
-          interpreter
-        )
+      EagerReconstructionUtils.hydrateReconstructionFromContextBeforeDeferring(
+        prefixToPreserveState,
+        eagerExecutionResult.getResult().getDeferredWords(),
+        interpreter
       );
 
       LengthLimitingStringJoiner joiner = new LengthLimitingStringJoiner(

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

@@ -86,11 +86,10 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
       if (!eagerExecutionResult.getResult().isFullyResolved()) {
         resolvedValues =
           new HelperStringTokenizer(resolvedExpression).splitComma(true).allTokens();
-        prefixToPreserveState.putAll(
-          EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
-            eagerExecutionResult.getResult().getDeferredWords(),
-            interpreter
-          )
+        EagerReconstructionUtils.hydrateReconstructionFromContextBeforeDeferring(
+          prefixToPreserveState,
+          eagerExecutionResult.getResult().getDeferredWords(),
+          interpreter
         );
       } else {
         List<?> objects = eagerExecutionResult.getResult().toList();

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

@@ -234,13 +234,13 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
       .add("in")
       .add(eagerExpressionResult.toString())
       .add(tagToken.getSymbols().getExpressionEndWithTag());
-    PrefixToPreserveState prefixToPreserveState = new PrefixToPreserveState(
-      EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
+    PrefixToPreserveState prefixToPreserveState = EagerReconstructionUtils
+      .hydrateReconstructionFromContextBeforeDeferring(
+        new PrefixToPreserveState(),
         eagerExpressionResult.getDeferredWords(),
         interpreter
       )
-    )
-    .withAllInFront(
+      .withAllInFront(
         EagerReconstructionUtils.handleDeferredTokenAndReconstructReferences(
           interpreter,
           new DeferredToken(

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

@@ -90,11 +90,10 @@ public static String interpretExpression(
         )
       );
     }
-    prefixToPreserveState.putAll(
-      EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
-        eagerExecutionResult.getResult().getDeferredWords(),
-        interpreter
-      )
+    EagerReconstructionUtils.hydrateReconstructionFromContextBeforeDeferring(
+      prefixToPreserveState,
+      eagerExecutionResult.getResult().getDeferredWords(),
+      interpreter
     );
 
     LengthLimitingStringJoiner joiner = new LengthLimitingStringJoiner(

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

@@ -136,16 +136,15 @@ protected PrefixToPreserveState getPrefixToPreserveState(
         eagerExecutionResult
       );
     }
-    prefixToPreserveState.putAll(
-      EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
-        Stream
-          .concat(
-            eagerExecutionResult.getResult().getDeferredWords().stream(),
-            Arrays.stream(variables).filter(var -> var.contains("."))
-          )
-          .collect(Collectors.toSet()),
-        interpreter
-      )
+    EagerReconstructionUtils.hydrateReconstructionFromContextBeforeDeferring(
+      prefixToPreserveState,
+      Stream
+        .concat(
+          eagerExecutionResult.getResult().getDeferredWords().stream(),
+          Arrays.stream(variables).filter(var -> var.contains("."))
+        )
+        .collect(Collectors.toSet()),
+      interpreter
     );
     return prefixToPreserveState;
   }

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

@@ -229,11 +229,10 @@ public String getEagerTagImage(TagToken tagToken, JinjavaInterpreter interpreter
     joiner.add(tagToken.getSymbols().getExpressionEndWithTag());
 
     PrefixToPreserveState prefixToPreserveState = new PrefixToPreserveState();
-    prefixToPreserveState.putAll(
-      EagerReconstructionUtils.reconstructFromContextBeforeDeferringAsMap(
-        eagerExpressionResult.getDeferredWords(),
-        interpreter
-      )
+    EagerReconstructionUtils.hydrateReconstructionFromContextBeforeDeferring(
+      prefixToPreserveState,
+      eagerExpressionResult.getDeferredWords(),
+      interpreter
     );
     prefixToPreserveState.withAllInFront(
       EagerReconstructionUtils.handleDeferredTokenAndReconstructReferences(

src/main/java/com/hubspot/jinjava/util/EagerReconstructionUtils.java

@@ -163,21 +163,22 @@ public static PrefixToPreserveState reconstructFromContextBeforeDeferringAsMap(
    * @param deferredWords set of words that will need to be deferred based on the
    *                      previously performed operation.
    * @param interpreter the Jinjava interpreter.
+   * @return The PrefixToPreserveState to allow method chaining
    */
-  public static void hydrateReconstructionFromContextBeforeDeferring(
+  public static PrefixToPreserveState hydrateReconstructionFromContextBeforeDeferring(
     PrefixToPreserveState prefixToPreserveState,
     Set<String> deferredWords,
     JinjavaInterpreter interpreter
   ) {
-    hydrateReconstructionFromContextBeforeDeferring(
+    return hydrateReconstructionFromContextBeforeDeferring(
       prefixToPreserveState,
       deferredWords,
       interpreter,
       0
     );
   }
 
-  private static void hydrateReconstructionFromContextBeforeDeferring(
+  private static PrefixToPreserveState hydrateReconstructionFromContextBeforeDeferring(
     PrefixToPreserveState prefixToPreserveState,
     Set<String> deferredWords,
     JinjavaInterpreter interpreter,
@@ -191,16 +192,17 @@ private static void hydrateReconstructionFromContextBeforeDeferring(
       );
       Set<String> deferredWordBases = filterToRelevantBases(deferredWords, interpreter);
       if (deferredWordBases.isEmpty()) {
-        return;
+        return prefixToPreserveState;
       }
 
-      hydrateReconstructionOfVariablesBeforeDeferring(
+      return hydrateReconstructionOfVariablesBeforeDeferring(
         prefixToPreserveState,
         deferredWordBases,
         interpreter,
         depth
       );
     }
+    return prefixToPreserveState;
   }
 
   private static Set<String> filterToRelevantBases(
@@ -245,8 +247,9 @@ private static Set<String> filterToRelevantBases(
    * @param deferredWords Set of words that were encountered and their evaluation has
    *                      to be deferred for a later render.
    * @param interpreter The Jinjava interpreter.
+   * @return The PrefixToPreserveState to allow method chaining
    */
-  private static void hydrateReconstructionOfMacroFunctionsBeforeDeferring(
+  private static PrefixToPreserveState hydrateReconstructionOfMacroFunctionsBeforeDeferring(
     PrefixToPreserveState prefixToPreserveState,
     Set<String> deferredWords,
     JinjavaInterpreter interpreter
@@ -297,9 +300,10 @@ private static void hydrateReconstructionOfMacroFunctionsBeforeDeferring(
     prefixToPreserveState.withAll(reconstructedMacros);
     // Remove macro functions from the set because they've been fully processed now.
     deferredWords.removeAll(toRemove);
+    return prefixToPreserveState;
   }
 
-  private static void hydrateReconstructionOfVariablesBeforeDeferring(
+  private static PrefixToPreserveState hydrateReconstructionOfVariablesBeforeDeferring(
     PrefixToPreserveState prefixToPreserveState,
     Set<String> deferredWords,
     JinjavaInterpreter interpreter,
@@ -327,6 +331,7 @@ private static void hydrateReconstructionOfVariablesBeforeDeferring(
             depth
           )
       );
+    return prefixToPreserveState;
   }
 
   public static String buildBlockOrInlineSetTag(
@@ -345,13 +350,13 @@ public static String buildBlockOrInlineSetTagAndRegisterDeferredToken(
     return buildBlockOrInlineSetTag(name, value, interpreter, true);
   }
 
-  public static void hydrateBlockOrInlineSetTagRecursively(
+  public static PrefixToPreserveState hydrateBlockOrInlineSetTagRecursively(
     PrefixToPreserveState prefixToPreserveState,
     String name,
     Object value,
     JinjavaInterpreter interpreter
   ) {
-    hydrateBlockOrInlineSetTagRecursively(
+    return hydrateBlockOrInlineSetTagRecursively(
       prefixToPreserveState,
       name,
       value,
@@ -360,7 +365,7 @@ public static void hydrateBlockOrInlineSetTagRecursively(
     );
   }
 
-  private static void hydrateBlockOrInlineSetTagRecursively(
+  private static PrefixToPreserveState hydrateBlockOrInlineSetTagRecursively(
     PrefixToPreserveState prefixToPreserveState,
     String name,
     Object value,
@@ -383,7 +388,7 @@ private static void hydrateBlockOrInlineSetTagRecursively(
           false
         )
       );
-      return;
+      return prefixToPreserveState;
     }
     String pyishStringRepresentation = PyishObjectMapper.getAsPyishString(value);
 
@@ -408,9 +413,10 @@ private static void hydrateBlockOrInlineSetTagRecursively(
       name,
       buildSetTag(ImmutableMap.of(name, pyishStringRepresentation), interpreter, false)
     );
+    return prefixToPreserveState;
   }
 
-  private static String buildBlockOrInlineSetTag(
+  public static String buildBlockOrInlineSetTag(
     String name,
     Object value,
     JinjavaInterpreter interpreter,