* rename it

fjn · fjn · commit 487ed0cf8b4e · 2021-11-12T23:11:23.000+08:00
diff --git a/src/main/java/com/hubspot/jinjava/LegacyOverrides.java b/src/main/java/com/hubspot/jinjava/LegacyOverrides.java
@@ -9,13 +9,13 @@ public class LegacyOverrides {
   private final boolean evaluateMapKeys;
   private final boolean iterateOverMapKeys;
   private final boolean usePyishObjectMapper;
-  private final boolean useWhitespaceAfterStartToken;
+  private final boolean whitespaceRequiredWithinTokens;
 
   private LegacyOverrides(Builder builder) {
     evaluateMapKeys = builder.evaluateMapKeys;
     iterateOverMapKeys = builder.iterateOverMapKeys;
     usePyishObjectMapper = builder.usePyishObjectMapper;
-    useWhitespaceAfterStartToken = builder.useWhitespaceAfterStartToken;
+    whitespaceRequiredWithinTokens = builder.whitespaceRequiredWithinTokens;
   }
 
   public static Builder newBuilder() {
@@ -34,15 +34,15 @@ public boolean isUsePyishObjectMapper() {
     return usePyishObjectMapper;
   }
 
-  public boolean isUseWhitespaceAfterStartToken() {
-    return useWhitespaceAfterStartToken;
+  public boolean isWhitespaceRequiredWithinTokens() {
+    return whitespaceRequiredWithinTokens;
   }
 
   public static class Builder {
     private boolean evaluateMapKeys = false;
     private boolean iterateOverMapKeys = false;
     private boolean usePyishObjectMapper = false;
-    private boolean useWhitespaceAfterStartToken = false;
+    private boolean whitespaceRequiredWithinTokens = false;
 
     private Builder() {}
 
@@ -55,7 +55,7 @@ public static Builder from(LegacyOverrides legacyOverrides) {
         .withEvaluateMapKeys(legacyOverrides.evaluateMapKeys)
         .withIterateOverMapKeys(legacyOverrides.iterateOverMapKeys)
         .withUsePyishObjectMapper(legacyOverrides.usePyishObjectMapper)
-        .withUseWhitespaceAfterStartToken(legacyOverrides.useWhitespaceAfterStartToken);
+        .withWhitespaceRequiredWithinTokens(legacyOverrides.whitespaceRequiredWithinTokens);
     }
 
     public Builder withEvaluateMapKeys(boolean evaluateMapKeys) {
@@ -73,8 +73,8 @@ public Builder withUsePyishObjectMapper(boolean usePyishObjectMapper) {
       return this;
     }
 
-    public Builder withUseWhitespaceAfterStartToken(boolean useWhitespace) {
-      this.useWhitespaceAfterStartToken = useWhitespace;
+    public Builder withWhitespaceRequiredWithinTokens(boolean useWhitespace) {
+      this.whitespaceRequiredWithinTokens = useWhitespace;
       return this;
     }
   }
diff --git a/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java b/src/main/java/com/hubspot/jinjava/tree/parse/TokenScanner.java
@@ -89,7 +89,7 @@ private Token getNextToken() {
         if (currPost < length) {
           c = is[currPost];
           boolean startTokenFound = true;
-          if (config.getLegacyOverrides().isUseWhitespaceAfterStartToken()) {
+          if (config.getLegacyOverrides().isWhitespaceRequiredWithinTokens()) {
             boolean hasNextChar = (currPost + 1) < length;
             boolean nextCharIsWhitespace = hasNextChar && (' ' == is[currPost + 1]);
             startTokenFound = nextCharIsWhitespace;
diff --git a/src/test/java/com/hubspot/jinjava/tree/parse/TokenScannerTest.java b/src/test/java/com/hubspot/jinjava/tree/parse/TokenScannerTest.java
@@ -267,7 +267,7 @@ public void testCommentWithWhitespaceChar() {
 
     LegacyOverrides legacyOverrides = LegacyOverrides
       .newBuilder()
-      .withUseWhitespaceAfterStartToken(true)
+      .withWhitespaceRequiredWithinTokens(true)
       .build();
     JinjavaConfig config = JinjavaConfig
       .newBuilder()
