cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject cayenne git commit: diamond op
Date Mon, 19 Dec 2016 10:36:05 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master 078ae39f8 -> 1a647b252


diamond op


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1a647b25
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1a647b25
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1a647b25

Branch: refs/heads/master
Commit: 1a647b252c8dd41a77317d5bd2bbd728bf0033be
Parents: 078ae39
Author: Andrus Adamchik <andrus@objectstyle.com>
Authored: Mon Dec 19 13:35:58 2016 +0300
Committer: Andrus Adamchik <andrus@objectstyle.com>
Committed: Mon Dec 19 13:35:58 2016 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/query/SelectById.java    | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/1a647b25/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java
index 6db4fa9..3c151b1 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/SelectById.java
@@ -18,13 +18,6 @@
  ****************************************************************/
 package org.apache.cayenne.query;
 
-import static java.util.Collections.singletonMap;
-import static org.apache.cayenne.exp.ExpressionFactory.matchAllDbExp;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.ObjectContext;
@@ -36,6 +29,13 @@ import org.apache.cayenne.exp.Expression;
 import org.apache.cayenne.map.EntityResolver;
 import org.apache.cayenne.map.ObjEntity;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.singletonMap;
+import static org.apache.cayenne.exp.ExpressionFactory.matchAllDbExp;
+
 /**
  * A query to select single objects by id.
  * 
@@ -92,7 +92,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T>
{
 	}
 
 	public static SelectById<DataRow> dataRowQuery(Class<?> entityType, Object id)
{
-		SelectById<DataRow> q = new SelectById<DataRow>();
+		SelectById<DataRow> q = new SelectById<>();
 
 		q.entityType = entityType;
 		q.singleId = id;
@@ -102,7 +102,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T>
{
 	}
 
 	public static SelectById<DataRow> dataRowQuery(Class<?> entityType, Map<String,
Object> id) {
-		SelectById<DataRow> q = new SelectById<DataRow>();
+		SelectById<DataRow> q = new SelectById<>();
 
 		q.entityType = entityType;
 		q.mapId = id;
@@ -114,7 +114,7 @@ public class SelectById<T> extends IndirectQuery implements Select<T>
{
 	public static SelectById<DataRow> dataRowQuery(ObjectId id) {
 		checkObjectId(id);
 
-		SelectById<DataRow> q = new SelectById<DataRow>();
+		SelectById<DataRow> q = new SelectById<>();
 
 		q.entityName = id.getEntityName();
 		q.mapId = id.getIdSnapshot();


Mime
View raw message