Better Property Name

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/configuration/GlobalConfiguration.java

@@ -21,7 +21,7 @@
 
 // TODO - read initial value from a properties file!
 public class GlobalConfiguration {
-    private static boolean unrenderableWhereClauseAllowed = false;
+    private static boolean isNonRenderingWhereClauseAllowed = false;
 
     private GlobalConfiguration() {}
 
@@ -31,17 +31,17 @@ private GlobalConfiguration() {}
             if (is != null) {
                 Properties p = new Properties();
                 p.load(is);
-                String value = p.getProperty("unrenderableWhereClauseAllowed");
+                String value = p.getProperty("nonRenderingWhereClauseAllowed");
                 if (value != null) {
-                    unrenderableWhereClauseAllowed = Boolean.parseBoolean(value);
+                    isNonRenderingWhereClauseAllowed = Boolean.parseBoolean(value);
                 }
             }
         } catch (IOException e) {
             // ignore
         }
     }
 
-    public static boolean getUnrenderableWhereClauseAllowed() {
-        return unrenderableWhereClauseAllowed;
+    public static boolean isIsNonRenderingWhereClauseAllowed() {
+        return isNonRenderingWhereClauseAllowed;
     }
 }

src/main/java/org/mybatis/dynamic/sql/configuration/StatementConfiguration.java

@@ -15,7 +15,7 @@
  */
 package org.mybatis.dynamic.sql.configuration;
 
