You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2019/04/02 14:50:09 UTC
[cayenne] branch master updated: cleanup
This is an automated email from the ASF dual-hosted git repository.
ntimofeev 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 55453f3 cleanup
55453f3 is described below
commit 55453f38f33aed0df835fe60625070672a20dc30
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Tue Apr 2 17:50:00 2019 +0300
cleanup
---
.../java/org/apache/cayenne/joda/access/types/DateTimeTypeTest.java | 1 -
.../org/apache/cayenne/joda/access/types/LocalDateTimeTypeTest.java | 1 -
.../org/apache/cayenne/joda/access/types/LocalDateTypeTest.java | 2 --
.../org/apache/cayenne/joda/access/types/LocalTimeTypeTest.java | 2 --
.../cayenne/access/translator/select/TranslatableQueryWrapper.java | 2 --
.../test/java/org/apache/cayenne/access/DataContextOrderingIT.java | 3 ---
.../cayenne/access/translator/select/ColumnDescriptorStageTest.java | 4 ++--
.../apache/cayenne/access/translator/select/GroupByStageTest.java | 4 ++--
.../cayenne/access/translator/select/QualifierTranslatorTest.java | 4 ++--
.../src/test/java/org/apache/cayenne/util/GenericResponseTest.java | 6 +++---
10 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/DateTimeTypeTest.java b/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/DateTimeTypeTest.java
index 748bab3..7ef1015 100644
--- a/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/DateTimeTypeTest.java
+++ b/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/DateTimeTypeTest.java
@@ -3,7 +3,6 @@ package org.apache.cayenne.joda.access.types;
import com.mockrunner.mock.jdbc.MockConnection;
import com.mockrunner.mock.jdbc.MockPreparedStatement;
-import org.apache.cayenne.joda.access.types.DateTimeType;
import org.joda.time.DateTime;
import java.sql.PreparedStatement;
diff --git a/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalDateTimeTypeTest.java b/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalDateTimeTypeTest.java
index 71038e8..499f98e 100644
--- a/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalDateTimeTypeTest.java
+++ b/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalDateTimeTypeTest.java
@@ -3,7 +3,6 @@ package org.apache.cayenne.joda.access.types;
import com.mockrunner.mock.jdbc.MockConnection;
import com.mockrunner.mock.jdbc.MockPreparedStatement;
-import org.apache.cayenne.joda.access.types.LocalDateTimeType;
import org.joda.time.LocalDateTime;
import java.sql.PreparedStatement;
diff --git a/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalDateTypeTest.java b/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalDateTypeTest.java
index 61f8f95..6fcbeda 100644
--- a/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalDateTypeTest.java
+++ b/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalDateTypeTest.java
@@ -1,7 +1,5 @@
package org.apache.cayenne.joda.access.types;
-import org.apache.cayenne.joda.access.types.LocalDateType;
-
import com.mockrunner.mock.jdbc.MockConnection;
import com.mockrunner.mock.jdbc.MockPreparedStatement;
diff --git a/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalTimeTypeTest.java b/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalTimeTypeTest.java
index adfcd4b..605c259 100644
--- a/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalTimeTypeTest.java
+++ b/cayenne-joda/src/test/java/org/apache/cayenne/joda/access/types/LocalTimeTypeTest.java
@@ -1,7 +1,5 @@
package org.apache.cayenne.joda.access.types;
-import org.apache.cayenne.joda.access.types.LocalTimeType;
-
import com.mockrunner.mock.jdbc.MockConnection;
import com.mockrunner.mock.jdbc.MockPreparedStatement;
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/TranslatableQueryWrapper.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/TranslatableQueryWrapper.java
index d04031c..1033cbc 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/TranslatableQueryWrapper.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/select/TranslatableQueryWrapper.java
@@ -22,11 +22,9 @@ package org.apache.cayenne.access.translator.select;
import java.util.Collection;
import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.exp.Property;
import org.apache.cayenne.exp.property.BaseProperty;
import org.apache.cayenne.map.EntityResolver;
import org.apache.cayenne.query.Ordering;
-import org.apache.cayenne.query.PrefetchTreeNode;
import org.apache.cayenne.query.QueryMetadata;
import org.apache.cayenne.query.Select;
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
index bb56dbb..ec5078d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextOrderingIT.java
@@ -19,9 +19,6 @@
package org.apache.cayenne.access;
import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.exp.Expression;
-import org.apache.cayenne.exp.FunctionExpressionFactory;
-import org.apache.cayenne.exp.Property;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.Painting;
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/ColumnDescriptorStageTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/ColumnDescriptorStageTest.java
index dd1c7e7..c88c106 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/ColumnDescriptorStageTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/ColumnDescriptorStageTest.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.access.translator.select;
import org.apache.cayenne.access.jdbc.ColumnDescriptor;
import org.apache.cayenne.access.sqlbuilder.sqltree.EmptyNode;
-import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.exp.property.PropertyFactory;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -43,7 +43,7 @@ public class ColumnDescriptorStageTest {
context.addResultNode(new EmptyNode());
context.addResultNode(new EmptyNode(), "key");
- context.addResultNode(new EmptyNode(), false, Property.COUNT, "key2");
+ context.addResultNode(new EmptyNode(), false, PropertyFactory.COUNT, "key2");
ColumnDescriptorStage stage = new ColumnDescriptorStage();
stage.perform(context);
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
index d739714..449f11e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/translator/select/GroupByStageTest.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.access.sqlbuilder.sqltree.ColumnNode;
import org.apache.cayenne.access.sqlbuilder.sqltree.EmptyNode;
import org.apache.cayenne.access.sqlbuilder.sqltree.GroupByNode;
import org.apache.cayenne.access.sqlbuilder.sqltree.Node;
-import org.apache.cayenne.exp.Property;
+import org.apache.cayenne.exp.property.PropertyFactory;
import org.junit.Before;
import org.junit.Test;
@@ -69,7 +69,7 @@ public class GroupByStageTest {
@Test
public void groupByWithAggregates() {
context.addResultNode(new ColumnNode("t0", "column", null, null));
- context.addResultNode(new EmptyNode(), true, Property.COUNT, "count");
+ context.addResultNode(new EmptyNode(), true, PropertyFactory.COUNT, "count");
GroupByStage stage = new GroupByStage();
stage.perform(context);
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 1f78ae0..45116cf 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
@@ -38,8 +38,8 @@ import org.apache.cayenne.access.sqlbuilder.sqltree.TextNode;
import org.apache.cayenne.access.sqlbuilder.sqltree.ValueNode;
import org.apache.cayenne.exp.Expression;
import org.apache.cayenne.exp.ExpressionFactory;
-import org.apache.cayenne.exp.Property;
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;
@@ -102,7 +102,7 @@ public class QualifierTranslatorTest {
@Test
public void translateNull() {
assertNull(translator.translate((Expression)null));
- assertNull(translator.translate((Property<?>)null));
+ assertNull(translator.translate((BaseProperty<?>)null));
}
@Test
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java b/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java
index fe12ca7..4851127 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/util/GenericResponseTest.java
@@ -60,14 +60,14 @@ public class GenericResponseTest {
@Test
public void testSerialization() throws Exception {
- List list = new ArrayList();
- list.add(new HashMap());
+ List<Object> list = new ArrayList<>();
+ list.add(new HashMap<>());
GenericResponse r = new GenericResponse();
r.addBatchUpdateCount(new int[] { 1, 2, 3 });
r.addResultList(list);
- GenericResponse sr = (GenericResponse) Util.cloneViaSerialization(r);
+ GenericResponse sr = Util.cloneViaSerialization(r);
assertNotNull(sr);
assertEquals(2, sr.size());