QuotingAppendable refactoring:

    0. Rename to SQLAppendable (it is not just quoting, it is a full SQL buffer)
    1. Do not extend Java Appendable. It is better for us to control the signature
    2. Take String instead of CharSequence. This is a cheaper operation on the StringBuilder side
    3. Explicit method for result extraction instead of toString()
    4. Collapse SQLAppendable class hierarchy to a single class

Author: andrus

…/sqlbuilder/StringBuilderAppendable.java …ess/sqlbuilder/DefaultSQLAppendable.javacayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/StringBuilderAppendable.java renamed to cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/DefaultSQLAppendable.java cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/StringBuilderAppendable.java renamed to cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/DefaultSQLAppendable.java

@@ -19,57 +19,70 @@
 
 package org.apache.cayenne.access.sqlbuilder;
 
+import org.apache.cayenne.dba.QuotingStrategy;
+
 /**
  * @since 4.2
  */
-public class StringBuilderAppendable implements QuotingAppendable {
+public class DefaultSQLAppendable implements SQLAppendable {
 
     protected final StringBuilder builder;
+    protected final SQLGenerationContext context;
+    protected final QuotingStrategy quotingStrategy;
 
-    public StringBuilderAppendable() {
+    public DefaultSQLAppendable(SQLGenerationContext context) {
         this.builder = new StringBuilder();
+        this.context = context;
+        this.quotingStrategy = context == null ? null : context.getAdapter().getQuotingStrategy();
     }
 
     @Override
-    public QuotingAppendable append(CharSequence csq) {
-        builder.append(csq);
+    public SQLAppendable append(String str) {
+        builder.append(str);
         return this;
     }
 
     @Override
-    public QuotingAppendable append(CharSequence csq, int start, int end) {
-        builder.append(csq, start, end);
+    public SQLAppendable append(char c) {
+        builder.append(c);
         return this;
     }
 
     @Override
-    public QuotingAppendable append(char c) {
+    public SQLAppendable append(int c) {
         builder.append(c);
         return this;
     }
 
     @Override
-    public QuotingAppendable append(int c) {
-        builder.append(c);
+    public SQLAppendable appendQuoted(String str) {
+        if (quotingStrategy == null) {
+            builder.append(str);
+        } else {
+            quotingStrategy.quotedIdentifier(context.getRootDbEntity(), str, builder);
+        }
         return this;
     }
 
     @Override
-    public QuotingAppendable appendQuoted(CharSequence csq) {
-        builder.append(csq);
-        return this;
+    public SQLGenerationContext getContext() {
+        return context;
     }
 
     @Override
-    public SQLGenerationContext getContext() {
-        return null;
+    public String getSql() {
+        return builder.toString();
     }
 
     @Override
     public String toString() {
-        return builder.toString();
+        return getSql();
     }
 
+    /**
+     * @deprecated unused
+     */
+    @Deprecated(since = "5.0", forRemoval = true)
     public StringBuilder unwrap() {
         return builder;
     }

…access/sqlbuilder/QuotingAppendable.java …nne/access/sqlbuilder/SQLAppendable.javacayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/QuotingAppendable.java renamed to cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/SQLAppendable.java cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/QuotingAppendable.java renamed to cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/SQLAppendable.java

@@ -20,22 +20,28 @@
 package org.apache.cayenne.access.sqlbuilder;
 
 /**
- * @since 4.2
+ * @since 5.0
  */
-public interface QuotingAppendable extends Appendable {
+public interface SQLAppendable {
 
-    @Override
-    QuotingAppendable append(CharSequence csq);
+    SQLAppendable append(String str);
 
-    @Override
-    QuotingAppendable append(CharSequence csq, int start, int end);
+    /**
+     * @deprecated unused; no SQL tree node appends a sub-range. Kept for binary compatibility,
+     * now delegating to {@link #append(String)}.
+     */
+    @Deprecated(since = "5.0", forRemoval = true)
+    default SQLAppendable append(CharSequence csq, int start, int end) {
+        return append(csq.subSequence(start, end).toString());
+    }
 
-    @Override
-    QuotingAppendable append(char c);
+    SQLAppendable append(char c);
 
-    QuotingAppendable append(int i);
+    SQLAppendable append(int i);
 
-    QuotingAppendable appendQuoted(CharSequence csq);
+    SQLAppendable appendQuoted(String str);
 
     SQLGenerationContext getContext();
+
+    String getSql();
 }

cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/SQLGenerationContext.java

@@ -19,13 +19,13 @@
 
 package org.apache.cayenne.access.sqlbuilder;
 
-import java.util.Collection;
-
 import org.apache.cayenne.access.translator.ParameterBinding;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.dba.QuotingStrategy;
 import org.apache.cayenne.map.DbEntity;
 
+import java.util.Collection;
+
 /**
  * @since 4.2
  */
@@ -35,7 +35,13 @@ public interface SQLGenerationContext {
 
     Collection<ParameterBinding> getBindings();
 
-    QuotingStrategy getQuotingStrategy();
+    /**
+     * @deprecated use {@link DbAdapter#getQuotingStrategy()}
+     */
+    @Deprecated(since = "5.0", forRemoval = true)
+    default QuotingStrategy getQuotingStrategy() {
+        return getAdapter().getQuotingStrategy();
+    }
 
     DbEntity getRootDbEntity();
 }

cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/SQLGenerationVisitor.java

@@ -26,9 +26,9 @@
  */
 public class SQLGenerationVisitor implements NodeTreeVisitor {
 
-    private final QuotingAppendable appendable;
+    private final SQLAppendable appendable;
 
-    public SQLGenerationVisitor(QuotingAppendable appendable) {
+    public SQLGenerationVisitor(SQLAppendable appendable) {
         this.appendable = appendable;
     }
 
@@ -57,7 +57,7 @@ public void onNodeEnd(Node node) {
     }
 
     public String getSQLString() {
-        return appendable.toString();
+        return appendable.getSql();
     }
 
 }

cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/AliasedNode.java

@@ -20,7 +20,7 @@
 package org.apache.cayenne.access.sqlbuilder.sqltree;
 
 import org.apache.cayenne.access.sqlbuilder.NodeTreeVisitor;
-import org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
+import org.apache.cayenne.access.sqlbuilder.SQLAppendable;
 
 import java.util.Objects;
 
@@ -41,7 +41,7 @@ public Node copy() {
     }
 
     @Override
-    public QuotingAppendable append(QuotingAppendable buffer) {
+    public SQLAppendable append(SQLAppendable buffer) {
         if(skipContent()) {
             buffer.append(' ').append(alias);
         }
@@ -59,7 +59,7 @@ public void visit(NodeTreeVisitor visitor) {
     }
 
     @Override
-    public void appendChildrenEnd(QuotingAppendable buffer) {
+    public void appendChildrenEnd(SQLAppendable buffer) {
         if(skipContent()){
             return;
         }

cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/BetweenNode.java

@@ -20,7 +20,7 @@
 package org.apache.cayenne.access.sqlbuilder.sqltree;
 
 
-import org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
+import org.apache.cayenne.access.sqlbuilder.SQLAppendable;
 
 import java.util.Objects;
 
@@ -36,7 +36,7 @@ public BetweenNode(boolean not) {
     }
 
     @Override
-    public void appendChildrenSeparator(QuotingAppendable buffer, int childIdx) {
+    public void appendChildrenSeparator(SQLAppendable buffer, int childIdx) {
         if (childIdx == 0) {
             if (not) {
                 buffer.append(" NOT");

cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/BitwiseNotNode.java

@@ -19,15 +19,15 @@
 
 package org.apache.cayenne.access.sqlbuilder.sqltree;
 
-import org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
+import org.apache.cayenne.access.sqlbuilder.SQLAppendable;
 
 /**
  * @since 4.2
  */
 public class BitwiseNotNode extends ExpressionNode {
 
     @Override
-    public QuotingAppendable append(QuotingAppendable buffer) {
+    public SQLAppendable append(SQLAppendable buffer) {
         return buffer.append('~');
     }
 

cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/CaseNode.java

@@ -19,15 +19,15 @@
 
 package org.apache.cayenne.access.sqlbuilder.sqltree;
 
-import org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
+import org.apache.cayenne.access.sqlbuilder.SQLAppendable;
 
 /**
  * @since 5.0
  */
 public class CaseNode extends Node {
 
     @Override
-    public QuotingAppendable append(QuotingAppendable buffer) {
+    public SQLAppendable append(SQLAppendable buffer) {
         return buffer.append(" CASE");
     }
 
@@ -37,7 +37,7 @@ public Node copy() {
     }
 
     @Override
-    public void appendChildrenEnd(QuotingAppendable buffer) {
+    public void appendChildrenEnd(SQLAppendable buffer) {
             buffer.append(" END");
     }
 }

cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/ColumnNode.java

@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.access.sqlbuilder.sqltree;
 
-import org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
+import org.apache.cayenne.access.sqlbuilder.SQLAppendable;
 import org.apache.cayenne.map.DbAttribute;
 
 import java.util.Objects;
@@ -43,7 +43,7 @@ public ColumnNode(String table, String column, String alias, DbAttribute attribu
     }
 
     @Override
-    public QuotingAppendable append(QuotingAppendable buffer) {
+    public SQLAppendable append(SQLAppendable buffer) {
         buffer.append(' ');
         if (table != null) {
             buffer.appendQuoted(table).append('.');

cayenne/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/DeleteNode.java

@@ -18,7 +18,7 @@
  ****************************************************************/
 package org.apache.cayenne.access.sqlbuilder.sqltree;
 
-import org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
+import org.apache.cayenne.access.sqlbuilder.SQLAppendable;
 
 /**
  * @since 4.2
@@ -30,7 +30,7 @@ public Node copy() {
     }
 
     @Override
-    public QuotingAppendable append(QuotingAppendable buffer) {
+    public SQLAppendable append(SQLAppendable buffer) {
         return buffer.append("DELETE FROM");
     }
 }