-import org.mybatis.dynamic.sql.exception.UnrenderableWhereClauseException;
+import org.mybatis.dynamic.sql.exception.NonRenderingWhereClauseException;
 
 /**
  * This class can be used to change some behaviors of the framework. Every configurable statement
@@ -25,9 +25,8 @@
  * Configurable behaviors are detailed below:
  *
  * <dl>
- *     <dt>unrenderableWhereClauseAllowed</dt>
- *     <dd>If false (default), the framework will throw an
- *         {@link UnrenderableWhereClauseException}
+ *     <dt>nonRenderingWhereClauseAllowed</dt>
+ *     <dd>If false (default), the framework will throw a {@link NonRenderingWhereClauseException}
  *         if a where clause is specified in the statement, but it fails to render because all
  *         optional conditions do not render. For example, if an "in" condition specifies an
  *         empty list of values. If no criteria are specified in a where clause, the framework
@@ -40,13 +39,13 @@
  * @author Jeff Butler
  */
 public class StatementConfiguration {
-    private boolean unrenderableWhereClauseAllowed = GlobalConfiguration.getUnrenderableWhereClauseAllowed();
+    private boolean isNonRenderingWhereClauseAllowed = GlobalConfiguration.isIsNonRenderingWhereClauseAllowed();
 
-    public boolean getUnrenderableWhereClauseAllowed() {
-        return unrenderableWhereClauseAllowed;
+    public boolean isNonRenderingWhereClauseAllowed() {
+        return isNonRenderingWhereClauseAllowed;
     }
 
-    public void setUnrenderableWhereClauseAllowed(boolean unrenderableWhereClauseAllowed) {
-        this.unrenderableWhereClauseAllowed = unrenderableWhereClauseAllowed;
+    public void setNonRenderingWhereClauseAllowed(boolean nonRenderingWhereClauseAllowed) {
+        this.isNonRenderingWhereClauseAllowed = nonRenderingWhereClauseAllowed;
     }
 }

src/main/java/org/mybatis/dynamic/sql/exception/UnrenderableWhereClauseException.java renamed to src/main/java/org/mybatis/dynamic/sql/exception/NonRenderingWhereClauseException.java

@@ -28,14 +28,14 @@
  * it could cause all rows in a table to be affected by a statement - for example,
  * all rows could be deleted.
  *
- * <p>If you intend to allow an unrenderable where clause, then configure the
+ * <p>If you intend to allow a where clause to not render, then configure the
  * statement to allow it, or change the global configuration.
  *
  * @see GlobalConfiguration
  * @see StatementConfiguration
  * @since 1.4.1
  * @author Jeff Butler
  */
-public class UnrenderableWhereClauseException extends RuntimeException {
-    public UnrenderableWhereClauseException() {}
+public class NonRenderingWhereClauseException extends RuntimeException {
+    public NonRenderingWhereClauseException() {}
 }

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

@@ -55,7 +55,7 @@ public List<AndOrCriteriaGroup> subCriteria() {
     }
 
     public boolean isUnrenderableClauseAllowed() {
-        return statementConfiguration.getUnrenderableWhereClauseAllowed();
+        return statementConfiguration.isNonRenderingWhereClauseAllowed();
     }
 
     /**

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

@@ -21,7 +21,7 @@
 import java.util.stream.Collectors;
 
 import org.mybatis.dynamic.sql.SqlCriterion;
-import org.mybatis.dynamic.sql.exception.UnrenderableWhereClauseException;
+import org.mybatis.dynamic.sql.exception.NonRenderingWhereClauseException;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.render.TableAliasCalculator;
 import org.mybatis.dynamic.sql.util.FragmentCollector;
@@ -53,7 +53,7 @@ public Optional<WhereClauseProvider> render() {
         if (whereClause.isPresent() || whereModel.isUnrenderableClauseAllowed()) {
             return whereClause;
         } else {
-            throw new UnrenderableWhereClauseException();
+            throw new NonRenderingWhereClauseException();
         }
     }
 

src/test/java/examples/animal/data/AnimalDataTest.java

@@ -651,7 +651,7 @@ void testInConditionWithEventuallyEmptyList() {
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
                     .where(id, isIn(null, 22, null).filter(Objects::nonNull).filter(i -> i != 22))
-                    .configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true))
+                    .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 
@@ -767,7 +767,7 @@ void testNotInConditionWithEventuallyEmptyList() {
             SelectStatementProvider selectStatement = select(id, animalName, bodyWeight, brainWeight)
                     .from(animalData)
                     .where(id, isNotIn(null, 22, null).filter(Objects::nonNull).filter(i -> i != 22))
-                    .configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true))
+                    .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
 

src/test/java/examples/animal/data/OptionalConditionsAnimalDataTest.java

@@ -73,7 +73,7 @@ void testAllIgnored() {
                     .from(animalData)
                     .where(id, isGreaterThanWhenPresent(NULL_INTEGER))  // the where clause should not render
                     .orderBy(id)
-                    .configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true))
+                    .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
             List<AnimalData> animals = mapper.selectMany(selectStatement);

src/test/java/examples/animal/data/OptionalConditionsWithPredicatesAnimalDataTest.java

@@ -79,7 +79,7 @@ void testAllIgnored() {
                     .from(animalData)
                     .where(id, isGreaterThan(NULL_INTEGER).filter(Objects::nonNull))  // the where clause should not render
                     .orderBy(id)
-                    .configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true))
+                    .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true))
                     .build()
                     .render(RenderingStrategies.MYBATIS3);
             List<AnimalData> animals = mapper.selectMany(selectStatement);

src/test/java/examples/complexquery/ComplexQueryTest.java

@@ -111,7 +111,7 @@ SelectStatementProvider search(Integer targetId, String fName, String lName) {
         QueryExpressionDSL<SelectModel>.QueryExpressionWhereBuilder builder = select(id, firstName, lastName)
                 .from(person)
                 .where()
-                .configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true));
+                .configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         if (targetId != null) {
             builder

src/test/java/examples/emptywhere/EmptyWhereTest.java

@@ -119,7 +119,7 @@ void testDeleteVariations(Variation variation) {
 
         builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
         builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
-        builder.configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true));
+        builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         DeleteStatementProvider deleteStatement = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -160,7 +160,7 @@ void testSelectVariations(Variation variation) {
 
         builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
         builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
-        builder.configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true));
+        builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         SelectStatementProvider selectStatement = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -202,7 +202,7 @@ void testJoinVariations(Variation variation) {
 
         builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
         builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
-        builder.configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true));
+        builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         SelectStatementProvider selectStatement = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -246,7 +246,7 @@ void testUpdateVariations(Variation variation) {
 
         builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
         builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
-        builder.configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true));
+        builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         UpdateStatementProvider updateStatement = builder.build().render(RenderingStrategies.MYBATIS3);
 
@@ -283,7 +283,7 @@ void testWhereVariations(Variation variation) {
 
         builder.and(firstName, isEqualTo(variation.firstName).filter(Objects::nonNull));
         builder.or(PersonDynamicSqlSupport.lastName, isEqualTo(variation.lastName).filter(Objects::nonNull));
-        builder.configureStatement(c -> c.setUnrenderableWhereClauseAllowed(true));
+        builder.configureStatement(c -> c.setNonRenderingWhereClauseAllowed(true));
 
         WhereClauseProvider whereClause = builder.build().render(RenderingStrategies.MYBATIS3);