This is an automated email from the ASF dual-hosted git repository.
aadamchik pushed a commit to branch 428
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/428 by this push:
new 281cc64 CAY-2660 BigDecimals that differ only in scale are treated as
different values causing unneeded updates
281cc64 is described below
commit 281cc6497940c97ec9f405abf1a29c9080ddf131
Author: Andrus Adamchik <and...@objectstyle.com>
AuthorDate: Wed Aug 19 10:43:48 2020 +0300
CAY-2660 BigDecimals that differ only in scale are treated as different
values causing unneeded updates
.. PR review .. fixing minor typos
---
.../cayenne/reflect/generic/DataObjectAttributeProperty.java | 8 ++++----
.../reflect/generic/DefaultValueComparisonStrategyFactory.java | 8 ++++----
...ValueComparisionStrategy.java => ValueComparisonStrategy.java} | 2 +-
.../cayenne/reflect/generic/ValueComparisonStrategyFactory.java | 2 +-
.../cayenne/reflect/generic/DataObjectAttributePropertyTest.java | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java
b/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java
index a95b531..1ee9468 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/DataObjectAttributeProperty.java
@@ -31,11 +31,11 @@ class DataObjectAttributeProperty extends
DataObjectBaseProperty implements
/**
* @since 4.2
*/
- protected final ValueComparisionStrategy<Object> valueComparisionStrategy;
+ protected final ValueComparisonStrategy<Object> valueComparisonStrategy;
- public DataObjectAttributeProperty(ObjAttribute attribute,
ValueComparisionStrategy<Object> valueComparisionStrategy) {
+ public DataObjectAttributeProperty(ObjAttribute attribute,
ValueComparisonStrategy<Object> valueComparisonStrategy) {
this.attribute = attribute;
- this.valueComparisionStrategy = valueComparisionStrategy;
+ this.valueComparisonStrategy = valueComparisonStrategy;
}
@Override
@@ -58,6 +58,6 @@ class DataObjectAttributeProperty extends
DataObjectBaseProperty implements
@Override
public boolean equals(Object value1, Object value2) {
- return valueComparisionStrategy.equals(value1, value2);
+ return valueComparisonStrategy.equals(value1, value2);
}
}
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/DefaultValueComparisonStrategyFactory.java
b/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/DefaultValueComparisonStrategyFactory.java
index d6dd878..0aadffc 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/DefaultValueComparisonStrategyFactory.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/DefaultValueComparisonStrategyFactory.java
@@ -32,7 +32,7 @@ import java.util.Objects;
*/
public class DefaultValueComparisonStrategyFactory implements
ValueComparisonStrategyFactory {
- private static final ValueComparisionStrategy<Object> DEFAULT_STRATEGY =
new DefaultValueComparisionStrategy();
+ private static final ValueComparisonStrategy<Object> DEFAULT_STRATEGY =
new DefaultValueComparisonStrategy();
private final ValueObjectTypeRegistry valueObjectTypeRegistry;
@@ -41,7 +41,7 @@ public class DefaultValueComparisonStrategyFactory implements
ValueComparisonStr
}
@Override
- public ValueComparisionStrategy<Object> getStrategy(ObjAttribute
attribute) {
+ public ValueComparisonStrategy<Object> getStrategy(ObjAttribute attribute)
{
ValueObjectType<?, ?> valueObjectType =
valueObjectTypeRegistry.getValueType(attribute.getJavaClass());
if(valueObjectType == null) {
return DEFAULT_STRATEGY;
@@ -53,7 +53,7 @@ public class DefaultValueComparisonStrategyFactory implements
ValueComparisonStr
// Using classes instead of lambdas to allow serialization
@SuppressWarnings({"rawtypes"})
- static class ValueObjectTypeComparisonStrategy implements
ValueComparisionStrategy<Object>, Serializable {
+ static class ValueObjectTypeComparisonStrategy implements
ValueComparisonStrategy<Object>, Serializable {
private final ValueObjectType valueObjectType;
public ValueObjectTypeComparisonStrategy(ValueObjectType<?, ?>
valueObjectType) {
@@ -67,7 +67,7 @@ public class DefaultValueComparisonStrategyFactory implements
ValueComparisonStr
}
}
- static class DefaultValueComparisionStrategy implements
ValueComparisionStrategy<Object>, Serializable {
+ static class DefaultValueComparisonStrategy implements
ValueComparisonStrategy<Object>, Serializable {
@Override
public boolean equals(Object a, Object b) {
return Objects.equals(a, b);
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisionStrategy.java
b/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisonStrategy.java
similarity index 95%
rename from
cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisionStrategy.java
rename to
cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisonStrategy.java
index 79c53d2..5a09859 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisionStrategy.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisonStrategy.java
@@ -23,7 +23,7 @@ package org.apache.cayenne.reflect.generic;
* @since 4.2
* @param <V> type of values to compare
*/
-public interface ValueComparisionStrategy<V> {
+public interface ValueComparisonStrategy<V> {
boolean equals(V value1, V value2);
diff --git
a/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisonStrategyFactory.java
b/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisonStrategyFactory.java
index bfb2fa8..2054dfc 100644
---
a/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisonStrategyFactory.java
+++
b/cayenne-server/src/main/java/org/apache/cayenne/reflect/generic/ValueComparisonStrategyFactory.java
@@ -26,6 +26,6 @@ import org.apache.cayenne.map.ObjAttribute;
*/
public interface ValueComparisonStrategyFactory {
- ValueComparisionStrategy<Object> getStrategy(ObjAttribute attribute);
+ ValueComparisonStrategy<Object> getStrategy(ObjAttribute attribute);
}
diff --git
a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
index 1b24a62..8d4e483 100644
---
a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
+++
b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectAttributePropertyTest.java
@@ -33,7 +33,7 @@ public class DataObjectAttributePropertyTest {
ObjEntity e1 = new ObjEntity("objEntityName");
ObjAttribute a1 = new ObjAttribute("aName", "aType", e1);
- DataObjectAttributeProperty p1 = new
DataObjectAttributeProperty(a1, new
DefaultValueComparisonStrategyFactory.DefaultValueComparisionStrategy());
+ DataObjectAttributeProperty p1 = new
DataObjectAttributeProperty(a1, new
DefaultValueComparisonStrategyFactory.DefaultValueComparisonStrategy());
DataObjectAttributeProperty p2 = Util.cloneViaSerialization(p1);
assertNotNull(p2);
