You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2020/08/19 08:04:11 UTC
[cayenne] branch master updated: fixing typos
This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 18e67b0 fixing typos
18e67b0 is described below
commit 18e67b09a8770af0aa6c0cb128aaf7dbbf5c039b
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Wed Aug 19 11:03:58 2020 +0300
fixing typos
---
.../sqlbuilder/sqltree/TrimmingColumnNode.java | 8 ++--
.../translator/select/QualifierTranslator.java | 48 +++++-----------------
.../apache/cayenne/exp/property/package-info.java | 4 +-
.../translator/select/QualifierTranslatorTest.java | 30 +++-----------
.../java/org/apache/cayenne/exp/ExpressionIT.java | 4 +-
.../apache/cayenne/unit/DerbyUnitDbAdapter.java | 2 +-
.../org/apache/cayenne/unit/UnitDbAdapter.java | 2 +-
7 files changed, 26 insertions(+), 72 deletions(-)
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/TrimmingColumnNode.java b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/TrimmingColumnNode.java
index d409064..2e9e68e 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/TrimmingColumnNode.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/sqlbuilder/sqltree/TrimmingColumnNode.java
@@ -19,10 +19,10 @@
package org.apache.cayenne.access.sqlbuilder.sqltree;
-import java.sql.Types;
-
import org.apache.cayenne.access.sqlbuilder.QuotingAppendable;
+import java.sql.Types;
+
/**
* @since 4.2
*/
@@ -41,7 +41,7 @@ public class TrimmingColumnNode extends Node {
if(isCharType() && isAllowedForTrimming()) {
appendRtrim(buffer);
appendAlias(buffer, isResult);
- } else if(isComparisionWithClob()) {
+ } else if(isComparisonWithClob()) {
appendClobColumnNode(buffer);
appendAlias(buffer, isResult);
} else {
@@ -54,7 +54,7 @@ public class TrimmingColumnNode extends Node {
return buffer;
}
- private boolean isComparisionWithClob() {
+ private boolean isComparisonWithClob() {
if(isInsertOrUpdateSet()) {
return false;
}
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
index 444d129..494ae79 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/QualifierTranslator.java
@@ -19,54 +19,26 @@
package org.apache.cayenne.access.translator.select;
-import java.util.ArrayDeque;
-import java.util.Collection;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.EmbeddableObject;
import org.apache.cayenne.ObjectId;
import org.apache.cayenne.Persistent;
import org.apache.cayenne.access.sqlbuilder.ExpressionNodeBuilder;
import org.apache.cayenne.access.sqlbuilder.ValueNodeBuilder;
-import org.apache.cayenne.access.sqlbuilder.sqltree.BetweenNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.BitwiseNotNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.EmptyNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.EqualNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.FunctionNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.InNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.LikeNode;
import org.apache.cayenne.access.sqlbuilder.sqltree.Node;
-import org.apache.cayenne.access.sqlbuilder.sqltree.NotEqualNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.NotNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.OpExpressionNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.TextNode;
+import org.apache.cayenne.access.sqlbuilder.sqltree.*;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.TraversalHandler;
-import org.apache.cayenne.exp.parser.ASTCustomOperator;
-import org.apache.cayenne.exp.parser.ASTDbIdPath;
-import org.apache.cayenne.exp.parser.ASTDbPath;
-import org.apache.cayenne.exp.parser.ASTFullObject;
-import org.apache.cayenne.exp.parser.ASTFunctionCall;
-import org.apache.cayenne.exp.parser.ASTObjPath;
-import org.apache.cayenne.exp.parser.ASTSubquery;
-import org.apache.cayenne.exp.parser.PatternMatchNode;
-import org.apache.cayenne.exp.parser.SimpleNode;
-import org.apache.cayenne.exp.property.BaseProperty;
+import org.apache.cayenne.exp.parser.*;
import org.apache.cayenne.exp.property.Property;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.Embeddable;
-import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.aliased;
-import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.function;
-import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.table;
-import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.value;
+import java.util.*;
+
+import static org.apache.cayenne.access.sqlbuilder.SQLBuilder.*;
import static org.apache.cayenne.exp.Expression.*;
/**
@@ -278,7 +250,7 @@ class QualifierTranslator implements TraversalHandler {
expressionsToSkip.add(node);
expressionsToSkip.add(parentNode);
- return buildMultiValueComparision(result, valueSnapshot);
+ return buildMultiValueComparison(result, valueSnapshot);
}
private Map<String, Object> getEmbeddableValueSnapshot(Embeddable embeddable, Expression node, Expression parentNode) {
@@ -322,7 +294,7 @@ class QualifierTranslator implements TraversalHandler {
expressionsToSkip.add(node);
expressionsToSkip.add(parentNode);
- return buildMultiValueComparision(result, valueSnapshot);
+ return buildMultiValueComparison(result, valueSnapshot);
}
private Map<String, Object> getMultiAttributeValueSnapshot(Expression node, Expression parentNode) {
@@ -338,8 +310,8 @@ class QualifierTranslator implements TraversalHandler {
} else if(operand instanceof ObjectId) {
return ((ObjectId) operand).getIdSnapshot();
} else if(operand instanceof ASTObjPath) {
- // TODO: support comparision of multi attribute ObjPath with other multi attribute ObjPath
- throw new UnsupportedOperationException("Comparision of multiple attributes not supported for ObjPath");
+ // TODO: support comparison of multi attribute ObjPath with other multi attribute ObjPath
+ throw new UnsupportedOperationException("Comparison of multiple attributes not supported for ObjPath");
}
}
@@ -347,7 +319,7 @@ class QualifierTranslator implements TraversalHandler {
"List or Persistent object required.");
}
- private Node buildMultiValueComparision(PathTranslationResult result, Map<String, Object> valueSnapshot) {
+ private Node buildMultiValueComparison(PathTranslationResult result, Map<String, Object> valueSnapshot) {
ExpressionNodeBuilder expressionNodeBuilder = null;
ExpressionNodeBuilder eq;
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/exp/property/package-info.java b/cayenne-server/src/main/java/org/apache/cayenne/exp/property/package-info.java
index 5b23d5f..211ee1f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/exp/property/package-info.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/exp/property/package-info.java
@@ -39,7 +39,7 @@
* Currently supported Property types:
* <ul>
* <li>{@link org.apache.cayenne.exp.property.NumericProperty} for all data types inherited from {@link java.lang.Number}.<br>
- * Supports comparision and math functions (like {@link org.apache.cayenne.exp.property.NumericProperty#sqrt() sqrt()}).
+ * Supports comparison and math functions (like {@link org.apache.cayenne.exp.property.NumericProperty#sqrt() sqrt()}).
* <br>
* <li>{@link org.apache.cayenne.exp.property.StringProperty} for all data types inherited from {@link java.lang.CharSequence}.<br>
* Supports multiple string functions ({@link org.apache.cayenne.exp.property.StringProperty#like(java.lang.String) like()},
@@ -54,7 +54,7 @@
* <br>
* <li>{@link org.apache.cayenne.exp.property.ListProperty}, {@link org.apache.cayenne.exp.property.SetProperty}
* and {@link org.apache.cayenne.exp.property.MapProperty} are for to-many relationships.<br>
- * In addition to to-one related methods these properties support collection comparision methods
+ * In addition to to-one related methods these properties support collection comparison methods
* like {@link org.apache.cayenne.exp.property.ListProperty#contains(org.apache.cayenne.Persistent) contains()}.
* <br>
* <li>{@link org.apache.cayenne.exp.property.EmbeddableProperty} for embeddable objects
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
index 731cc6d..aa8aeb7 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/QualifierTranslatorTest.java
@@ -19,39 +19,21 @@
package org.apache.cayenne.access.translator.select;
-import java.util.Arrays;
-
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.sqlbuilder.SQLGenerationVisitor;
import org.apache.cayenne.access.sqlbuilder.StringBuilderAppendable;
-import org.apache.cayenne.access.sqlbuilder.sqltree.BetweenNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.BitwiseNotNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.ColumnNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.EqualNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.FunctionNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.InNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.LikeNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.Node;
-import org.apache.cayenne.access.sqlbuilder.sqltree.NotEqualNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.NotNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.OpExpressionNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.SelectNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.TextNode;
-import org.apache.cayenne.access.sqlbuilder.sqltree.ValueNode;
+import org.apache.cayenne.access.sqlbuilder.sqltree.*;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
import org.apache.cayenne.exp.parser.ASTAsterisk;
import org.apache.cayenne.exp.property.BaseProperty;
-import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.EntityResolver;
-import org.apache.cayenne.map.ObjAttribute;
-import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.*;
import org.apache.cayenne.query.ObjectSelect;
import org.junit.Before;
import org.junit.Test;
+import java.util.Arrays;
+
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.*;
@@ -368,7 +350,7 @@ public class QualifierTranslatorTest {
}
@Test
- public void translateComparision() {
+ public void translateComparison() {
{
Node op = translate("a < 2");
assertThat(op, instanceOf(OpExpressionNode.class));
@@ -484,7 +466,7 @@ public class QualifierTranslatorTest {
}
@Test
- public void translateNullComparision() {
+ public void translateNullComparison() {
Node or = translate("a > null");
assertNotNull(or);
assertThat(or, instanceOf(OpExpressionNode.class));
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionIT.java b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionIT.java
index 58a5da0..cf6ce5d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/exp/ExpressionIT.java
@@ -128,7 +128,7 @@ public class ExpressionIT extends ServerCase {
try {
artists = ObjectSelect.query(Artist.class, Artist.ARTIST_NAME.lt((String) null)).select(context);
} catch (CayenneRuntimeException ex) {
- if(adapter.supportsNullComparision()) {
+ if(adapter.supportsNullComparison()) {
throw ex;
} else {
return;
@@ -148,7 +148,7 @@ public class ExpressionIT extends ServerCase {
try {
artists = ObjectSelect.query(Artist.class, Artist.ARTIST_NAME.in("Picasso", (String) null)).select(context);
} catch (CayenneRuntimeException ex) {
- if(adapter.supportsNullComparision()) {
+ if(adapter.supportsNullComparison()) {
throw ex;
} else {
return;
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java
index 2a09aaa..dcc0872 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/DerbyUnitDbAdapter.java
@@ -74,7 +74,7 @@ public class DerbyUnitDbAdapter extends UnitDbAdapter {
}
@Override
- public boolean supportsNullComparision() {
+ public boolean supportsNullComparison() {
return false;
}
}
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java b/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
index 4351dab..87fa7bd 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/unit/UnitDbAdapter.java
@@ -412,7 +412,7 @@ public class UnitDbAdapter {
return true;
}
- public boolean supportsNullComparision() {
+ public boolean supportsNullComparison() {
return true;
}
}