cleanUp

apache · Aug 9, 2023 · f87a1e8 · f87a1e8
1 parent 7b68d15
commit f87a1e8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/ValueNodeBuilder.java b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/ValueNodeBuilder.java
@@ -21,7 +21,6 @@
 
 import org.apache.cayenne.access.sqlbuilder.sqltree.Node;
 import org.apache.cayenne.access.sqlbuilder.sqltree.ValueNode;
-import org.apache.cayenne.exp.parser.ASTScalar;
 import org.apache.cayenne.map.DbAttribute;
 
 /**

diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/ValueNode.java b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/ValueNode.java
@@ -49,14 +49,6 @@ public ValueNode(Object value, boolean isArray, DbAttribute attribute, boolean n
         this.needBinding = needBinding;
     }
 
-    public ValueNode(Object value, boolean isArray, DbAttribute attribute) {
-        super(NodeType.VALUE);
-        this.value = value;
-        this.isArray = isArray;
-        this.attribute = attribute;
-        this.needBinding = true;
-    }
-
     public Object getValue() {
         return value;
     }

diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2SQLTreeProcessor.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2SQLTreeProcessor.java
@@ -50,7 +50,7 @@ protected void onColumnNode(Node parent, ColumnNode child, int index) {
 
     @Override
     protected void onValueNode(Node parent, ValueNode child, int index) {
-        Node replacement = new DerbyValueNode(child.getValue(), child.isArray(), child.getAttribute());
+        Node replacement = new DerbyValueNode(child.getValue(), child.isArray(), child.getAttribute(), child.isNeedBinding());
         replaceChild(parent, index, replacement, false);
     }
 

diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySQLTreeProcessor.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbySQLTreeProcessor.java
@@ -48,7 +48,7 @@ protected void onColumnNode(Node parent, ColumnNode child, int index) {
 
     @Override
     protected void onValueNode(Node parent, ValueNode child, int index) {
-        replaceChild(parent, index, new DerbyValueNode(child.getValue(), child.isArray(), child.getAttribute()));
+        replaceChild(parent, index, new DerbyValueNode(child.getValue(), child.isArray(), child.getAttribute(), child.isNeedBinding()));
     }
 
     @Override

diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/sqltree/DerbyValueNode.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/sqltree/DerbyValueNode.java
@@ -31,8 +31,8 @@
  */
 public class DerbyValueNode extends ValueNode {
 
-    public DerbyValueNode(Object value, boolean isArray, DbAttribute attribute) {
-        super(value, isArray, attribute);
+    public DerbyValueNode(Object value, boolean isArray, DbAttribute attribute, boolean needBinding) {
+        super(value, isArray, attribute, needBinding);
     }
 
     protected void appendStringValue(QuotingAppendable buffer, CharSequence value) {
@@ -46,6 +46,6 @@ protected void appendStringValue(QuotingAppendable buffer, CharSequence value) {
 
     @Override
     public Node copy() {
-        return new DerbyValueNode(getValue(), isArray(), getAttribute());
+        return new DerbyValueNode(getValue(), isArray(), getAttribute(), isNeedBinding());
     }
 }