cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r719518 - in /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src: main/java/org/apache/cayenne/query/ main/java/org/apache/cayenne/remote/ main/java/org/apache/cayenne/wocompat/ test/java/org/apache/cayenne/access/
Date Fri, 21 Nov 2008 07:06:43 GMT
Author: aadamchik
Date: Thu Nov 20 23:06:43 2008
New Revision: 719518

URL: http://svn.apache.org/viewvc?rev=719518&view=rev
Log:
CAY-1137 Deprecate and start ignoring QueryMetadata.isResolvingInherited()

final runtime cleanup

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadataWrapper.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java?rev=719518&r1=719517&r2=719518&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/DefaultQueryMetadata.java
Thu Nov 20 23:06:43 2008
@@ -113,12 +113,18 @@
         return QueryMetadata.FETCHING_DATA_ROWS_DEFAULT;
     }
 
+    /**
+     * @deprecated since 3.0
+     */
     public boolean isRefreshingObjects() {
-        return QueryMetadata.REFRESHING_OBJECTS_DEFAULT;
+        return true;
     }
 
+    /**
+     * @deprecated since 3.0
+     */
     public boolean isResolvingInherited() {
-        return QueryMetadata.RESOLVING_INHERITED_DEFAULT;
+        return true;
     }
 
     public int getPageSize() {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadataWrapper.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadataWrapper.java?rev=719518&r1=719517&r2=719518&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadataWrapper.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/query/QueryMetadataWrapper.java
Thu Nov 20 23:06:43 2008
@@ -144,12 +144,7 @@
      * @deprecated since 3.0 as super is deprecated.
      */
     public boolean isRefreshingObjects() {
-        if (!overrideExists(QueryMetadata.REFRESHING_OBJECTS_PROPERTY)) {
-            return info.isRefreshingObjects();
-        }
-
-        Boolean b = (Boolean) overrides.get(QueryMetadata.REFRESHING_OBJECTS_PROPERTY);
-        return b != null && b.booleanValue();
+        return true;
     }
 
     /**

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java?rev=719518&r1=719517&r2=719518&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/remote/IncrementalSelectQuery.java
Thu Nov 20 23:06:43 2008
@@ -395,11 +395,17 @@
         query.setQualifier(qualifier);
     }
 
+    /**
+     * @deprecated since 3.0 as wrapped method is also deprecated.
+     */
     @Override
     public void setRefreshingObjects(boolean flag) {
         query.setRefreshingObjects(flag);
     }
 
+    /**
+     * @deprecated since 3.0 as wrapped method is also deprecated.
+     */
     @Override
     public void setResolvingInherited(boolean b) {
         query.setResolvingInherited(b);

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java?rev=719518&r1=719517&r2=719518&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOQuery.java
Thu Nov 20 23:06:43 2008
@@ -58,10 +58,6 @@
 
     protected void initFromPlist(Map plistMap) {
 
-        setResolvingInherited("YES".equalsIgnoreCase((String) plistMap.get("isDeep")));
-        setRefreshingObjects("YES".equalsIgnoreCase((String) plistMap
-                .get("refreshesRefetchedObjects")));
-
         setDistinct("YES".equalsIgnoreCase((String) plistMap.get("usesDistinct")));
 
         Object fetchLimit = plistMap.get("fetchLimit");

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java?rev=719518&r1=719517&r2=719518&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/wocompat/EOSQLQuery.java
Thu Nov 20 23:06:43 2008
@@ -43,10 +43,6 @@
 
     protected void initFromPlist(Map plistMap) {
 
-        setResolvingInherited("YES".equalsIgnoreCase((String) plistMap.get("isDeep")));
-        setRefreshingObjects("YES".equalsIgnoreCase((String) plistMap
-                .get("refreshesRefetchedObjects")));
-
         Object fetchLimit = plistMap.get("fetchLimit");
         if (fetchLimit != null) {
             try {

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java?rev=719518&r1=719517&r2=719518&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/ClientServerChannelTest.java
Thu Nov 20 23:06:43 2008
@@ -164,7 +164,6 @@
         // must use real SelectQuery instead of mockup as root overriding depends on the
         // fact that Query inherits from AbstractQuery.
         SelectQuery query = new SelectQuery(ClientMtTable1.class);
-        query.setResolvingInherited(true);
 
         // must pass through the serialization pipe before running query as
         // HessianSerializer has needed preprocessing hooks...



Mime
View raw message