cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [24/30] cayenne git commit: CAY-2377. Remove setDataMap(DataMap dataMap)
Date Thu, 07 Dec 2017 10:09:53 GMT
CAY-2377. Remove setDataMap(DataMap dataMap)


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

Branch: refs/heads/master
Commit: 72a3a52710f2a34e70a6db04b1ef79566cd26202
Parents: f98da69
Author: Arseni Bulatski <ancarseni@gmail.com>
Authored: Mon Nov 13 09:19:40 2017 +0300
Committer: Arseni Bulatski <ancarseni@gmail.com>
Committed: Wed Nov 15 10:27:48 2017 +0300

----------------------------------------------------------------------
 .../org/apache/cayenne/map/EJBQLQueryDescriptor.java     |  1 -
 .../org/apache/cayenne/map/ProcedureQueryDescriptor.java |  1 -
 .../org/apache/cayenne/map/SQLTemplateDescriptor.java    |  1 -
 .../org/apache/cayenne/map/SelectQueryDescriptor.java    |  1 -
 .../java/org/apache/cayenne/query/AbstractQuery.java     | 11 -----------
 .../main/java/org/apache/cayenne/query/EJBQLQuery.java   | 11 -----------
 docs/doc/src/main/resources/UPGRADE.txt                  |  3 ++-
 7 files changed, 2 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/72a3a527/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
b/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
index e3f8029..987d1db 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/EJBQLQueryDescriptor.java
@@ -52,7 +52,6 @@ public class EJBQLQueryDescriptor extends QueryDescriptor {
     @Override
     public EJBQLQuery buildQuery() {
         EJBQLQuery ejbqlQuery = new EJBQLQuery(this.getEjbql());
-        ejbqlQuery.setDataMap(dataMap);
         ejbqlQuery.initWithProperties(this.getProperties());
 
         return ejbqlQuery;

http://git-wip-us.apache.org/repos/asf/cayenne/blob/72a3a527/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
b/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
index 4577c55..0d1044b 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/ProcedureQueryDescriptor.java
@@ -57,7 +57,6 @@ public class ProcedureQueryDescriptor extends QueryDescriptor {
             procedureQuery.setRoot(root);
         }
 
-        procedureQuery.setDataMap(dataMap);
         procedureQuery.setResultEntityName(this.getResultEntityName());
         procedureQuery.initWithProperties(this.getProperties());
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/72a3a527/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
b/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
index fb1fb69..e1c3afe 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/SQLTemplateDescriptor.java
@@ -75,7 +75,6 @@ public class SQLTemplateDescriptor extends QueryDescriptor {
             template.setRoot(root);
         }
 
-        template.setDataMap(dataMap);
         template.initWithProperties(this.getProperties());
 
         // init SQL

http://git-wip-us.apache.org/repos/asf/cayenne/blob/72a3a527/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
index 6788c5f..e9c9b5d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/SelectQueryDescriptor.java
@@ -128,7 +128,6 @@ public class SelectQueryDescriptor extends QueryDescriptor {
     public SelectQuery<?> buildQuery() {
         SelectQuery<Object> selectQuery = new SelectQuery<>();
         selectQuery.setRoot(this.getRoot());
-        selectQuery.setDataMap(dataMap);
         selectQuery.setQualifier(this.getQualifier());
 
         List<Ordering> orderings = this.getOrderings();

http://git-wip-us.apache.org/repos/asf/cayenne/blob/72a3a527/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
index 246daea..22b1e88 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/AbstractQuery.java
@@ -38,17 +38,6 @@ public abstract class AbstractQuery extends CacheableQuery {
      */
     protected Object root;
 
-    @Deprecated
-    protected DataMap dataMap;
-
-    /**
-     * @since 3.1
-     */
-    @Deprecated
-    public void setDataMap(DataMap dataMap) {
-        this.dataMap = dataMap;
-    }
-
     /**
      * Returns default select parameters.
      * 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/72a3a527/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
index b01e286..ab4e820 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/query/EJBQLQuery.java
@@ -39,8 +39,6 @@ import java.util.Map;
  */
 public class EJBQLQuery extends CacheableQuery {
 
-    @Deprecated
-    protected DataMap dataMap;
     protected String ejbqlStatement;
     
     protected Map<String, Object> namedParameters;
@@ -55,15 +53,6 @@ public class EJBQLQuery extends CacheableQuery {
 
     public EJBQLQuery() {
     }
-    
-    
-    /**
-     * @since 3.1
-     */
-    @Deprecated
-    public void setDataMap(DataMap dataMap) {
-        this.dataMap = dataMap;
-    }
 
     public void initWithProperties(Map<String, ?> properties) {
 

http://git-wip-us.apache.org/repos/asf/cayenne/blob/72a3a527/docs/doc/src/main/resources/UPGRADE.txt
----------------------------------------------------------------------
diff --git a/docs/doc/src/main/resources/UPGRADE.txt b/docs/doc/src/main/resources/UPGRADE.txt
index e7fcec5..cc3ebc1 100644
--- a/docs/doc/src/main/resources/UPGRADE.txt
+++ b/docs/doc/src/main/resources/UPGRADE.txt
@@ -264,7 +264,8 @@ UPGRADING TO 4.1.M2
 
       - removed String cacheKey from boolean resolve(Object root, EntityResolver resolver)
arguments;
 
-
+      - removed setDataMap from buildQuery() in SQLTemplateDescriptor, SelectQueryDescriptor,
ProcedureQueryDescriptor and EJBQLQueryDescriptor;
+      - removed setDataMap from org.apache.cayenne.AbstractQuery and from org.apache.cayenne.query.EJBQLQuery;
 
 UPGRADING TO 4.1.M1
 


Mime
View raw message