Move non-rendering where check to RenderingContext

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/common/AbstractBooleanExpressionRenderer.java

@@ -32,11 +32,13 @@ public abstract class AbstractBooleanExpressionRenderer<M extends AbstractBoolea
     protected final M model;
     private final String prefix;
     private final CriterionRenderer criterionRenderer;
+    protected final RenderingContext renderingContext;
 
     protected AbstractBooleanExpressionRenderer(String prefix, AbstractBuilder<M, ?> builder) {
         model = Objects.requireNonNull(builder.model);
         this.prefix = Objects.requireNonNull(prefix);
-        criterionRenderer = new CriterionRenderer(builder.renderingContext);
+        renderingContext = Objects.requireNonNull(builder.renderingContext);
+        criterionRenderer = new CriterionRenderer(renderingContext);
     }
 
     public Optional<FragmentAndParameters> render() {

src/main/java/org/mybatis/dynamic/sql/render/RenderingContext.java

@@ -97,6 +97,10 @@ public String aliasedTableName(SqlTable table) {
                 .orElseGet(table::tableNameAtRuntime);
     }
 
+    public boolean isNonRenderingClauseAllowed() {
+        return statementConfiguration.isNonRenderingWhereClauseAllowed();
+    }
+
     /**
      * Create a new rendering context based on this, with the table alias calculator modified to include the
      * specified child table alias calculator. This is used by the query expression renderer when the alias calculator

src/main/java/org/mybatis/dynamic/sql/where/WhereModel.java

@@ -35,10 +35,6 @@ private WhereModel(Builder builder) {
         statementConfiguration = Objects.requireNonNull(builder.statementConfiguration);
     }
 
-    public boolean isNonRenderingClauseAllowed() {
-        return statementConfiguration.isNonRenderingWhereClauseAllowed();
-    }
-
     /**
      * Renders a where clause without table aliases.
      *

src/main/java/org/mybatis/dynamic/sql/where/render/WhereRenderer.java

@@ -31,7 +31,7 @@ private WhereRenderer(Builder builder) {
     public Optional<FragmentAndParameters> render() {
         Optional<FragmentAndParameters> whereClause = super.render();
 
-        if (whereClause.isPresent() || model.isNonRenderingClauseAllowed()) {
+        if (whereClause.isPresent() || renderingContext.isNonRenderingClauseAllowed()) {
             return whereClause;
         } else {
             throw new NonRenderingWhereClauseException();